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

Cleverson Sacramento
2 parents 167ab512 0ef1383d
Showing 51 changed files with 2381 additions and 249 deletions Show diff stats
archetype/jsf-jpa/pom.xml
archetype/minimal/pom.xml
documentation/quickstart/pom.xml
documentation/reference/pom.xml
impl/core/pom.xml
impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/configuration/ConfigurationLoader.java
impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/SecurityContextImpl.java
impl/core/src/main/java/br/gov/frameworkdemoiselle/security/SecurityContext.java
impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/configuration/SecurityConfigTest.java
impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/implementation/MessageContextImplTest.java
impl/extension/jaas/.gitignore
impl/extension/jaas/pom.xml
impl/extension/jaas/src/main/java/br/gov/frameworkdemoiselle/internal/configuration/JAASConfig.java
impl/extension/jaas/src/main/java/br/gov/frameworkdemoiselle/security/Credentials.java
impl/extension/jaas/src/main/java/br/gov/frameworkdemoiselle/security/JAASAuthenticator.java
impl/extension/jaas/src/main/java/br/gov/frameworkdemoiselle/security/JAASAuthorizer.java
impl/extension/jaas/src/main/resources/META-INF/beans.xml
impl/extension/jaas/src/main/resources/demoiselle-jaas-bundle.properties
impl/extension/jdbc/.gitignore
impl/extension/jdbc/pom.xml
@@ -45,7 +45,7 @@
 	<parent>
 		<groupId>br.gov.frameworkdemoiselle</groupId>
 		<artifactId>demoiselle-archetype-parent</artifactId>
-		<version>2.3.2-SNAPSHOT</version>
+		<version>2.4.0-ALPHA1-SNAPSHOT</version>
 		<relativePath>../../parent/archetype</relativePath>
 	</parent>
  
@@ -45,7 +45,7 @@
 	<parent>
 		<groupId>br.gov.frameworkdemoiselle</groupId>
 		<artifactId>demoiselle-archetype-parent</artifactId>
-		<version>2.3.2-SNAPSHOT</version>
+		<version>2.4.0-ALPHA1-SNAPSHOT</version>
 		<relativePath>../../parent/archetype</relativePath>
 	</parent>
  
@@ -40,7 +40,7 @@
  
 	<artifactId>demoiselle-framework-quickstart</artifactId>
 	<packaging>jdocbook</packaging>
-	<version>2.3.2-SNAPSHOT</version>
+	<version>2.4.0-ALPHA1-SNAPSHOT</version>
  
 	<parent>
 		<groupId>br.gov.frameworkdemoiselle</groupId>
@@ -40,7 +40,7 @@
  
 	<artifactId>demoiselle-framework-reference</artifactId>
 	<packaging>jdocbook</packaging>
-	<version>2.3.2-SNAPSHOT</version>
+	<version>2.4.0-ALPHA1-SNAPSHOT</version>
  
 	<parent>
 		<groupId>br.gov.frameworkdemoiselle</groupId>
@@ -44,7 +44,7 @@
 	<parent>
 		<groupId>br.gov.frameworkdemoiselle</groupId>
 		<artifactId>demoiselle-framework-parent</artifactId>
-		<version>2.3.2-SNAPSHOT</version>
+		<version>2.4.0-ALPHA1-SNAPSHOT</version>
 		<relativePath>../../parent/framework</relativePath>
 	</parent>
  
@@ -72,7 +72,7 @@
 			<dependency>
 				<groupId>br.gov.frameworkdemoiselle</groupId>
 				<artifactId>demoiselle-framework-bom</artifactId>
-				<version>2.3.2-SNAPSHOT</version>
+				<version>2.4.0-ALPHA1-SNAPSHOT</version>
 				<scope>import</scope>
 				<type>pom</type>
 			</dependency>
@@ -43,10 +43,12 @@ 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.HashMap;
 import java.util.Iterator;
+import java.util.Map;
 import java.util.Properties;
-import java.util.Set;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
  
 import javax.validation.constraints.NotNull;
  
@@ -114,7 +116,7 @@ public class ConfigurationLoader implements Serializable {
 			org.apache.commons.configuration.Configuration config = getConfiguration(resource, type);
  
 			if (config != null) {
-				String key = getKey(field, clazz, config);
+				Key key = new Key(field, clazz, config);
 				Object value = getValue(key, field, config);
  
 				validate(field, key, value, resource);
@@ -123,106 +125,21 @@ public class ConfigurationLoader implements Serializable {
 		}
 	}
  
-	private void setValue(Field field, String key, Object object, Object value) {
+	private void setValue(Field field, Key key, Object object, Object value) {
 		if (value != null) {
 			Reflections.setFieldValue(field, object, value);
-			getLogger().debug(getBundle().getString("configuration-field-loaded", key, field.getName(), value));
+			getLogger().debug(
+					getBundle().getString("configuration-field-loaded", key.toString(), field.getName(), value));
 		}
 	}
  
-	private void validate(Field field, String key, Object value, String resource) {
+	private void validate(Field field, Key key, Object value, String resource) {
 		if (field.isAnnotationPresent(NotNull.class) && value == null) {
-			throw new ConfigurationException(getBundle().getString("configuration-attribute-is-mandatory", key,
-					resource));
+			throw new ConfigurationException(getBundle().getString("configuration-attribute-is-mandatory",
+					key.toString(), resource));
 		}
 	}
  
-	private String getKey(final Field field, final Class<?> clazz,
-			final org.apache.commons.configuration.Configuration config) {
-
-		final String prefix = getPrefix(field, clazz);
-		final StringBuffer key = new StringBuffer();
-
-		key.append(prefix);
-
-		if (field.isAnnotationPresent(Name.class)) {
-			key.append(getKeyByAnnotation(field));
-		} else {
-			key.append(getKeyByConvention(field, prefix, config));
-		}
-
-		return key.toString();
-	}
-
-	private String getPrefix(Field field, Class<?> type) {
-		String prefix = "";
-
-		Configuration classAnnotation = type.getAnnotation(Configuration.class);
-		if (!Strings.isEmpty(classAnnotation.prefix())) {
-
-			prefix = classAnnotation.prefix();
-
-			if (prefix.charAt(prefix.length() - 1) != '.') {
-				getLogger().warn(
-						"ATENÇÃO!!! Informe o ponto (.) ao final da declaração do atributo prefix = \"" + prefix
-								+ "\" da anotação @Configuration da classe " + type.getCanonicalName()
-								+ " para evitar incompatibilidade com as próximas versões do Demoiselle.");
-
-				prefix += ".";
-			}
-		}
-
-		return prefix;
-	}
-
-	private String getKeyByAnnotation(Field field) {
-		String key = null;
-
-		Name nameAnnotation = field.getAnnotation(Name.class);
-		if (Strings.isEmpty(nameAnnotation.value())) {
-			throw new ConfigurationException(getBundle().getString("configuration-name-attribute-cant-be-empty"));
-		} else {
-			key = nameAnnotation.value();
-		}
-
-		return key;
-	}
-
-	private String getKeyByConvention(Field field, String prefix, org.apache.commons.configuration.Configuration config) {
-
-		Set<String> conventions = new HashSet<String>();
-		conventions.add(field.getName());
-		conventions.add(Strings.camelCaseToSymbolSeparated(field.getName(), "."));
-		conventions.add(Strings.camelCaseToSymbolSeparated(field.getName(), "_"));
-		conventions.add(field.getName().toLowerCase());
-		conventions.add(field.getName().toUpperCase());
-
-		int matches = 0;
-		String key = field.getName();
-		for (String convention : conventions) {
-			if (config.containsKey(prefix + convention)) {
-				key = convention;
-				matches++;
-			}
-		}
-
-		if (!field.getName().equals(key)) {
-			getLogger().warn(
-					"ATENÇÃO!!! Anote o atributo " + field.getName() + " da classe "
-							+ field.getDeclaringClass().getCanonicalName() + " com @Name(\"" + key
-							+ "\") para evitar incompatibilidade com as próximas versões do Demoiselle.");
-		}
-
-		if (matches == 0) {
-			getLogger().debug(getBundle().getString("configuration-key-not-found", key, conventions));
-		} else if (matches > 1) {
-			throw new ConfigurationException(getBundle().getString("ambiguous-key", field.getName(),
-					field.getDeclaringClass()));
-		}
-
-		return key;
-	}
-
 	/**
 	 * Returns the configuration class according to specified resource name and configuration type.
 	 * 
@@ -273,7 +190,7 @@ public class ConfigurationLoader implements Serializable {
 	}
  
 	@SuppressWarnings("unchecked")
-	private <T> T getValue(String key, Field field, org.apache.commons.configuration.Configuration config) {
+	private <T> T getValue(Key key, Field field, org.apache.commons.configuration.Configuration config) {
 		Object value;
  
 		Class<?> fieldClass = (Class<?>) field.getType();
@@ -281,6 +198,9 @@ public class ConfigurationLoader implements Serializable {
 		if (fieldClass.isArray()) {
 			value = getArray(key, field, config);
  
+		} else if (fieldClass.equals(Map.class)) {
+			value = getMap(key, field, config);
+
 		} else if (fieldClass.equals(Properties.class)) {
 			value = getProperty(key, config);
  
@@ -294,7 +214,38 @@ public class ConfigurationLoader implements Serializable {
 		return (T) value;
 	}
  
-	private <T> Object getArray(String key, Field field, org.apache.commons.configuration.Configuration config) {
+	private <T> Object getMap(Key key, Field field, org.apache.commons.configuration.Configuration config) {
+		Map<String, Object> value = null;
+
+		String regexp = "^(" + key.getPrefix() + ")((.+)\\.)?(" + key.getName() + ")$";
+		Pattern pattern = Pattern.compile(regexp);
+		Matcher matcher;
+
+		String iterKey;
+		String mapKey;
+		String confKey;
+
+		for (@SuppressWarnings("unchecked")
+		Iterator<String> iter = config.getKeys(); iter.hasNext();) {
+			iterKey = iter.next();
+			matcher = pattern.matcher(iterKey);
+
+			if (matcher.matches()) {
+				confKey = matcher.group(1) + (matcher.group(2) == null ? "" : matcher.group(2)) + matcher.group(4);
+
+				if (value == null) {
+					value = new HashMap<String, Object>();
+				}
+
+				mapKey = matcher.group(3) == null ? "default" : matcher.group(3);
+				value.put(mapKey, config.getProperty(confKey));
+			}
+		}
+
+		return value;
+	}
+
+	private <T> Object getArray(Key key, Field field, org.apache.commons.configuration.Configuration config) {
 		Object value = null;
  
 		Class<?> fieldClass = (Class<?>) field.getType();
@@ -309,7 +260,7 @@ public class ConfigurationLoader implements Serializable {
 			methodName += "Array";
  
 			method = config.getClass().getMethod(methodName, String.class);
-			value = method.invoke(config, key);
+			value = method.invoke(config, key.toString());
  
 		} catch (Throwable cause) {
 			throw new ConfigurationException(getBundle().getString("error-converting-to-type", fieldClass.getName()),
@@ -319,7 +270,7 @@ public class ConfigurationLoader implements Serializable {
 		return value;
 	}
  
-	private <T> Object getBasic(String key, Field field, org.apache.commons.configuration.Configuration config) {
+	private <T> Object getBasic(Key key, Field field, org.apache.commons.configuration.Configuration config) {
 		Object value = null;
  
 		Class<?> fieldClass = (Class<?>) field.getType();
@@ -333,11 +284,11 @@ public class ConfigurationLoader implements Serializable {
  
 			if (!fieldClass.isPrimitive()) {
 				method = config.getClass().getMethod(methodName, String.class, fieldClass);
-				value = method.invoke(config, key, null);
+				value = method.invoke(config, key.toString(), null);
  
-			} else if (config.containsKey(key)) {
+			} else if (config.containsKey(key.toString())) {
 				method = config.getClass().getMethod(methodName, String.class);
-				value = method.invoke(config, key);
+				value = method.invoke(config, key.toString());
 			}
  
 		} catch (Throwable cause) {
@@ -348,11 +299,11 @@ public class ConfigurationLoader implements Serializable {
 		return value;
 	}
  
-	private <T> Object getClass(String key, Field field, org.apache.commons.configuration.Configuration config) {
+	private <T> Object getClass(Key key, Field field, org.apache.commons.configuration.Configuration config) {
 		Object value = null;
  
 		try {
-			String canonicalName = config.getString(key);
+			String canonicalName = config.getString(key.toString());
  
 			if (canonicalName != null) {
 				ClassLoader classLoader = getClassLoaderForClass(canonicalName);
@@ -395,17 +346,17 @@ public class ConfigurationLoader implements Serializable {
 		return "";
 	}
  
-	private Object getProperty(String key, org.apache.commons.configuration.Configuration config) {
+	private Object getProperty(Key key, org.apache.commons.configuration.Configuration config) {
 		Object value = null;
  
 		@SuppressWarnings("unchecked")
-		Iterator<String> iterator = config.getKeys(key);
+		Iterator<String> iterator = config.getKeys(key.toString());
 		if (iterator.hasNext()) {
 			Properties props = new Properties();
  
 			while (iterator.hasNext()) {
 				String fullKey = iterator.next();
-				String prefix = key + ".";
+				String prefix = key.toString() + ".";
 				String unprefixedKey = fullKey.substring(prefix.length());
 				props.put(unprefixedKey, config.getString(fullKey));
 			}
@@ -470,4 +421,59 @@ public class ConfigurationLoader implements Serializable {
  
 		return bootstrap;
 	}
+
+	private class Key {
+
+		private String prefix;
+
+		private String name;
+
+		private String key;
+
+		private Key(final Field field, final Class<?> type, final org.apache.commons.configuration.Configuration config) {
+
+			this.prefix = type.getAnnotation(Configuration.class).prefix();
+			if (this.prefix == null) {
+				this.prefix = "";
+			}
+
+			if (field.isAnnotationPresent(Name.class)) {
+				this.name = getNameByAnnotation(field);
+			} else {
+				this.name = getNameByField(field);
+			}
+
+			this.key = this.prefix + this.name;
+		}
+
+		private String getNameByAnnotation(Field field) {
+			String key = null;
+
+			Name nameAnnotation = field.getAnnotation(Name.class);
+			if (Strings.isEmpty(nameAnnotation.value())) {
+				throw new ConfigurationException(getBundle().getString("configuration-name-attribute-cant-be-empty"));
+			} else {
+				key = nameAnnotation.value();
+			}
+
+			return key;
+		}
+
+		private String getNameByField(Field field) {
+			return field.getName();
+		}
+
+		public String getPrefix() {
+			return prefix;
+		}
+
+		public String getName() {
+			return name;
+		}
+
+		@Override
+		public String toString() {
+			return this.key;
+		}
+	}
 }
@@ -202,7 +202,7 @@ public class SecurityContextImpl implements SecurityContext {
 		return Beans.getReference(SecurityConfigImpl.class);
 	}
  
-	private void checkLoggedIn() throws NotLoggedInException {
+	public void checkLoggedIn() throws NotLoggedInException {
 		if (!isLoggedIn()) {
 			ResourceBundle bundle = ResourceBundleProducer.create("demoiselle-core-bundle");
 			throw new NotLoggedInException(bundle.getString("user-not-authenticated"));
@@ -65,6 +65,8 @@ public interface SecurityContext extends Serializable {
 	 * @return {@code true} if the user is logged in
 	 */
 	boolean isLoggedIn();
+	
+	void checkLoggedIn() throws NotLoggedInException;
  
 	/**
 	 * Checks if the logged user has permission to execute an specific operation on a specific resource.
@@ -9,7 +9,6 @@ import br.gov.frameworkdemoiselle.internal.implementation.DefaultAuthenticator;
 import br.gov.frameworkdemoiselle.internal.implementation.DefaultAuthorizer;
 import br.gov.frameworkdemoiselle.security.Authenticator;
 import br.gov.frameworkdemoiselle.security.Authorizer;
-import br.gov.frameworkdemoiselle.security.User;
  
 public class SecurityConfigTest {
  
@@ -38,7 +37,7 @@ public class SecurityConfigTest {
 		assertEquals("br.gov.frameworkdemoiselle.internal.implementation.DefaultAuthenticator", config
 				.getAuthenticatorClass().getName());
 	}
-	
+
 	@Test
 	public void testSetAuthorizerClass() {
 		Authorizer authorizer = new DefaultAuthorizer();
@@ -38,7 +38,6 @@ package br.gov.frameworkdemoiselle.internal.implementation;
  
 import static org.easymock.EasyMock.expect;
 import static org.powermock.api.easymock.PowerMock.mockStatic;
-import static org.powermock.api.easymock.PowerMock.replay;
 import static org.powermock.api.easymock.PowerMock.replayAll;
  
 import java.util.Locale;
@@ -51,10 +50,8 @@ 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.internal.producer.ResourceBundleProducer;
 import br.gov.frameworkdemoiselle.message.Message;
 import br.gov.frameworkdemoiselle.message.MessageContext;
 import br.gov.frameworkdemoiselle.message.SeverityType;
@@ -68,19 +65,19 @@ public class MessageContextImplTest {
 	MessageContext messageContext;
  
 	Message m1;
-	
+
 	private ResourceBundle bundle;
  
 	@SuppressWarnings("unused")
 	@Before
 	public void before() {
 		messageContext = new MessageContextImpl();
-		
+
 		Locale locale = Locale.getDefault();
-		
+
 		mockStatic(Beans.class);
 		expect(Beans.getReference(Locale.class)).andReturn(locale).anyTimes();
-				
+
 		expect(Beans.getReference(ResourceBundle.class)).andReturn(bundle).anyTimes();
 		replayAll(Beans.class);
  
@@ -150,20 +147,20 @@ public class MessageContextImplTest {
 		messageContext.add(m1);
 		Assert.assertTrue(messageContext.getMessages().size() == 1);
 		Assert.assertTrue(messageContext.getMessages().get(0).getText().equals(m1.getText()));
-		Assert.assertTrue(messageContext.getMessages().get(0).getSeverity().equals(m1.getSeverity()));		
+		Assert.assertTrue(messageContext.getMessages().get(0).getSeverity().equals(m1.getSeverity()));
 	}
-	
+
 	@Test
 	public void testClearMessages() {
 		Assert.assertTrue(messageContext.getMessages().isEmpty());
  
 		messageContext.add(m1);
-		messageContext.add(m1, null);
-		
+		messageContext.add(m1, (Object[]) null);
+
 		Assert.assertTrue(messageContext.getMessages().size() == 2);
-		
+
 		messageContext.clear();
-		
+
 		Assert.assertTrue(messageContext.getMessages().isEmpty());
 	}
  
@@ -171,88 +168,87 @@ public class MessageContextImplTest {
 	public void testGetMessages() {
 		Assert.assertNotNull(messageContext.getMessages());
 		Assert.assertTrue(messageContext.getMessages().isEmpty());
-		
+
 		messageContext.add("key1");
 		Assert.assertTrue(messageContext.getMessages().size() == 1);
-		
+
 		messageContext.add("key2");
 		Assert.assertTrue(messageContext.getMessages().size() == 2);
-		
+
 		Assert.assertTrue(messageContext.getMessages().get(0).getText().equals("key1"));
 		Assert.assertTrue(messageContext.getMessages().get(1).getText().equals("key2"));
 	}
  
-//	@Test
-//	public void testAddMessageObjectArray() {
-//		Object[] param = { "1", "2" };
-//		messageContext.add(m1, param);
-
-//		Assert.assertTrue(messageContext.getMessages().size() == 1);
-//		Assert.assertTrue(messageContext.getMessages().contains(m1));
-//		Assert.assertNotNull(messageContext.getMessages().get(0).getParameters());
-//		Assert.assertTrue(messageContext.getMessages().get(0).getParameters()[0] == param[0]);
-//		Assert.assertTrue(messageContext.getMessages().get(0).getParameters()[1] == param[1]);
-//	}
-
-//	@Test
-//	public void testAddStringObjectArray() {
-//		String key = "my.key";
-//		Object[] param = { "1", "2" };
-//		messageContext.add(key, param);
-//
-//		Assert.assertTrue(messageContext.getMessages().size() == 1);
-//		Assert.assertTrue(messageContext.getMessages().get(0).getText().equals(key));
-//		Assert.assertTrue(messageContext.getMessages().get(0).getParameters()[0] == param[0]);
-//		Assert.assertTrue(messageContext.getMessages().get(0).getParameters()[1] == param[1]);
-//	}
-//
-//	@Test
-//	public void testAddStringLocaleObjectArray() {
-//		String key = "my.key";
-//		Object[] param = { "1", "2" };
-//		Locale locale = Locale.CANADA_FRENCH;
-//		messageContext.add(key, locale, param);
-//
-//		Assert.assertTrue(messageContext.getMessages().size() == 1);
-//		Assert.assertTrue(messageContext.getMessages().get(0).getText().equals(key));
-//		Assert.assertTrue(messageContext.getMessages().get(0).getLocale().equals(locale));
-//		Assert.assertTrue(messageContext.getMessages().get(0).getParameters()[0] == param[0]);
-//		Assert.assertTrue(messageContext.getMessages().get(0).getParameters()[1] == param[1]);
-//	}
-//
-//	@Test
-//	public void testAddStringLocaleSeverityTypeObjectArray() {
-//		String key = "my.key";
-//		Object[] param = { "1", "2" };
-//		Locale locale = Locale.CANADA_FRENCH;
-//		SeverityType severity = SeverityType.ERROR;
-//		messageContext.add(key, locale, severity, param);
-//
-//		Assert.assertTrue(messageContext.getMessages().size() == 1);
-//		Assert.assertTrue(messageContext.getMessages().get(0).getText().equals(key));
-//		Assert.assertTrue(messageContext.getMessages().get(0).getLocale().equals(locale));
-//		Assert.assertTrue(messageContext.getMessages().get(0).getSeverity().equals(severity));
-//		Assert.assertTrue(messageContext.getMessages().get(0).getParameters()[0] == param[0]);
-//		Assert.assertTrue(messageContext.getMessages().get(0).getParameters()[1] == param[1]);
-//	}
-//
-//	@Test
-//	public void testAddStringLocaleSeverityTypeStringObjectArray() {
-//		String key = "my.key";
-//		Object[] param = { "1", "2" };
-//		Locale locale = Locale.CANADA_FRENCH;
-//		SeverityType severity = SeverityType.ERROR;
-//		String resource = "myresourcename";
-//		messageContext.add(key, locale, severity, resource, param);
-//
-//		Assert.assertTrue(messageContext.getMessages().size() == 1);
-//		Assert.assertTrue(messageContext.getMessages().get(0).getText().equals(key));
-//		Assert.assertTrue(messageContext.getMessages().get(0).getLocale().equals(locale));
-//		Assert.assertTrue(messageContext.getMessages().get(0).getSeverity().equals(severity));
-//		Assert.assertTrue(messageContext.getMessages().get(0).getResourceName().equals(resource));
-//		Assert.assertTrue(messageContext.getMessages().get(0).getParameters()[0] == param[0]);
-//		Assert.assertTrue(messageContext.getMessages().get(0).getParameters()[1] == param[1]);
-//	}
-
-
-}
 \ No newline at end of file
+	// @Test
+	// public void testAddMessageObjectArray() {
+	// Object[] param = { "1", "2" };
+	// messageContext.add(m1, param);
+
+	// Assert.assertTrue(messageContext.getMessages().size() == 1);
+	// Assert.assertTrue(messageContext.getMessages().contains(m1));
+	// Assert.assertNotNull(messageContext.getMessages().get(0).getParameters());
+	// Assert.assertTrue(messageContext.getMessages().get(0).getParameters()[0] == param[0]);
+	// Assert.assertTrue(messageContext.getMessages().get(0).getParameters()[1] == param[1]);
+	// }
+
+	// @Test
+	// public void testAddStringObjectArray() {
+	// String key = "my.key";
+	// Object[] param = { "1", "2" };
+	// messageContext.add(key, param);
+	//
+	// Assert.assertTrue(messageContext.getMessages().size() == 1);
+	// Assert.assertTrue(messageContext.getMessages().get(0).getText().equals(key));
+	// Assert.assertTrue(messageContext.getMessages().get(0).getParameters()[0] == param[0]);
+	// Assert.assertTrue(messageContext.getMessages().get(0).getParameters()[1] == param[1]);
+	// }
+	//
+	// @Test
+	// public void testAddStringLocaleObjectArray() {
+	// String key = "my.key";
+	// Object[] param = { "1", "2" };
+	// Locale locale = Locale.CANADA_FRENCH;
+	// messageContext.add(key, locale, param);
+	//
+	// Assert.assertTrue(messageContext.getMessages().size() == 1);
+	// Assert.assertTrue(messageContext.getMessages().get(0).getText().equals(key));
+	// Assert.assertTrue(messageContext.getMessages().get(0).getLocale().equals(locale));
+	// Assert.assertTrue(messageContext.getMessages().get(0).getParameters()[0] == param[0]);
+	// Assert.assertTrue(messageContext.getMessages().get(0).getParameters()[1] == param[1]);
+	// }
+	//
+	// @Test
+	// public void testAddStringLocaleSeverityTypeObjectArray() {
+	// String key = "my.key";
+	// Object[] param = { "1", "2" };
+	// Locale locale = Locale.CANADA_FRENCH;
+	// SeverityType severity = SeverityType.ERROR;
+	// messageContext.add(key, locale, severity, param);
+	//
+	// Assert.assertTrue(messageContext.getMessages().size() == 1);
+	// Assert.assertTrue(messageContext.getMessages().get(0).getText().equals(key));
+	// Assert.assertTrue(messageContext.getMessages().get(0).getLocale().equals(locale));
+	// Assert.assertTrue(messageContext.getMessages().get(0).getSeverity().equals(severity));
+	// Assert.assertTrue(messageContext.getMessages().get(0).getParameters()[0] == param[0]);
+	// Assert.assertTrue(messageContext.getMessages().get(0).getParameters()[1] == param[1]);
+	// }
+	//
+	// @Test
+	// public void testAddStringLocaleSeverityTypeStringObjectArray() {
+	// String key = "my.key";
+	// Object[] param = { "1", "2" };
+	// Locale locale = Locale.CANADA_FRENCH;
+	// SeverityType severity = SeverityType.ERROR;
+	// String resource = "myresourcename";
+	// messageContext.add(key, locale, severity, resource, param);
+	//
+	// Assert.assertTrue(messageContext.getMessages().size() == 1);
+	// Assert.assertTrue(messageContext.getMessages().get(0).getText().equals(key));
+	// Assert.assertTrue(messageContext.getMessages().get(0).getLocale().equals(locale));
+	// Assert.assertTrue(messageContext.getMessages().get(0).getSeverity().equals(severity));
+	// Assert.assertTrue(messageContext.getMessages().get(0).getResourceName().equals(resource));
+	// Assert.assertTrue(messageContext.getMessages().get(0).getParameters()[0] == param[0]);
+	// Assert.assertTrue(messageContext.getMessages().get(0).getParameters()[1] == param[1]);
+	// }
+
+}
@@ -0,0 +1,5 @@
+/target
+/.project
+/.classpath
+/.settings
+/.externalToolBuilders
@@ -0,0 +1,93 @@
+<!--
+ 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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+	<modelVersion>4.0.0</modelVersion>
+
+	<artifactId>demoiselle-jaas</artifactId>
+	<packaging>jar</packaging>
+
+	<parent>
+		<groupId>br.gov.frameworkdemoiselle</groupId>
+		<artifactId>demoiselle-extension-parent</artifactId>
+		<version>2.4.0-ALPHA1-SNAPSHOT</version>
+		<relativePath>../../../parent/extension</relativePath>
+	</parent>
+
+	<name>Demoiselle Framework JAAS Extension</name>
+	<description>
+		JAAS Extension
+	</description>
+	<url>http://www.frameworkdemoiselle.gov.br</url>
+
+	<licenses>
+		<license>
+			<name>GNU Lesser General Public License, Version 3</name>
+			<url>http://www.gnu.org/licenses/lgpl-3.0.txt</url>
+		</license>
+	</licenses>
+
+	<organization>
+		<name>SERPRO - Serviço Federal de Processamento de Dados</name>
+		<url>http://www.serpro.gov.br</url>
+	</organization>
+
+	<repositories>
+		<repository>
+			<id>sonatype-nexus-snapshots</id>
+			<name>Sonatype Nexus Snapshots</name>
+			<url>https://oss.sonatype.org/content/repositories/snapshots</url>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+			<releases>
+				<enabled>false</enabled>
+			</releases>
+		</repository>
+		<repository>
+			<id>sonatype-nexus-releases</id>
+			<name>Sonatype Nexus Releases</name>
+			<url>https://oss.sonatype.org/content/repositories/releases</url>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+			<releases>
+				<enabled>true</enabled>
+			</releases>
+		</repository>
+	</repositories>
+</project>
@@ -0,0 +1,57 @@
+/*
+ * 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 java.io.Serializable;
+
+import br.gov.frameworkdemoiselle.configuration.Configuration;
+
+@Configuration(prefix = "frameworkdemoiselle.security")
+public class JAASConfig implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	private String loginModuleName;
+
+	public String getLoginModuleName() {
+		return loginModuleName;
+	}
+
+	public void setLoginModuleName(String loginModuleName) {
+		this.loginModuleName = loginModuleName;
+	}
+}
@@ -0,0 +1,74 @@
+/*
+ * Demoiselle Framework
+ * Copyright (C) 2010 SERPRO
+ * ----------------------------------------------------------------------------
+ * This file is part of Demoiselle Framework.
+ * 
+ * Demoiselle Framework is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License version 3
+ * as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License version 3
+ * along with this program; if not,  see <http://www.gnu.org/licenses/>
+ * or write to the Free Software Foundation, Inc., 51 Franklin Street,
+ * Fifth Floor, Boston, MA  02110-1301, USA.
+ * ----------------------------------------------------------------------------
+ * Este arquivo é parte do Framework Demoiselle.
+ * 
+ * O Framework Demoiselle é um software livre; você pode redistribuí-lo e/ou
+ * modificá-lo dentro dos termos da GNU LGPL versão 3 como publicada pela Fundação
+ * do Software Livre (FSF).
+ * 
+ * Este programa é distribuído na esperança que possa ser útil, mas SEM NENHUMA
+ * GARANTIA; sem uma garantia implícita de ADEQUAÇÃO a qualquer MERCADO ou
+ * APLICAÇÃO EM PARTICULAR. Veja a Licença Pública Geral GNU/LGPL em português
+ * para maiores detalhes.
+ * 
+ * Você deve ter recebido uma cópia da GNU LGPL versão 3, sob o título
+ * "LICENCA.txt", junto com esse programa. Se não, acesse <http://www.gnu.org/licenses/>
+ * ou escreva para a Fundação do Software Livre (FSF) Inc.,
+ * 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA.
+ */
+package br.gov.frameworkdemoiselle.security;
+
+import java.io.Serializable;
+
+import javax.enterprise.context.RequestScoped;
+import javax.inject.Named;
+
+@Named
+@RequestScoped
+public class Credentials implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	private String username;
+
+	private String password;
+
+	public void clear() {
+		this.username = null;
+		this.password = null;
+	}
+
+	public String getUsername() {
+		return username;
+	}
+
+	public void setUsername(String username) {
+		this.username = username;
+	}
+
+	public String getPassword() {
+		return password;
+	}
+
+	public void setPassword(String password) {
+		this.password = password;
+	}
+}
@@ -0,0 +1,215 @@
+/*
+ * 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.security;
+
+import static br.gov.frameworkdemoiselle.internal.implementation.StrategySelector.EXTENSIONS_L1_PRIORITY;
+
+import java.io.IOException;
+import java.security.SecurityPermission;
+
+import javax.enterprise.context.SessionScoped;
+import javax.enterprise.inject.Produces;
+import javax.inject.Inject;
+import javax.security.auth.Subject;
+import javax.security.auth.callback.Callback;
+import javax.security.auth.callback.CallbackHandler;
+import javax.security.auth.callback.NameCallback;
+import javax.security.auth.callback.PasswordCallback;
+import javax.security.auth.callback.UnsupportedCallbackException;
+import javax.security.auth.login.LoginContext;
+import javax.security.auth.login.LoginException;
+
+import org.slf4j.Logger;
+
+import br.gov.frameworkdemoiselle.annotation.Priority;
+import br.gov.frameworkdemoiselle.internal.configuration.JAASConfig;
+import br.gov.frameworkdemoiselle.internal.producer.LoggerProducer;
+import br.gov.frameworkdemoiselle.internal.producer.ResourceBundleProducer;
+import br.gov.frameworkdemoiselle.util.ResourceBundle;
+import br.gov.frameworkdemoiselle.util.Strings;
+
+@SessionScoped
+@Priority(EXTENSIONS_L1_PRIORITY)
+public class JAASAuthenticator implements Authenticator {
+
+	private static final long serialVersionUID = 1L;
+
+	private static ResourceBundle bundle;
+
+	private static Logger logger;
+
+	private User user;
+
+	private final Subject subject;
+
+	@Inject
+	private JAASConfig config;
+
+	@Inject
+	private Credentials credentials;
+
+	public JAASAuthenticator() {
+		this.subject = new Subject();
+	}
+
+	@Override
+	public boolean authenticate() {
+		boolean result = false;
+
+		try {
+			LoginContext loginContext = createLoginContext();
+			
+			if (loginContext != null) {
+				loginContext.login();
+
+				this.user = createUser(this.credentials.getUsername());
+				this.credentials.clear();
+
+				result = true;
+			}
+
+		} catch (LoginException cause) {
+			getLogger().info(cause.getMessage());
+		}
+
+		return result;
+	}
+
+	@Override
+	public void unAuthenticate() {
+		this.user = null;
+	}
+
+	private User createUser(final String username) {
+		return new User() {
+
+			private static final long serialVersionUID = 1L;
+
+			@Override
+			public String getId() {
+				return username;
+			}
+
+			@Override
+			public Object getAttribute(Object key) {
+				return null;
+			}
+
+			@Override
+			public void setAttribute(Object key, Object value) {
+			}
+		};
+	}
+
+	@Override
+	public User getUser() {
+		try {
+			
+//			LoginContext
+			
+//			AbstractSecurityContext.
+			
+//			Object securityContext = System.getSecurityManager().getSecurityContext();
+			
+//			System.out.println(securityContext.toString());
+			
+			String name = config.getLoginModuleName();
+			LoginContext loginContext = new LoginContext(name, this.subject);
+			loginContext.login();
+			
+			Subject subject2 = loginContext.getSubject();
+			
+			System.out.println(subject2.toString());
+			
+		} catch (LoginException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		
+		return this.user;
+	}
+
+	@Produces
+	public Subject getSubject() {
+		return this.subject;
+	}
+
+	public LoginContext createLoginContext() throws LoginException {
+		String name = config.getLoginModuleName();
+
+		if (Strings.isEmpty(name)) {
+			throw new SecurityException(getBundle().getString("required-login-module-name"));
+		}
+
+		return new LoginContext(name, this.subject, createCallbackHandler());
+	}
+
+	private CallbackHandler createCallbackHandler() {
+		return new CallbackHandler() {
+
+			public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException {
+				for (int i = 0; i < callbacks.length; i++) {
+					if (callbacks[i] instanceof NameCallback) {
+						((NameCallback) callbacks[i]).setName(credentials.getUsername());
+
+					} else if (callbacks[i] instanceof PasswordCallback) {
+						((PasswordCallback) callbacks[i]).setPassword(credentials.getPassword().toCharArray());
+
+					} else {
+						getLogger().error(getBundle().getString("unsupported-callback", callbacks[i]));
+					}
+				}
+			}
+		};
+	}
+
+	private static ResourceBundle getBundle() {
+		if (bundle == null) {
+			bundle = ResourceBundleProducer.create("demoiselle-jaas-bundle");
+		}
+
+		return bundle;
+	}
+
+	private static Logger getLogger() {
+		if (logger == null) {
+			logger = LoggerProducer.create(JAASAuthenticator.class);
+		}
+
+		return logger;
+	}
+}
@@ -0,0 +1,102 @@
+/*
+ * Demoiselle Framework
+ * Copyright (C) 2010 SERPRO
+ * ----------------------------------------------------------------------------
+ * This file is part of Demoiselle Framework.
+ * 
+ * Demoiselle Framework is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License version 3
+ * as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License version 3
+ * along with this program; if not,  see <http://www.gnu.org/licenses/>
+ * or write to the Free Software Foundation, Inc., 51 Franklin Street,
+ * Fifth Floor, Boston, MA  02110-1301, USA.
+ * ----------------------------------------------------------------------------
+ * Este arquivo é parte do Framework Demoiselle.
+ * 
+ * O Framework Demoiselle é um software livre; você pode redistribuí-lo e/ou
+ * modificá-lo dentro dos termos da GNU LGPL versão 3 como publicada pela Fundação
+ * do Software Livre (FSF).
+ * 
+ * Este programa é distribuído na esperança que possa ser útil, mas SEM NENHUMA
+ * GARANTIA; sem uma garantia implícita de ADEQUAÇÃO a qualquer MERCADO ou
+ * APLICAÇÃO EM PARTICULAR. Veja a Licença Pública Geral GNU/LGPL em português
+ * para maiores detalhes.
+ * 
+ * Você deve ter recebido uma cópia da GNU LGPL versão 3, sob o título
+ * "LICENCA.txt", junto com esse programa. Se não, acesse <http://www.gnu.org/licenses/>
+ * ou escreva para a Fundação do Software Livre (FSF) Inc.,
+ * 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA.
+ */
+package br.gov.frameworkdemoiselle.security;
+
+import static br.gov.frameworkdemoiselle.internal.implementation.StrategySelector.EXTENSIONS_L1_PRIORITY;
+
+import java.security.Principal;
+import java.security.acl.Group;
+import java.util.Enumeration;
+
+import javax.security.auth.Subject;
+
+import br.gov.frameworkdemoiselle.DemoiselleException;
+import br.gov.frameworkdemoiselle.annotation.Priority;
+import br.gov.frameworkdemoiselle.internal.producer.ResourceBundleProducer;
+import br.gov.frameworkdemoiselle.util.Beans;
+import br.gov.frameworkdemoiselle.util.ResourceBundle;
+
+@Priority(EXTENSIONS_L1_PRIORITY)
+public class JAASAuthorizer implements Authorizer {
+
+	private static final long serialVersionUID = 1L;
+
+	private static ResourceBundle bundle;
+
+	@Override
+	public boolean hasRole(String role) {
+		boolean result = false;
+
+		Group group;
+		Principal member;
+		Enumeration<? extends Principal> enumeration;
+		Subject subject = Beans.getReference(Subject.class);
+
+		for (Principal principal : subject.getPrincipals()) {
+
+			if (principal instanceof Group) {
+				group = (Group) principal;
+				enumeration = group.members();
+
+				while (enumeration.hasMoreElements()) {
+					member = (Principal) enumeration.nextElement();
+
+					if (member.getName().equals(role)) {
+						result = true;
+						break;
+					}
+				}
+			}
+		}
+
+		return result;
+	}
+
+	@Override
+	public boolean hasPermission(String resource, String operation) {
+		throw new DemoiselleException(getBundle().getString("has-permission-not-supported",
+				RequiredPermission.class.getSimpleName()));
+	}
+
+	private static ResourceBundle getBundle() {
+		if (bundle == null) {
+			bundle = ResourceBundleProducer.create("demoiselle-jaas-bundle");
+		}
+
+		return bundle;
+	}
+}
@@ -0,0 +1,40 @@
+<!--
+ Demoiselle Framework
+ Copyright (C) 2010 SERPRO
+ ============================================================================
+ This file is part of Demoiselle Framework.
+ 
+ Demoiselle Framework is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public License version 3
+ as published by the Free Software Foundation.
+ 
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ 
+ You should have received a copy of the GNU Lesser General Public License version 3
+ along with this program; if not,  see <http://www.gnu.org/licenses/>
+ or write to the Free Software Foundation, Inc., 51 Franklin Street,
+ Fifth Floor, Boston, MA  02110-1301, USA.
+ ============================================================================
+ Este arquivo é parte do Framework Demoiselle.
+ 
+ O Framework Demoiselle é um software livre; você pode redistribuí-lo e/ou
+ modificá-lo dentro dos termos da GNU LGPL versão 3 como publicada pela Fundação
+ do Software Livre (FSF).
+ 
+ Este programa é distribuído na esperança que possa ser útil, mas SEM NENHUMA
+ GARANTIA; sem uma garantia implícita de ADEQUAÇÃO a qualquer MERCADO ou
+ APLICAÇÃO EM PARTICULAR. Veja a Licença Pública Geral GNU/LGPL em português
+ para maiores detalhes.
+ 
+ Você deve ter recebido uma cópia da GNU LGPL versão 3, sob o título
+ "LICENCA.txt", junto com esse programa. Se não, acesse <http://www.gnu.org/licenses/>
+ ou escreva para a Fundação do Software Livre (FSF) Inc.,
+ 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA.
+-->
+<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">
+
+</beans>
 \ No newline at end of file
@@ -0,0 +1,38 @@
+# 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.
+
+has-permission-not-supported=N\u00E3o \u00E9 poss\u00EDvel utilizar @{0}, pois esta funcionalidade n\u00E3o \u00E9 suportada pelo JAAS
+unsupported-callback=Callback n\u00E3o suportado\: {0}
+required-login-module-name=\u00C9 preciso definir a propriedade frameworkdemoiselle.security.login.module.name no arquivo demoiselle.properties
@@ -0,0 +1,5 @@
+/target
+/.project
+/.classpath
+/.settings
+/.externalToolBuilders
@@ -0,0 +1,100 @@
+<!--
+ Demoiselle Framework
+ Copyright (C) 2010 SERPRO
+ ============================================================================
+ This file is part of Demoiselle Framework.
+ 
+ Demoiselle Framework is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public License version 3
+ as published by the Free Software Foundation.
+ 
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ 
+ You should have received a copy of the GNU Lesser General Public License version 3
+ along with this program; if not,  see <http://www.gnu.org/licenses />
+ or write to the Free Software Foundation, Inc., 51 Franklin Street,
+ Fifth Floor, Boston, MA  02110-1301, USA.
+ ============================================================================
+ Este arquivo é parte do Framework Demoiselle.
+ 
+ O Framework Demoiselle é um software livre; você pode redistribuí-lo e/ou
+ modificá-lo dentro dos termos da GNU LGPL versão 3 como publicada pela Fundação
+ do Software Livre (FSF).
+ 
+ Este programa é distribuído na esperança que possa ser útil, mas SEM NENHUMA
+ GARANTIA; sem uma garantia implícita de ADEQUAÇÃO a qualquer MERCADO ou
+ APLICAÇÃO EM PARTICULAR. Veja a Licença Pública Geral GNU/LGPL em português
+ para maiores detalhes.
+ 
+ Você deve ter recebido uma cópia da GNU LGPL versão 3, sob o título
+ "LICENCA.txt", junto com esse programa. Se não, acesse <http://www.gnu.org/licenses />
+ ou escreva para a Fundação do Software Livre (FSF) Inc.,
+ 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+	<modelVersion>4.0.0</modelVersion>
+
+	<artifactId>demoiselle-jdbc</artifactId>
+	<packaging>jar</packaging>
+
+	<parent>
+		<groupId>br.gov.frameworkdemoiselle</groupId>
+		<artifactId>demoiselle-extension-parent</artifactId>
+		<version>2.4.0-ALPHA1-SNAPSHOT</version>
+		<relativePath>../../../parent/extension</relativePath>
+	</parent>
+
+	<name>Demoiselle Framework JDBC Extension</name>
+	<description>
+		Demoiselle Framework JDBC Extension
+	</description>
+	<url>http://www.frameworkdemoiselle.gov.br</url>
+
+	<licenses>
+		<license>
+			<name>GNU Lesser General Public License, Version 3</name>
+			<url>http://www.gnu.org/licenses/lgpl-3.0.txt</url>
+		</license>
+	</licenses>
+
+	<organization>
+		<name>SERPRO - Serviço Federal de Processamento de Dados</name>
+		<url>http://www.serpro.gov.br</url>
+	</organization>
+
+	<dependencies>
+		<dependency>
+			<groupId>commons-dbcp</groupId>
+			<artifactId>commons-dbcp</artifactId>
+		</dependency>
+	</dependencies>
+
+	<repositories>
+		<repository>
+			<id>sonatype-nexus-snapshots</id>
+			<name>Sonatype Nexus Snapshots</name>
+			<url>https://oss.sonatype.org/content/repositories/snapshots</url>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+			<releases>
+				<enabled>false</enabled>
+			</releases>
+		</repository>
+		<repository>
+			<id>sonatype-nexus-releases</id>
+			<name>Sonatype Nexus Releases</name>
+			<url>https://oss.sonatype.org/content/repositories/releases</url>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+			<releases>
+				<enabled>true</enabled>
+			</releases>
+		</repository>
+	</repositories>
+</project>
@@ -0,0 +1,91 @@
+/*
+ * 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 java.io.Serializable;
+import java.util.Map;
+
+import br.gov.frameworkdemoiselle.annotation.Name;
+import br.gov.frameworkdemoiselle.configuration.Configuration;
+
+@Configuration(prefix = "frameworkdemoiselle.persistence.")
+public class JDBCConfig implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	@Name("default.datasource.name")
+	private String defaultDataDourceName;
+
+	@Name("jndi.name")
+	private Map<String, String> jndiName;
+
+	@Name("driver.class")
+	private Map<String, String> driverClass;
+
+	@Name("url")
+	private Map<String, String> url;
+
+	@Name("username")
+	private Map<String, String> username;
+
+	@Name("password")
+	private Map<String, String> password;
+
+	public String getDefaultDataDourceName() {
+		return defaultDataDourceName;
+	}
+
+	public Map<String, String> getJndiName() {
+		return jndiName;
+	}
+
+	public Map<String, String> getDriverClass() {
+		return driverClass;
+	}
+
+	public Map<String, String> getUrl() {
+		return url;
+	}
+
+	public Map<String, String> getUsername() {
+		return username;
+	}
+
+	public Map<String, String> getPassword() {
+		return password;
+	}
+}
@@ -0,0 +1,160 @@
+package br.gov.frameworkdemoiselle.internal.producer;
+
+import java.io.Serializable;
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
+import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
+import javax.enterprise.context.RequestScoped;
+import javax.enterprise.inject.Default;
+import javax.enterprise.inject.Produces;
+import javax.enterprise.inject.spi.InjectionPoint;
+import javax.inject.Inject;
+
+import org.slf4j.Logger;
+
+import br.gov.frameworkdemoiselle.DemoiselleException;
+import br.gov.frameworkdemoiselle.annotation.Name;
+import br.gov.frameworkdemoiselle.internal.configuration.JDBCConfig;
+import br.gov.frameworkdemoiselle.internal.proxy.ConnectionProxy;
+import br.gov.frameworkdemoiselle.util.ResourceBundle;
+
+@RequestScoped
+public class ConnectionProducer implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	@Inject
+	private Logger logger;
+
+	@Inject
+	@Name("demoiselle-jdbc-bundle")
+	private ResourceBundle bundle;
+
+	private final Map<String, Connection> cache = Collections.synchronizedMap(new HashMap<String, Connection>());
+
+	@Inject
+	private DataSourceProducer producer;
+
+	@PostConstruct
+	public void init() {
+		for (String name : producer.getCache().keySet()) {
+			getConnection(name);
+		}
+	}
+
+	@Default
+	@Produces
+	public Connection create(InjectionPoint ip, JDBCConfig config) {
+		String name = getName(ip, config);
+		return new ConnectionProxy(name);
+	}
+
+	public Connection getConnection(String name) {
+		Connection connection = null;
+
+		if (cache.containsKey(name)) {
+			connection = cache.get(name);
+
+		} else {
+			try {
+				connection = producer.create(name).getConnection();
+				disableAutoCommit(connection);
+
+				cache.put(name, connection);
+				logger.info(bundle.getString("connection-was-created", name));
+
+			} catch (Exception cause) {
+				// TODO Colocar uma mensagem amigável
+				throw new DemoiselleException(cause);
+			}
+		}
+
+		return connection;
+	}
+
+	private void disableAutoCommit(Connection connection) {
+		try {
+			connection.setAutoCommit(false);
+
+		} catch (SQLException cause) {
+			logger.debug(bundle.getString("set-autocommit-failed"));
+		}
+	}
+
+	private String getName(InjectionPoint ip, JDBCConfig config) {
+		String result;
+
+		if (ip != null && ip.getAnnotated() != null && ip.getAnnotated().isAnnotationPresent(Name.class)) {
+			result = ip.getAnnotated().getAnnotation(Name.class).value();
+
+		} else {
+			result = getNameFromProperties(config);
+
+			if (result == null) {
+				result = getNameFromCache();
+			}
+		}
+
+		return result;
+	}
+
+	private String getNameFromProperties(JDBCConfig config) {
+		String result = config.getDefaultDataDourceName();
+
+		if (result != null) {
+			logger.debug(bundle.getString("getting-default-datasource-name-from-properties", result));
+		}
+
+		return result;
+	}
+
+	private String getNameFromCache() {
+		String result;
+		Set<String> names = producer.getCache().keySet();
+
+		if (names.size() > 1) {
+			throw new DemoiselleException(bundle.getString("more-than-one-datasource-defined",
+					Name.class.getSimpleName()));
+		} else {
+			result = names.iterator().next();
+		}
+
+		return result;
+	}
+
+	@PreDestroy
+	public void close() {
+		Connection connection;
+
+		for (String key : cache.keySet()) {
+			connection = cache.get(key);
+
+			try {
+				if (connection.isClosed()) {
+					logger.warn(bundle.getString("connection-has-already-been-closed", key));
+
+				} else {
+					connection.close();
+
+					logger.info(bundle.getString("connection-was-closed", key));
+				}
+
+			} catch (Exception cause) {
+				throw new DemoiselleException(bundle.getString("connection-close-failed", key), cause);
+			}
+		}
+
+		cache.clear();
+	}
+
+	public Map<String, Connection> getCache() {
+		return cache;
+	}
+
+}
@@ -0,0 +1,164 @@
+package br.gov.frameworkdemoiselle.internal.producer;
+
+import java.io.Serializable;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
+import javax.enterprise.context.ApplicationScoped;
+import javax.inject.Inject;
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+import javax.sql.DataSource;
+
+import org.slf4j.Logger;
+
+import br.gov.frameworkdemoiselle.DemoiselleException;
+import br.gov.frameworkdemoiselle.annotation.Name;
+import br.gov.frameworkdemoiselle.internal.configuration.JDBCConfig;
+import br.gov.frameworkdemoiselle.transaction.BasicDataSourceProxy;
+import br.gov.frameworkdemoiselle.util.Beans;
+import br.gov.frameworkdemoiselle.util.ResourceBundle;
+
+@ApplicationScoped
+public class DataSourceProducer implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	@Inject
+	private Logger logger;
+
+	@Inject
+	@Name("demoiselle-jdbc-bundle")
+	private ResourceBundle bundle;
+
+	private final Map<ClassLoader, Map<String, DataSource>> cache = Collections
+			.synchronizedMap(new HashMap<ClassLoader, Map<String, DataSource>>());
+
+	@PostConstruct
+	public void loadDataSources() {
+		ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
+
+		for (String dataBaseName : getDataSourceNames(contextClassLoader)) {
+
+			try {
+				create(dataBaseName);
+			} catch (Throwable t) {
+				throw new DemoiselleException(t);
+			}
+
+			logger.debug(bundle.getString("datasource-name-found", dataBaseName));
+		}
+	}
+
+	private Set<String> getDataSourceNames(ClassLoader classLoader) {
+		Set<String> result = new HashSet<String>();
+
+		JDBCConfig config = Beans.getReference(JDBCConfig.class);
+
+		if (config.getJndiName() != null) {
+			result.addAll(config.getJndiName().keySet());
+		}
+
+		if (config.getDriverClass() != null) {
+			result.addAll(config.getDriverClass().keySet());
+		}
+
+		if (result.isEmpty()) {
+			throw new DemoiselleException(bundle.getString("datasource-name-not-found"));
+		}
+
+		return result;
+	}
+
+	public DataSource create(String dataSourceName) {
+		DataSource factory;
+
+		ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
+		Map<String, DataSource> localCache;
+
+		if (cache.containsKey(contextClassLoader)) {
+			localCache = cache.get(contextClassLoader);
+
+			if (localCache.containsKey(dataSourceName)) {
+				factory = localCache.get(dataSourceName);
+
+			} else {
+				factory = initDataSource(dataSourceName);
+
+				localCache.put(dataSourceName, factory);
+				cache.put(contextClassLoader, localCache);
+			}
+
+		} else {
+			localCache = new HashMap<String, DataSource>();
+			factory = initDataSource(dataSourceName);
+
+			localCache.put(dataSourceName, factory);
+			cache.put(contextClassLoader, localCache);
+		}
+
+		return factory;
+	}
+
+	private DataSource initDataSource(String dataSourceName) {
+		DataSource result;
+
+		JDBCConfig config = Beans.getReference(JDBCConfig.class);
+		Map<String, String> jndiMap = config.getJndiName();
+
+		if (jndiMap != null) {
+			result = initJNDIDataSource(dataSourceName, config);
+
+		} else {
+			result = new BasicDataSourceProxy(dataSourceName, config, bundle);
+		}
+
+		return result;
+	}
+
+	private DataSource initJNDIDataSource(String dataSourceName, JDBCConfig config) {
+		DataSource result = null;
+
+		try {
+			Context context = new InitialContext();
+			String jndi = config.getJndiName().get(dataSourceName);
+
+			result = (DataSource) context.lookup(jndi);
+
+		} catch (NamingException cause) {
+			throw new DemoiselleException(bundle.getString("load-jndi-datasource-failed", dataSourceName), cause);
+
+		} catch (ClassCastException cause) {
+			throw new DemoiselleException(bundle.getString("load-duplicated-configuration-failed"), cause);
+		}
+
+		return result;
+	}
+
+	@PreDestroy
+	public void close() {
+		cache.clear();
+	}
+
+	public Map<String, DataSource> getCache() {
+		ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
+		Map<String, DataSource> result = cache.get(classLoader);
+
+		if (result == null || result.isEmpty()) {
+			logger.debug(bundle.getString("datasource-not-found-in-cache"));
+
+			for (String name : getDataSourceNames(classLoader)) {
+				create(name);
+				result = cache.get(classLoader);
+			}
+		}
+
+		return result;
+	}
+}
@@ -0,0 +1,239 @@
+package br.gov.frameworkdemoiselle.internal.proxy;
+
+import java.io.Serializable;
+import java.sql.Array;
+import java.sql.Blob;
+import java.sql.CallableStatement;
+import java.sql.Clob;
+import java.sql.Connection;
+import java.sql.DatabaseMetaData;
+import java.sql.NClob;
+import java.sql.PreparedStatement;
+import java.sql.SQLClientInfoException;
+import java.sql.SQLException;
+import java.sql.SQLWarning;
+import java.sql.SQLXML;
+import java.sql.Savepoint;
+import java.sql.Statement;
+import java.sql.Struct;
+import java.util.Map;
+import java.util.Properties;
+
+import br.gov.frameworkdemoiselle.internal.producer.ConnectionProducer;
+import br.gov.frameworkdemoiselle.util.Beans;
+
+public class ConnectionProxy implements Connection, Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	private final String dataSourceName;
+
+	public ConnectionProxy(String dataSourceName) {
+		this.dataSourceName = dataSourceName;
+	}
+
+	private Connection getDelegate() {
+		ConnectionProducer emp = Beans.getReference(ConnectionProducer.class);
+		return emp.getConnection(this.dataSourceName);
+	}
+
+	public void clearWarnings() throws SQLException {
+		getDelegate().clearWarnings();
+	}
+
+	public void close() throws SQLException {
+		getDelegate().close();
+	}
+
+	public void commit() throws SQLException {
+		getDelegate().commit();
+	}
+
+	public Array createArrayOf(String typeName, Object[] elements) throws SQLException {
+		return getDelegate().createArrayOf(typeName, elements);
+	}
+
+	public Blob createBlob() throws SQLException {
+		return getDelegate().createBlob();
+	}
+
+	public Clob createClob() throws SQLException {
+		return getDelegate().createClob();
+	}
+
+	public NClob createNClob() throws SQLException {
+		return getDelegate().createNClob();
+	}
+
+	public SQLXML createSQLXML() throws SQLException {
+		return getDelegate().createSQLXML();
+	}
+
+	public Statement createStatement() throws SQLException {
+		return getDelegate().createStatement();
+	}
+
+	public Statement createStatement(int resultSetType, int resultSetConcurrency, int resultSetHoldability)
+			throws SQLException {
+		return getDelegate().createStatement(resultSetType, resultSetConcurrency, resultSetHoldability);
+	}
+
+	public Statement createStatement(int resultSetType, int resultSetConcurrency) throws SQLException {
+		return getDelegate().createStatement(resultSetType, resultSetConcurrency);
+	}
+
+	public Struct createStruct(String typeName, Object[] attributes) throws SQLException {
+		return getDelegate().createStruct(typeName, attributes);
+	}
+
+	public boolean getAutoCommit() throws SQLException {
+		return getDelegate().getAutoCommit();
+	}
+
+	public String getCatalog() throws SQLException {
+		return getDelegate().getCatalog();
+	}
+
+	public Properties getClientInfo() throws SQLException {
+		return getDelegate().getClientInfo();
+	}
+
+	public String getClientInfo(String name) throws SQLException {
+		return getDelegate().getClientInfo(name);
+	}
+
+	public int getHoldability() throws SQLException {
+		return getDelegate().getHoldability();
+	}
+
+	public DatabaseMetaData getMetaData() throws SQLException {
+		return getDelegate().getMetaData();
+	}
+
+	public int getTransactionIsolation() throws SQLException {
+		return getDelegate().getTransactionIsolation();
+	}
+
+	public Map<String, Class<?>> getTypeMap() throws SQLException {
+		return getDelegate().getTypeMap();
+	}
+
+	public SQLWarning getWarnings() throws SQLException {
+		return getDelegate().getWarnings();
+	}
+
+	public boolean isClosed() throws SQLException {
+		return getDelegate().isClosed();
+	}
+
+	public boolean isReadOnly() throws SQLException {
+		return getDelegate().isReadOnly();
+	}
+
+	public boolean isValid(int timeout) throws SQLException {
+		return getDelegate().isValid(timeout);
+	}
+
+	public boolean isWrapperFor(Class<?> iface) throws SQLException {
+		return getDelegate().isWrapperFor(iface);
+	}
+
+	public String nativeSQL(String sql) throws SQLException {
+		return getDelegate().nativeSQL(sql);
+	}
+
+	public CallableStatement prepareCall(String sql, int resultSetType, int resultSetConcurrency,
+			int resultSetHoldability) throws SQLException {
+		return getDelegate().prepareCall(sql, resultSetType, resultSetConcurrency, resultSetHoldability);
+	}
+
+	public CallableStatement prepareCall(String sql, int resultSetType, int resultSetConcurrency) throws SQLException {
+		return getDelegate().prepareCall(sql, resultSetType, resultSetConcurrency);
+	}
+
+	public CallableStatement prepareCall(String sql) throws SQLException {
+		return getDelegate().prepareCall(sql);
+	}
+
+	public PreparedStatement prepareStatement(String sql, int resultSetType, int resultSetConcurrency,
+			int resultSetHoldability) throws SQLException {
+		return getDelegate().prepareStatement(sql, resultSetType, resultSetConcurrency, resultSetHoldability);
+	}
+
+	public PreparedStatement prepareStatement(String sql, int resultSetType, int resultSetConcurrency)
+			throws SQLException {
+		return getDelegate().prepareStatement(sql, resultSetType, resultSetConcurrency);
+	}
+
+	public PreparedStatement prepareStatement(String sql, int autoGeneratedKeys) throws SQLException {
+		return getDelegate().prepareStatement(sql, autoGeneratedKeys);
+	}
+
+	public PreparedStatement prepareStatement(String sql, int[] columnIndexes) throws SQLException {
+		return getDelegate().prepareStatement(sql, columnIndexes);
+	}
+
+	public PreparedStatement prepareStatement(String sql, String[] columnNames) throws SQLException {
+		return getDelegate().prepareStatement(sql, columnNames);
+	}
+
+	public PreparedStatement prepareStatement(String sql) throws SQLException {
+		return getDelegate().prepareStatement(sql);
+	}
+
+	public void releaseSavepoint(Savepoint savepoint) throws SQLException {
+		getDelegate().releaseSavepoint(savepoint);
+	}
+
+	public void rollback() throws SQLException {
+		getDelegate().rollback();
+	}
+
+	public void rollback(Savepoint savepoint) throws SQLException {
+		getDelegate().rollback(savepoint);
+	}
+
+	public void setAutoCommit(boolean autoCommit) throws SQLException {
+		getDelegate().setAutoCommit(autoCommit);
+	}
+
+	public void setCatalog(String catalog) throws SQLException {
+		getDelegate().setCatalog(catalog);
+	}
+
+	public void setClientInfo(Properties properties) throws SQLClientInfoException {
+		getDelegate().setClientInfo(properties);
+	}
+
+	public void setClientInfo(String name, String value) throws SQLClientInfoException {
+		getDelegate().setClientInfo(name, value);
+	}
+
+	public void setHoldability(int holdability) throws SQLException {
+		getDelegate().setHoldability(holdability);
+	}
+
+	public void setReadOnly(boolean readOnly) throws SQLException {
+		getDelegate().setReadOnly(readOnly);
+	}
+
+	public Savepoint setSavepoint() throws SQLException {
+		return getDelegate().setSavepoint();
+	}
+
+	public Savepoint setSavepoint(String name) throws SQLException {
+		return getDelegate().setSavepoint(name);
+	}
+
+	public void setTransactionIsolation(int level) throws SQLException {
+		getDelegate().setTransactionIsolation(level);
+	}
+
+	public void setTypeMap(Map<String, Class<?>> map) throws SQLException {
+		getDelegate().setTypeMap(map);
+	}
+
+	public <T> T unwrap(Class<T> iface) throws SQLException {
+		return getDelegate().unwrap(iface);
+	}
+}
@@ -0,0 +1,363 @@
+package br.gov.frameworkdemoiselle.transaction;
+
+import java.io.PrintWriter;
+import java.io.Serializable;
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.util.Collection;
+
+import org.apache.commons.dbcp.BasicDataSource;
+
+import br.gov.frameworkdemoiselle.DemoiselleException;
+import br.gov.frameworkdemoiselle.internal.configuration.JDBCConfig;
+import br.gov.frameworkdemoiselle.util.ResourceBundle;
+
+public class BasicDataSourceProxy extends BasicDataSource implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	private ResourceBundle bundle;
+
+	private String dataSourceName;
+
+	private JDBCConfig config;
+
+	private transient BasicDataSource delegate;
+
+	public BasicDataSourceProxy(String dataSourceName, JDBCConfig config, ResourceBundle bundle) {
+		this.dataSourceName = dataSourceName;
+		this.config = config;
+		this.bundle = bundle;
+	}
+
+	private BasicDataSource getDelegate() {
+		if (this.delegate == null) {
+			BasicDataSource dataSource = new BasicDataSource();
+
+			try {
+				String driver = config.getDriverClass().get(dataSourceName);
+				String url = config.getUrl().get(dataSourceName);
+				String username = config.getUsername().get(dataSourceName);
+				String password = config.getPassword().get(dataSourceName);
+
+				dataSource.setDriverClassName(driver);
+				dataSource.setUrl(url);
+				dataSource.setUsername(username);
+				dataSource.setPassword(password);
+
+			} catch (ClassCastException cause) {
+				throw new DemoiselleException(bundle.getString("load-duplicated-configuration-failed"), cause);
+			}
+
+			delegate = dataSource;
+		}
+
+		return this.delegate;
+	}
+
+	public boolean getDefaultAutoCommit() {
+		return getDelegate().getDefaultAutoCommit();
+	}
+
+	public void setDefaultAutoCommit(boolean defaultAutoCommit) {
+		getDelegate().setDefaultAutoCommit(defaultAutoCommit);
+	}
+
+	public boolean getDefaultReadOnly() {
+		return getDelegate().getDefaultReadOnly();
+	}
+
+	public void setDefaultReadOnly(boolean defaultReadOnly) {
+		getDelegate().setDefaultReadOnly(defaultReadOnly);
+	}
+
+	public int getDefaultTransactionIsolation() {
+		return getDelegate().getDefaultTransactionIsolation();
+	}
+
+	public void setDefaultTransactionIsolation(int defaultTransactionIsolation) {
+		getDelegate().setDefaultTransactionIsolation(defaultTransactionIsolation);
+	}
+
+	public String getDefaultCatalog() {
+		return getDelegate().getDefaultCatalog();
+	}
+
+	public void setDefaultCatalog(String defaultCatalog) {
+		getDelegate().setDefaultCatalog(defaultCatalog);
+	}
+
+	public String getDriverClassName() {
+		return getDelegate().getDriverClassName();
+	}
+
+	public void setDriverClassName(String driverClassName) {
+		getDelegate().setDriverClassName(driverClassName);
+	}
+
+	public ClassLoader getDriverClassLoader() {
+		return getDelegate().getDriverClassLoader();
+	}
+
+	public void setDriverClassLoader(ClassLoader driverClassLoader) {
+		getDelegate().setDriverClassLoader(driverClassLoader);
+	}
+
+	public int getMaxActive() {
+		return getDelegate().getMaxActive();
+	}
+
+	public void setMaxActive(int maxActive) {
+		getDelegate().setMaxActive(maxActive);
+	}
+
+	public int getMaxIdle() {
+		return getDelegate().getMaxIdle();
+	}
+
+	public void setMaxIdle(int maxIdle) {
+		getDelegate().setMaxIdle(maxIdle);
+	}
+
+	public int getMinIdle() {
+		return getDelegate().getMinIdle();
+	}
+
+	public void setMinIdle(int minIdle) {
+		getDelegate().setMinIdle(minIdle);
+	}
+
+	public int getInitialSize() {
+		return getDelegate().getInitialSize();
+	}
+
+	public void setInitialSize(int initialSize) {
+		getDelegate().setInitialSize(initialSize);
+	}
+
+	public long getMaxWait() {
+		return getDelegate().getMaxWait();
+	}
+
+	public void setMaxWait(long maxWait) {
+		getDelegate().setMaxWait(maxWait);
+	}
+
+	public boolean isPoolPreparedStatements() {
+		return getDelegate().isPoolPreparedStatements();
+	}
+
+	public void setPoolPreparedStatements(boolean poolingStatements) {
+		getDelegate().setPoolPreparedStatements(poolingStatements);
+	}
+
+	public int getMaxOpenPreparedStatements() {
+		return getDelegate().getMaxOpenPreparedStatements();
+	}
+
+	public void setMaxOpenPreparedStatements(int maxOpenStatements) {
+		getDelegate().setMaxOpenPreparedStatements(maxOpenStatements);
+	}
+
+	public boolean getTestOnBorrow() {
+		return getDelegate().getTestOnBorrow();
+	}
+
+	public void setTestOnBorrow(boolean testOnBorrow) {
+		getDelegate().setTestOnBorrow(testOnBorrow);
+	}
+
+	public boolean getTestOnReturn() {
+		return getDelegate().getTestOnReturn();
+	}
+
+	public void setTestOnReturn(boolean testOnReturn) {
+		getDelegate().setTestOnReturn(testOnReturn);
+	}
+
+	public long getTimeBetweenEvictionRunsMillis() {
+		return getDelegate().getTimeBetweenEvictionRunsMillis();
+	}
+
+	public void setTimeBetweenEvictionRunsMillis(long timeBetweenEvictionRunsMillis) {
+		getDelegate().setTimeBetweenEvictionRunsMillis(timeBetweenEvictionRunsMillis);
+	}
+
+	public int getNumTestsPerEvictionRun() {
+		return getDelegate().getNumTestsPerEvictionRun();
+	}
+
+	public void setNumTestsPerEvictionRun(int numTestsPerEvictionRun) {
+		getDelegate().setNumTestsPerEvictionRun(numTestsPerEvictionRun);
+	}
+
+	public long getMinEvictableIdleTimeMillis() {
+		return getDelegate().getMinEvictableIdleTimeMillis();
+	}
+
+	public void setMinEvictableIdleTimeMillis(long minEvictableIdleTimeMillis) {
+		getDelegate().setMinEvictableIdleTimeMillis(minEvictableIdleTimeMillis);
+	}
+
+	public boolean getTestWhileIdle() {
+		return getDelegate().getTestWhileIdle();
+	}
+
+	public void setTestWhileIdle(boolean testWhileIdle) {
+		getDelegate().setTestWhileIdle(testWhileIdle);
+	}
+
+	public int getNumActive() {
+		return getDelegate().getNumActive();
+	}
+
+	public int getNumIdle() {
+		return getDelegate().getNumIdle();
+	}
+
+	public String getPassword() {
+		return getDelegate().getPassword();
+	}
+
+	public void setPassword(String password) {
+		getDelegate().setPassword(password);
+	}
+
+	public String getUrl() {
+		return getDelegate().getUrl();
+	}
+
+	public void setUrl(String url) {
+		getDelegate().setUrl(url);
+	}
+
+	public String getUsername() {
+		return getDelegate().getUsername();
+	}
+
+	public void setUsername(String username) {
+		getDelegate().setUsername(username);
+	}
+
+	public String getValidationQuery() {
+		return getDelegate().getValidationQuery();
+	}
+
+	public void setValidationQuery(String validationQuery) {
+		getDelegate().setValidationQuery(validationQuery);
+	}
+
+	public int getValidationQueryTimeout() {
+		return getDelegate().getValidationQueryTimeout();
+	}
+
+	public void setValidationQueryTimeout(int timeout) {
+		getDelegate().setValidationQueryTimeout(timeout);
+	}
+
+	@SuppressWarnings("rawtypes")
+	public Collection getConnectionInitSqls() {
+		return getDelegate().getConnectionInitSqls();
+	}
+
+	@SuppressWarnings("rawtypes")
+	public void setConnectionInitSqls(Collection connectionInitSqls) {
+		getDelegate().setConnectionInitSqls(connectionInitSqls);
+	}
+
+	public void setAccessToUnderlyingConnectionAllowed(boolean allow) {
+		getDelegate().setAccessToUnderlyingConnectionAllowed(allow);
+	}
+
+	public Connection getConnection(String user, String pass) throws SQLException {
+		return getDelegate().getConnection(user, pass);
+	}
+
+	public int getLoginTimeout() throws SQLException {
+		return getDelegate().getLoginTimeout();
+	}
+
+	public PrintWriter getLogWriter() throws SQLException {
+		return getDelegate().getLogWriter();
+	}
+
+	public void setLoginTimeout(int loginTimeout) throws SQLException {
+		getDelegate().setLoginTimeout(loginTimeout);
+	}
+
+	public void setLogWriter(PrintWriter logWriter) throws SQLException {
+		getDelegate().setLogWriter(logWriter);
+	}
+
+	public boolean getRemoveAbandoned() {
+		return getDelegate().getRemoveAbandoned();
+	}
+
+	public void setRemoveAbandoned(boolean removeAbandoned) {
+		getDelegate().setRemoveAbandoned(removeAbandoned);
+	}
+
+	public int getRemoveAbandonedTimeout() {
+		return getDelegate().getRemoveAbandonedTimeout();
+	}
+
+	public void setRemoveAbandonedTimeout(int removeAbandonedTimeout) {
+		getDelegate().setRemoveAbandonedTimeout(removeAbandonedTimeout);
+	}
+
+	public boolean getLogAbandoned() {
+		return getDelegate().getLogAbandoned();
+	}
+
+	public void setLogAbandoned(boolean logAbandoned) {
+		getDelegate().setLogAbandoned(logAbandoned);
+	}
+
+	public void addConnectionProperty(String name, String value) {
+		getDelegate().addConnectionProperty(name, value);
+	}
+
+	public void removeConnectionProperty(String name) {
+		getDelegate().removeConnectionProperty(name);
+	}
+
+	public void setConnectionProperties(String connectionProperties) {
+		getDelegate().setConnectionProperties(connectionProperties);
+	}
+
+	public void close() throws SQLException {
+		getDelegate().close();
+	}
+
+	public boolean equals(Object arg0) {
+		return getDelegate().equals(arg0);
+	}
+
+	public Connection getConnection() throws SQLException {
+		return getDelegate().getConnection();
+	}
+
+	public int hashCode() {
+		return getDelegate().hashCode();
+	}
+
+	public boolean isAccessToUnderlyingConnectionAllowed() {
+		return getDelegate().isAccessToUnderlyingConnectionAllowed();
+	}
+
+	public boolean isClosed() {
+		return getDelegate().isClosed();
+	}
+
+	public boolean isWrapperFor(Class<?> iface) throws SQLException {
+		return getDelegate().isWrapperFor(iface);
+	}
+
+	public String toString() {
+		return getDelegate().toString();
+	}
+
+	public <T> T unwrap(Class<T> iface) throws SQLException {
+		return getDelegate().unwrap(iface);
+	}
+}
@@ -0,0 +1,175 @@
+/*
+ * Demoiselle Framework
+ * Copyright (C) 2010 SERPRO
+ * ----------------------------------------------------------------------------
+ * This file is part of Demoiselle Framework.
+ * 
+ * Demoiselle Framework is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License version 3
+ * as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License version 3
+ * along with this program; if not,  see <http://www.gnu.org/licenses/>
+ * or write to the Free Software Foundation, Inc., 51 Franklin Street,
+ * Fifth Floor, Boston, MA  02110-1301, USA.
+ * ----------------------------------------------------------------------------
+ * Este arquivo é parte do Framework Demoiselle.
+ * 
+ * O Framework Demoiselle é um software livre; você pode redistribuí-lo e/ou
+ * modificá-lo dentro dos termos da GNU LGPL versão 3 como publicada pela Fundação
+ * do Software Livre (FSF).
+ * 
+ * Este programa é distribuído na esperança que possa ser útil, mas SEM NENHUMA
+ * GARANTIA; sem uma garantia implícita de ADEQUAÇÃO a qualquer MERCADO ou
+ * APLICAÇÃO EM PARTICULAR. Veja a Licença Pública Geral GNU/LGPL em português
+ * para maiores detalhes.
+ * 
+ * Você deve ter recebido uma cópia da GNU LGPL versão 3, sob o título
+ * "LICENCA.txt", junto com esse programa. Se não, acesse <http://www.gnu.org/licenses/>
+ * ou escreva para a Fundação do Software Livre (FSF) Inc.,
+ * 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA.
+ */
+package br.gov.frameworkdemoiselle.transaction;
+
+import static br.gov.frameworkdemoiselle.internal.implementation.StrategySelector.EXTENSIONS_L1_PRIORITY;
+
+import java.io.Serializable;
+import java.sql.Connection;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+import br.gov.frameworkdemoiselle.annotation.Priority;
+import br.gov.frameworkdemoiselle.internal.producer.ConnectionProducer;
+import br.gov.frameworkdemoiselle.util.Beans;
+
+/**
+ * Represents the strategy destinated to manage JPA transactions.
+ * 
+ * @author SERPRO
+ * @see Transaction
+ */
+@Priority(EXTENSIONS_L1_PRIORITY)
+public class JDBCTransaction implements Transaction {
+
+	private static final long serialVersionUID = 1L;
+
+	private ConnectionProducer producer;
+
+	private Map<Connection, Status> cache = Collections.synchronizedMap(new HashMap<Connection, Status>());
+
+	private ConnectionProducer getProducer() {
+		if (producer == null) {
+			producer = Beans.getReference(ConnectionProducer.class);
+
+			for (Connection connection : producer.getCache().values()) {
+				if (!cache.containsKey(connection)) {
+					cache.put(connection, new Status());
+				}
+			}
+		}
+
+		return producer;
+	}
+
+	public Collection<Connection> getDelegate() {
+		return getProducer().getCache().values();
+	}
+
+	@Override
+	public void begin() {
+		Status status;
+		for (Connection connection : getDelegate()) {
+			status = cache.get(connection);
+			status.setActive(true);
+		}
+	}
+
+	@Override
+	public void commit() {
+		for (Connection connection : getDelegate()) {
+			try {
+				connection.commit();
+			} catch (Exception cause) {
+				throw new TransactionException(cause);
+			}
+		}
+	}
+
+	@Override
+	public void rollback() {
+		for (Connection connection : getDelegate()) {
+			try {
+				connection.rollback();
+			} catch (Exception cause) {
+				throw new TransactionException(cause);
+			}
+		}
+	}
+
+	@Override
+	public void setRollbackOnly() {
+		Status status;
+		for (Connection connection : getDelegate()) {
+			status = cache.get(connection);
+			status.setRollbackOnly(true);
+		}
+	}
+
+	@Override
+	public boolean isActive() {
+		Status status;
+		boolean result = true;
+		
+		for (Connection connection : getDelegate()) {
+			status = cache.get(connection);
+			result = result && status.isActive();
+		}
+		
+		return result;
+	}
+
+	@Override
+	public boolean isMarkedRollback() {
+		Status status;
+		boolean result = true;
+		
+		for (Connection connection : getDelegate()) {
+			status = cache.get(connection);
+			result = result && status.isMarkedRollback();
+		}
+		
+		return result;
+	}
+
+	private class Status implements Serializable {
+
+		private static final long serialVersionUID = 1L;
+
+		private boolean active = false;
+
+		private boolean markedRollback = false;
+
+		public boolean isActive() {
+			return active;
+		}
+
+		public void setActive(boolean active) {
+			this.active = active;
+		}
+
+		public boolean isMarkedRollback() {
+			return markedRollback;
+		}
+
+		public void setRollbackOnly(boolean markedRollback) {
+			this.markedRollback = markedRollback;
+		}
+	}
+}
@@ -0,0 +1,40 @@
+<!--
+ Demoiselle Framework
+ Copyright (C) 2010 SERPRO
+ ============================================================================
+ This file is part of Demoiselle Framework.
+ 
+ Demoiselle Framework is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public License version 3
+ as published by the Free Software Foundation.
+ 
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ 
+ You should have received a copy of the GNU Lesser General Public License version 3
+ along with this program; if not,  see <http://www.gnu.org/licenses/>
+ or write to the Free Software Foundation, Inc., 51 Franklin Street,
+ Fifth Floor, Boston, MA  02110-1301, USA.
+ ============================================================================
+ Este arquivo é parte do Framework Demoiselle.
+ 
+ O Framework Demoiselle é um software livre; você pode redistribuí-lo e/ou
+ modificá-lo dentro dos termos da GNU LGPL versão 3 como publicada pela Fundação
+ do Software Livre (FSF).
+ 
+ Este programa é distribuído na esperança que possa ser útil, mas SEM NENHUMA
+ GARANTIA; sem uma garantia implícita de ADEQUAÇÃO a qualquer MERCADO ou
+ APLICAÇÃO EM PARTICULAR. Veja a Licença Pública Geral GNU/LGPL em português
+ para maiores detalhes.
+ 
+ Você deve ter recebido uma cópia da GNU LGPL versão 3, sob o título
+ "LICENCA.txt", junto com esse programa. Se não, acesse <http://www.gnu.org/licenses/>
+ ou escreva para a Fundação do Software Livre (FSF) Inc.,
+ 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA.
+-->
+<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">
+
+</beans>
 \ No newline at end of file
@@ -0,0 +1,47 @@
+# Demoiselle Framework
+# Copyright (C) 2010 SERPRO
+# ----------------------------------------------------------------------------
+# This file is part of Demoiselle Framework.
+# 
+# Demoiselle Framework is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public License version 3
+# as published by the Free Software Foundation.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU Lesser General Public License version 3
+# along with this program; if not,  see <http://www.gnu.org/licenses/>
+# or write to the Free Software Foundation, Inc., 51 Franklin Street,
+# Fifth Floor, Boston, MA  02110-1301, USA.
+# ----------------------------------------------------------------------------
+# Este arquivo é parte do Framework Demoiselle.
+# 
+# O Framework Demoiselle é um software livre; você pode redistribuí-lo e/ou
+# modificá-lo dentro dos termos da GNU LGPL versão 3 como publicada pela Fundação
+# do Software Livre (FSF).
+# 
+# Este programa é distribuído na esperança que possa ser útil, mas SEM NENHUMA
+# GARANTIA; sem uma garantia implícita de ADEQUAÇÃO a qualquer MERCADO ou
+# APLICAÇÃO EM PARTICULAR. Veja a Licença Pública Geral GNU/LGPL em português
+# para maiores detalhes.
+# 
+# Você deve ter recebido uma cópia da GNU LGPL versão 3, sob o título
+# "LICENCA.txt", junto com esse programa. Se não, acesse <http://www.gnu.org/licenses/>
+# ou escreva para a Fundação do Software Livre (FSF) Inc.,
+# 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA.
+
+more-than-one-datasource-defined=Existe mais de um banco de dados definido. Utilize @{0} no ponto de inje\u00E7\u00E3o ou defina o atributo "frameworkdemoiselle.persistence.default.datasource.name" no arquivo demoiselle.properties.
+connection-was-closed=A conex\u00E3o "{0}" foi fechada.
+connection-has-already-been-closed=A conex\u00E3o "{0}" j\u00E1 havia sido fechada.
+connection-close-failed=Falha ao tentar fechar a conex\u00E3o "{0}"
+set-autocommit-failed=Falha ao tentar executar connection.setAutoCommit(false) numa transa\u00E7\u00E3o gerenciada. N\u00E3o se preocupe, este comportamento \u00E9 esperado.
+load-jndi-datasource-failed=Falha ao tentar obter a conex\u00E3o "{0}" via JNDI.
+load-duplicated-configuration-failed=Falha no carregamento das configura\u00E7\u00F5es JDBC. Verifique se existem valores duplicados indevidamente no demoiselle.properties.
+getting-default-datasource-name-from-properties=Obtendo a configura\u00E7\u00E3o de banco de dados padr\u00E3o "{0}" a partir do arquivo de configura\u00E7\u00E3o demoiselle.properties.
+datasource-name-found=Configura\u00E7\u00E3o de banco de dados "{0}" encontrada.
+datasource-not-found-in-cache=DataSource n\u00E3o encontrado para contexto atual, criando um agora.
+connection-was-created=Conex\u00E3o criada a partir da configura\u00E7\u00E3o "{0}".
+datasource-name-not-found=Nenhuma configura\u00E7\u00E3o de banco de dados foi encontrada no demoiselle.properties.
@@ -0,0 +1,40 @@
+<!--
+ Demoiselle Framework
+ Copyright (C) 2010 SERPRO
+ ============================================================================
+ This file is part of Demoiselle Framework.
+ 
+ Demoiselle Framework is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public License version 3
+ as published by the Free Software Foundation.
+ 
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ 
+ You should have received a copy of the GNU Lesser General Public License version 3
+ along with this program; if not,  see <http://www.gnu.org/licenses/>
+ or write to the Free Software Foundation, Inc., 51 Franklin Street,
+ Fifth Floor, Boston, MA  02110-1301, USA.
+ ============================================================================
+ Este arquivo é parte do Framework Demoiselle.
+ 
+ O Framework Demoiselle é um software livre; você pode redistribuí-lo e/ou
+ modificá-lo dentro dos termos da GNU LGPL versão 3 como publicada pela Fundação
+ do Software Livre (FSF).
+ 
+ Este programa é distribuído na esperança que possa ser útil, mas SEM NENHUMA
+ GARANTIA; sem uma garantia implícita de ADEQUAÇÃO a qualquer MERCADO ou
+ APLICAÇÃO EM PARTICULAR. Veja a Licença Pública Geral GNU/LGPL em português
+ para maiores detalhes.
+ 
+ Você deve ter recebido uma cópia da GNU LGPL versão 3, sob o título
+ "LICENCA.txt", junto com esse programa. Se não, acesse <http://www.gnu.org/licenses/>
+ ou escreva para a Fundação do Software Livre (FSF) Inc.,
+ 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA.
+-->
+<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">
+
+</beans>
 \ No newline at end of file
@@ -45,7 +45,7 @@
 	<parent>
 		<groupId>br.gov.frameworkdemoiselle</groupId>
 		<artifactId>demoiselle-extension-parent</artifactId>
-		<version>2.3.2-SNAPSHOT</version>
+		<version>2.4.0-ALPHA1-SNAPSHOT</version>
 		<relativePath>../../../parent/extension</relativePath>
 	</parent>
  
@@ -44,7 +44,7 @@
 	<parent>
 		<groupId>br.gov.frameworkdemoiselle</groupId>
 		<artifactId>demoiselle-extension-parent</artifactId>
-		<version>2.3.2-SNAPSHOT</version>
+		<version>2.4.0-ALPHA1-SNAPSHOT</version>
 		<relativePath>../../../parent/extension</relativePath>
 	</parent>
  
@@ -0,0 +1 @@
+/.faces-config.xml.jsfdia
@@ -0,0 +1,47 @@
+<!--
+ Demoiselle Framework
+ Copyright (C) 2010 SERPRO
+ ============================================================================
+ This file is part of Demoiselle Framework.
+ 
+ Demoiselle Framework is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public License version 3
+ as published by the Free Software Foundation.
+ 
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ 
+ You should have received a copy of the GNU Lesser General Public License version 3
+ along with this program; if not,  see <http://www.gnu.org/licenses/>
+ or write to the Free Software Foundation, Inc., 51 Franklin Street,
+ Fifth Floor, Boston, MA  02110-1301, USA.
+ ============================================================================
+ Este arquivo é parte do Framework Demoiselle.
+ 
+ O Framework Demoiselle é um software livre; você pode redistribuí-lo e/ou
+ modificá-lo dentro dos termos da GNU LGPL versão 3 como publicada pela Fundação
+ do Software Livre (FSF).
+ 
+ Este programa é distribuído na esperança que possa ser útil, mas SEM NENHUMA
+ GARANTIA; sem uma garantia implícita de ADEQUAÇÃO a qualquer MERCADO ou
+ APLICAÇÃO EM PARTICULAR. Veja a Licença Pública Geral GNU/LGPL em português
+ para maiores detalhes.
+ 
+ Você deve ter recebido uma cópia da GNU LGPL versão 3, sob o título
+ "LICENCA.txt", junto com esse programa. Se não, acesse <http://www.gnu.org/licenses/>
+ ou escreva para a Fundação do Software Livre (FSF) Inc.,
+ 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA.
+-->
+<facelet-taglib 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/web-facelettaglibrary_2_0.xsd"
+	version="2.0">
+
+	<namespace>http://frameworkdemoiselle.gov.br/jsf</namespace>
+
+	<tag>
+		<tag-name>checkLoggedIn</tag-name>
+		<source>tags/br/gov/frameworkdemoiselle/checkLoggedIn.xhtml</source>
+	</tag>
+</facelet-taglib>
@@ -34,7 +34,7 @@
  ou escreva para a Fundação do Software Livre (FSF) Inc.,
  51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA.
 -->
-<faces-config id="weld" version="2.0" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<faces-config version="2.0" 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/web-facesconfig_2_0.xsd">
  
 	<lifecycle>
@@ -0,0 +1,6 @@
+<ui:composition xmlns="http://www.w3.org/1999/xhtml" xmlns:f="http://java.sun.com/jsf/core"
+	xmlns:h="http://java.sun.com/jsf/html" xmlns:ui="http://java.sun.com/jsf/facelets">
+
+	#{securityContext.checkLoggedIn()}
+
+</ui:composition>
 \ No newline at end of file
@@ -35,7 +35,7 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA.
  */
 package br.gov.frameworkdemoiselle.internal.implementation;
-import org.junit.Ignore;
+
 import static junit.framework.Assert.assertEquals;
 import static org.easymock.EasyMock.expect;
 import static org.powermock.api.easymock.PowerMock.replayAll;
@@ -54,7 +54,7 @@ public class AuthorizationExceptionHandlerFactoryTest {
  
 	@Test
 	public void testGetExceptionHandler() {
-		
+
 		ExceptionHandler jsfExceptionHandler = PowerMock.createMock(ExceptionHandler.class);
  
 		ExceptionHandlerFactory jsfFactory = PowerMock.createMock(ExceptionHandlerFactory.class);
@@ -69,7 +69,7 @@ public class AuthorizationExceptionHandlerFactoryTest {
 		assertEquals(handler.getWrapped(), jsfExceptionHandler);
  
 		verifyAll();
-		
+
 	}
  
 }
@@ -54,7 +54,6 @@ import javax.enterprise.inject.spi.InjectionPoint;
 import javax.faces.convert.Converter;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
-import javax.swing.text.View;
  
 import org.easymock.EasyMock;
 import org.junit.Before;
@@ -155,7 +154,7 @@ public class ParameterImplTest {
 	public void testGetValueWhenSessionScopedAndParameterValueNotNull() {
 		this.prepareForTestWithKeyFromNameAnnotation();
 		expect(Faces.getConverter(EasyMock.anyObject(Class.class))).andReturn(converter);
-		
+
 		mockStatic(Beans.class);
 		expect(Beans.getReference(HttpServletRequest.class)).andReturn(request).anyTimes();
  
@@ -179,7 +178,7 @@ public class ParameterImplTest {
 	@Test
 	public void testGetValueWhenSessionScopedAndParameterValueNull() {
 		this.prepareForTestWithKeyFromNameAnnotation();
-		
+
 		mockStatic(Beans.class);
 		expect(Beans.getReference(HttpServletRequest.class)).andReturn(request).anyTimes();
  
@@ -200,17 +199,17 @@ public class ParameterImplTest {
 	public void testGetValueWhenRequestScoped() {
 		this.prepareForTestWithKeyFromNameAnnotation();
 		expect(Faces.getConverter(EasyMock.anyObject(Class.class))).andReturn(converter);
-		
+
 		mockStatic(Beans.class);
 		expect(Beans.getReference(HttpServletRequest.class)).andReturn(request).anyTimes();
-		
+
 		expect(annotated.isAnnotationPresent(SessionScoped.class)).andReturn(false);
 		expect(annotated.isAnnotationPresent(RequestScoped.class)).andReturn(true);
 		expect(annotated.isAnnotationPresent(ViewScoped.class)).andReturn(false);
 		expect(request.getParameter(EasyMock.anyObject(String.class))).andReturn("1");
 		expect(request.getSession()).andReturn(session).anyTimes();
 		expect(Faces.convert("1", converter)).andReturn("return");
-		
+
 		replayAll();
 		param = new ParameterImpl<Long>(ip);
 		assertEquals("return", param.getValue());
@@ -221,11 +220,11 @@ public class ParameterImplTest {
 	public void testGetValueWhenViewScopedWithParamValueNotNull() {
 		this.prepareForTestWithKeyFromNameAnnotation();
 		expect(Faces.getConverter(EasyMock.anyObject(Class.class))).andReturn(converter);
-		Map<String, Object> map = new HashMap<String,Object>();
-		
+		Map<String, Object> map = new HashMap<String, Object>();
+
 		mockStatic(Beans.class);
 		expect(Beans.getReference(HttpServletRequest.class)).andReturn(request).anyTimes();
-		
+
 		expect(annotated.isAnnotationPresent(SessionScoped.class)).andReturn(false);
 		expect(annotated.isAnnotationPresent(RequestScoped.class)).andReturn(false);
 		expect(annotated.isAnnotationPresent(ViewScoped.class)).andReturn(true);
@@ -243,12 +242,12 @@ public class ParameterImplTest {
 	@Test
 	public void testGetValueWhenViewScopedWithParamValueNull() {
 		this.prepareForTestWithKeyFromNameAnnotation();
-		Map<String, Object> map = new HashMap<String,Object>();
+		Map<String, Object> map = new HashMap<String, Object>();
 		map.put("name", "ops");
  
 		mockStatic(Beans.class);
 		expect(Beans.getReference(HttpServletRequest.class)).andReturn(request).anyTimes();
-		
+
 		expect(annotated.isAnnotationPresent(SessionScoped.class)).andReturn(false);
 		expect(annotated.isAnnotationPresent(RequestScoped.class)).andReturn(false);
 		expect(annotated.isAnnotationPresent(ViewScoped.class)).andReturn(true);
@@ -269,13 +268,13 @@ public class ParameterImplTest {
  
 		mockStatic(Beans.class);
 		expect(Beans.getReference(HttpServletRequest.class)).andReturn(request).anyTimes();
-		
+
 		expect(annotated.isAnnotationPresent(SessionScoped.class)).andReturn(false);
 		expect(annotated.isAnnotationPresent(RequestScoped.class)).andReturn(false);
 		expect(annotated.isAnnotationPresent(ViewScoped.class)).andReturn(false);
 		expect(request.getParameter(EasyMock.anyObject(String.class))).andReturn("1");
 		expect(Faces.convert("1", converter)).andReturn("return");
-		
+
 		replayAll();
 		param = new ParameterImpl<Long>(ip);
 		assertEquals("return", param.getValue());
@@ -288,7 +287,7 @@ public class ParameterImplTest {
  
 		mockStatic(Beans.class);
 		expect(Beans.getReference(HttpServletRequest.class)).andReturn(request).anyTimes();
-		
+
 		expect(annotated.isAnnotationPresent(SessionScoped.class)).andReturn(false);
 		expect(annotated.isAnnotationPresent(RequestScoped.class)).andReturn(false);
 		expect(annotated.isAnnotationPresent(ViewScoped.class)).andReturn(false);
@@ -307,7 +306,7 @@ public class ParameterImplTest {
  
 		mockStatic(Beans.class);
 		expect(Beans.getReference(HttpServletRequest.class)).andReturn(request).anyTimes();
-		
+
 		expect(annotated.isAnnotationPresent(SessionScoped.class)).andReturn(true);
 		expect(annotated.isAnnotationPresent(RequestScoped.class)).andReturn(false);
 		expect(annotated.isAnnotationPresent(ViewScoped.class)).andReturn(false);
@@ -44,7 +44,7 @@
 	<parent>
 		<groupId>br.gov.frameworkdemoiselle</groupId>
 		<artifactId>demoiselle-extension-parent</artifactId>
-		<version>2.3.2-SNAPSHOT</version>
+		<version>2.4.0-ALPHA1-SNAPSHOT</version>
 		<relativePath>../../../parent/extension</relativePath>
 	</parent>
  
@@ -97,4 +97,4 @@
 			</releases>
 		</repository>
 	</repositories>
-</project>
 \ No newline at end of file
+</project>
@@ -44,7 +44,7 @@
 	<parent>
 		<groupId>br.gov.frameworkdemoiselle</groupId>
 		<artifactId>demoiselle-extension-parent</artifactId>
-		<version>2.3.2-SNAPSHOT</version>
+		<version>2.4.0-ALPHA1-SNAPSHOT</version>
 		<relativePath>../../../parent/extension</relativePath>
 	</parent>
  
@@ -44,7 +44,7 @@
 	<parent>
 		<groupId>br.gov.frameworkdemoiselle</groupId>
 		<artifactId>demoiselle-extension-parent</artifactId>
-		<version>2.3.2-SNAPSHOT</version>
+		<version>2.4.0-ALPHA1-SNAPSHOT</version>
 		<relativePath>../../../parent/extension</relativePath>
 	</parent>
  
@@ -38,6 +38,7 @@ package br.gov.frameworkdemoiselle.util;
  
 import java.io.IOException;
  
+import javax.security.auth.login.LoginContext;
 import javax.servlet.Filter;
 import javax.servlet.FilterChain;
 import javax.servlet.FilterConfig;
@@ -46,6 +47,7 @@ import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
  
 import br.gov.frameworkdemoiselle.internal.producer.HttpServletRequestProducer;
 import br.gov.frameworkdemoiselle.internal.producer.HttpServletResponseProducer;
@@ -63,6 +65,14 @@ public class ServletFilter implements Filter {
 		Beans.getReference(HttpServletRequestProducer.class).setDelegate((HttpServletRequest) request);
 		Beans.getReference(HttpServletResponseProducer.class).setDelegate((HttpServletResponse) response);
  
+		LoginContext ctx = null;
+		HttpSession sess = (HttpSession) ((HttpServletRequest) request).getSession(false);
+		if (sess != null) {
+			ctx = (LoginContext) sess.getAttribute("ctx");
+		}
+
+		// System.out.println(ctx);
+
 		chain.doFilter(request, response);
 	}
  
@@ -44,7 +44,7 @@
 	<parent>
 		<groupId>br.gov.frameworkdemoiselle</groupId>
 		<artifactId>demoiselle-framework-parent</artifactId>
-		<version>2.3.2-SNAPSHOT</version>
+		<version>2.4.0-ALPHA1-SNAPSHOT</version>
 		<relativePath>../framework</relativePath>
 	</parent>
  
@@ -44,7 +44,7 @@
 	<parent>
 		<groupId>br.gov.frameworkdemoiselle</groupId>
 		<artifactId>demoiselle-framework-parent</artifactId>
-		<version>2.3.2-SNAPSHOT</version>
+		<version>2.4.0-ALPHA1-SNAPSHOT</version>
 		<relativePath>../framework</relativePath>
 	</parent>
  
@@ -72,32 +72,42 @@
 			<dependency>
 				<groupId>br.gov.frameworkdemoiselle</groupId>
 				<artifactId>demoiselle-core</artifactId>
-				<version>2.3.2-SNAPSHOT</version>
+				<version>2.4.0-ALPHA1-SNAPSHOT</version>
 			</dependency>
 			<dependency>
 				<groupId>br.gov.frameworkdemoiselle</groupId>
 				<artifactId>demoiselle-jta</artifactId>
-				<version>2.3.2-SNAPSHOT</version>
+				<version>2.4.0-ALPHA1-SNAPSHOT</version>
+			</dependency>
+			<dependency>
+				<groupId>br.gov.frameworkdemoiselle</groupId>
+				<artifactId>demoiselle-jdbc</artifactId>
+				<version>2.4.0-ALPHA1-SNAPSHOT</version>
 			</dependency>
 			<dependency>
 				<groupId>br.gov.frameworkdemoiselle</groupId>
 				<artifactId>demoiselle-jpa</artifactId>
-				<version>2.3.2-SNAPSHOT</version>
+				<version>2.4.0-ALPHA1-SNAPSHOT</version>
 			</dependency>
 			<dependency>
 				<groupId>br.gov.frameworkdemoiselle</groupId>
 				<artifactId>demoiselle-servlet</artifactId>
-				<version>2.3.2-SNAPSHOT</version>
+				<version>2.4.0-ALPHA1-SNAPSHOT</version>
 			</dependency>
 			<dependency>
 				<groupId>br.gov.frameworkdemoiselle</groupId>
 				<artifactId>demoiselle-jsf</artifactId>
-				<version>2.3.2-SNAPSHOT</version>
+				<version>2.4.0-ALPHA1-SNAPSHOT</version>
 			</dependency>
 			<dependency>
 				<groupId>br.gov.frameworkdemoiselle</groupId>
 				<artifactId>demoiselle-se</artifactId>
-				<version>2.3.2-SNAPSHOT</version>
+				<version>2.4.0-ALPHA1-SNAPSHOT</version>
+			</dependency>
+			<dependency>
+				<groupId>br.gov.frameworkdemoiselle</groupId>
+				<artifactId>demoiselle-jaas</artifactId>
+				<version>2.4.0-ALPHA1-SNAPSHOT</version>
 			</dependency>
  
 			<!-- jsr-299 api -->
@@ -252,12 +262,17 @@
 				<version>${slf4j.version}</version>
 			</dependency>
  
-			<!-- configuration api+impl -->
+			<!-- apache commons -->
 			<dependency>
 				<groupId>commons-configuration</groupId>
 				<artifactId>commons-configuration</artifactId>
 				<version>${commons.configuration.version}</version>
 			</dependency>
+			<dependency>
+				<groupId>commons-dbcp</groupId>
+				<artifactId>commons-dbcp</artifactId>
+				<version>${commons.dbcp.version}</version>
+			</dependency>
  
 			<!-- embedded database -->
 			<dependency>
@@ -343,6 +358,7 @@
 		<slf4j.version>1.6.1</slf4j.version>
 		<weld.version>1.1.8.Final</weld.version>
 		<commons.configuration.version>1.5</commons.configuration.version>
+		<commons.dbcp.version>1.4</commons.dbcp.version>
 		<hsqldb.version>1.8.0.10</hsqldb.version>
 		<jasperreports.version>4.0.1</jasperreports.version>
 		<mail.version>1.4.4</mail.version>
@@ -44,7 +44,7 @@
 	<parent>
 		<groupId>br.gov.frameworkdemoiselle</groupId>
 		<artifactId>demoiselle-framework-parent</artifactId>
-		<version>2.3.2-SNAPSHOT</version>
+		<version>2.4.0-ALPHA1-SNAPSHOT</version>
 		<relativePath>../framework</relativePath>
 	</parent>
  
@@ -71,7 +71,7 @@
 			<dependency>
 				<groupId>br.gov.frameworkdemoiselle</groupId>
 				<artifactId>demoiselle-framework-bom</artifactId>
-				<version>2.3.2-SNAPSHOT</version>
+				<version>2.4.0-ALPHA1-SNAPSHOT</version>
 				<scope>import</scope>
 				<type>pom</type>
 			</dependency>
@@ -157,4 +157,4 @@
 			</releases>
 		</repository>
 	</repositories>
-</project>
 \ No newline at end of file
+</project>
@@ -39,7 +39,7 @@
 	<modelVersion>4.0.0</modelVersion>
  
 	<artifactId>demoiselle-framework-parent</artifactId>
-	<version>2.3.2-SNAPSHOT</version>
+	<version>2.4.0-ALPHA1-SNAPSHOT</version>
 	<packaging>pom</packaging>
  
 	<parent>
@@ -44,7 +44,7 @@
 	<parent>
 		<groupId>br.gov.frameworkdemoiselle</groupId>
 		<artifactId>demoiselle-servlet-parent</artifactId>
-		<version>2.3.2-SNAPSHOT</version>
+		<version>2.4.0-ALPHA1-SNAPSHOT</version>
 		<relativePath>../servlet</relativePath>
 	</parent>
  
@@ -44,7 +44,7 @@
 	<parent>
 		<groupId>br.gov.frameworkdemoiselle</groupId>
 		<artifactId>demoiselle-framework-parent</artifactId>
-		<version>2.3.2-SNAPSHOT</version>
+		<version>2.4.0-ALPHA1-SNAPSHOT</version>
 		<relativePath>../framework</relativePath>
 	</parent>
  
@@ -72,7 +72,7 @@
 			<dependency>
 				<groupId>br.gov.frameworkdemoiselle</groupId>
 				<artifactId>demoiselle-framework-bom</artifactId>
-				<version>2.3.2-SNAPSHOT</version>
+				<version>2.4.0-ALPHA1-SNAPSHOT</version>
 				<scope>import</scope>
 				<type>pom</type>
 			</dependency>
@@ -44,7 +44,7 @@
 	<parent>
 		<groupId>br.gov.frameworkdemoiselle</groupId>
 		<artifactId>demoiselle-extension-parent</artifactId>
-		<version>2.3.2-SNAPSHOT</version>
+		<version>2.4.0-ALPHA1-SNAPSHOT</version>
 		<relativePath>../../../parent/extension</relativePath>
 	</parent>
  
@@ -44,7 +44,7 @@
 	<parent>
 		<groupId>br.gov.frameworkdemoiselle</groupId>
 		<artifactId>demoiselle-extension-parent</artifactId>
-		<version>2.3.2-SNAPSHOT</version>
+		<version>2.4.0-ALPHA1-SNAPSHOT</version>
 		<relativePath>../extension</relativePath>
 	</parent>
  
@@ -39,7 +39,7 @@
 	<modelVersion>4.0.0</modelVersion>
  
 	<artifactId>demoiselle-framework-build</artifactId>
-	<version>2.3.2-SNAPSHOT</version>
+	<version>2.4.0-ALPHA1-SNAPSHOT</version>
 	<packaging>pom</packaging>
  
 	<parent>
@@ -65,11 +65,13 @@
 		<module>parent/se</module>
 		<module>parent/archetype</module>
 		<module>impl/core</module>
+		<module>impl/extension/jdbc</module>
 		<module>impl/extension/jpa</module>
 		<module>impl/extension/jsf</module>
 		<module>impl/extension/jta</module>
 		<module>impl/extension/se</module>
 		<module>impl/extension/servlet</module>
+		<module>impl/extension/jaas</module>
 		<module>archetype/minimal</module>
 		<module>archetype/jsf-jpa</module>
 		<module>documentation/quickstart</module>
...	...	@@ -45,7 +45,7 @@
45	45	<parent>
46	46	<groupId>br.gov.frameworkdemoiselle</groupId>
47	47	<artifactId>demoiselle-archetype-parent</artifactId>
48		- <version>2.3.2-SNAPSHOT</version>
	48	+ <version>2.4.0-ALPHA1-SNAPSHOT</version>
49	49	<relativePath>../../parent/archetype</relativePath>
50	50	</parent>
51	51
...	...
...	...	@@ -40,7 +40,7 @@
40	40
41	41	<artifactId>demoiselle-framework-quickstart</artifactId>
42	42	<packaging>jdocbook</packaging>
43		- <version>2.3.2-SNAPSHOT</version>
	43	+ <version>2.4.0-ALPHA1-SNAPSHOT</version>
44	44
45	45	<parent>
46	46	<groupId>br.gov.frameworkdemoiselle</groupId>
...	...
...	...	@@ -40,7 +40,7 @@
40	40
41	41	<artifactId>demoiselle-framework-reference</artifactId>
42	42	<packaging>jdocbook</packaging>
43		- <version>2.3.2-SNAPSHOT</version>
	43	+ <version>2.4.0-ALPHA1-SNAPSHOT</version>
44	44
45	45	<parent>
46	46	<groupId>br.gov.frameworkdemoiselle</groupId>
...	...
...	...	@@ -44,7 +44,7 @@
44	44	<parent>
45	45	<groupId>br.gov.frameworkdemoiselle</groupId>
46	46	<artifactId>demoiselle-framework-parent</artifactId>
47		- <version>2.3.2-SNAPSHOT</version>
	47	+ <version>2.4.0-ALPHA1-SNAPSHOT</version>
48	48	<relativePath>../../parent/framework</relativePath>
49	49	</parent>
50	50
...	...	@@ -72,7 +72,7 @@
72	72	<dependency>
73	73	<groupId>br.gov.frameworkdemoiselle</groupId>
74	74	<artifactId>demoiselle-framework-bom</artifactId>
75		- <version>2.3.2-SNAPSHOT</version>
	75	+ <version>2.4.0-ALPHA1-SNAPSHOT</version>
76	76	<scope>import</scope>
77	77	<type>pom</type>
78	78	</dependency>
...	...
...	...	@@ -43,10 +43,12 @@ import java.lang.reflect.Method;
43	43	import java.lang.reflect.ParameterizedType;
44	44	import java.lang.reflect.Type;
45	45	import java.net.URL;
46		-import java.util.HashSet;
	46	+import java.util.HashMap;
47	47	import java.util.Iterator;
	48	+import java.util.Map;
48	49	import java.util.Properties;
49		-import java.util.Set;
	50	+import java.util.regex.Matcher;
	51	+import java.util.regex.Pattern;
50	52
51	53	import javax.validation.constraints.NotNull;
52	54
...	...	@@ -114,7 +116,7 @@ public class ConfigurationLoader implements Serializable {
114	116	org.apache.commons.configuration.Configuration config = getConfiguration(resource, type);
115	117
116	118	if (config != null) {
117		- String key = getKey(field, clazz, config);
	119	+ Key key = new Key(field, clazz, config);
118	120	Object value = getValue(key, field, config);
119	121
120	122	validate(field, key, value, resource);
...	...	@@ -123,106 +125,21 @@ public class ConfigurationLoader implements Serializable {
123	125	}
124	126	}
125	127
126		- private void setValue(Field field, String key, Object object, Object value) {
	128	+ private void setValue(Field field, Key key, Object object, Object value) {
127	129	if (value != null) {
128	130	Reflections.setFieldValue(field, object, value);
129		- getLogger().debug(getBundle().getString("configuration-field-loaded", key, field.getName(), value));
	131	+ getLogger().debug(
	132	+ getBundle().getString("configuration-field-loaded", key.toString(), field.getName(), value));
130	133	}
131	134	}
132	135
133		- private void validate(Field field, String key, Object value, String resource) {
	136	+ private void validate(Field field, Key key, Object value, String resource) {
134	137	if (field.isAnnotationPresent(NotNull.class) && value == null) {
135		- throw new ConfigurationException(getBundle().getString("configuration-attribute-is-mandatory", key,
136		- resource));
	138	+ throw new ConfigurationException(getBundle().getString("configuration-attribute-is-mandatory",
	139	+ key.toString(), resource));
137	140	}
138	141	}
139	142
140		- private String getKey(final Field field, final Class<?> clazz,
141		- final org.apache.commons.configuration.Configuration config) {
142		-
143		- final String prefix = getPrefix(field, clazz);
144		- final StringBuffer key = new StringBuffer();
145		-
146		- key.append(prefix);
147		-
148		- if (field.isAnnotationPresent(Name.class)) {
149		- key.append(getKeyByAnnotation(field));
150		- } else {
151		- key.append(getKeyByConvention(field, prefix, config));
152		- }
153		-
154		- return key.toString();
155		- }
156		-
157		- private String getPrefix(Field field, Class<?> type) {
158		- String prefix = "";
159		-
160		- Configuration classAnnotation = type.getAnnotation(Configuration.class);
161		- if (!Strings.isEmpty(classAnnotation.prefix())) {
162		-
163		- prefix = classAnnotation.prefix();
164		-
165		- if (prefix.charAt(prefix.length() - 1) != '.') {
166		- getLogger().warn(
167		- "ATENÇÃO!!! Informe o ponto (.) ao final da declaração do atributo prefix = \"" + prefix
168		- + "\" da anotação @Configuration da classe " + type.getCanonicalName()
169		- + " para evitar incompatibilidade com as próximas versões do Demoiselle.");
170		-
171		- prefix += ".";
172		- }
173		- }
174		-
175		- return prefix;
176		- }
177		-
178		- private String getKeyByAnnotation(Field field) {
179		- String key = null;
180		-
181		- Name nameAnnotation = field.getAnnotation(Name.class);
182		- if (Strings.isEmpty(nameAnnotation.value())) {
183		- throw new ConfigurationException(getBundle().getString("configuration-name-attribute-cant-be-empty"));
184		- } else {
185		- key = nameAnnotation.value();
186		- }
187		-
188		- return key;
189		- }
190		-
191		- private String getKeyByConvention(Field field, String prefix, org.apache.commons.configuration.Configuration config) {
192		-
193		- Set<String> conventions = new HashSet<String>();
194		- conventions.add(field.getName());
195		- conventions.add(Strings.camelCaseToSymbolSeparated(field.getName(), "."));
196		- conventions.add(Strings.camelCaseToSymbolSeparated(field.getName(), "_"));
197		- conventions.add(field.getName().toLowerCase());
198		- conventions.add(field.getName().toUpperCase());
199		-
200		- int matches = 0;
201		- String key = field.getName();
202		- for (String convention : conventions) {
203		- if (config.containsKey(prefix + convention)) {
204		- key = convention;
205		- matches++;
206		- }
207		- }
208		-
209		- if (!field.getName().equals(key)) {
210		- getLogger().warn(
211		- "ATENÇÃO!!! Anote o atributo " + field.getName() + " da classe "
212		- + field.getDeclaringClass().getCanonicalName() + " com @Name(\"" + key
213		- + "\") para evitar incompatibilidade com as próximas versões do Demoiselle.");
214		- }
215		-
216		- if (matches == 0) {
217		- getLogger().debug(getBundle().getString("configuration-key-not-found", key, conventions));
218		- } else if (matches > 1) {
219		- throw new ConfigurationException(getBundle().getString("ambiguous-key", field.getName(),
220		- field.getDeclaringClass()));
221		- }
222		-
223		- return key;
224		- }
225		-
226	143	/**
227	144	* Returns the configuration class according to specified resource name and configuration type.
228	145	*
...	...	@@ -273,7 +190,7 @@ public class ConfigurationLoader implements Serializable {
273	190	}
274	191
275	192	@SuppressWarnings("unchecked")
276		- private <T> T getValue(String key, Field field, org.apache.commons.configuration.Configuration config) {
	193	+ private <T> T getValue(Key key, Field field, org.apache.commons.configuration.Configuration config) {
277	194	Object value;
278	195
279	196	Class<?> fieldClass = (Class<?>) field.getType();
...	...	@@ -281,6 +198,9 @@ public class ConfigurationLoader implements Serializable {
281	198	if (fieldClass.isArray()) {
282	199	value = getArray(key, field, config);
283	200
	201	+ } else if (fieldClass.equals(Map.class)) {
	202	+ value = getMap(key, field, config);
	203	+
284	204	} else if (fieldClass.equals(Properties.class)) {
285	205	value = getProperty(key, config);
286	206
...	...	@@ -294,7 +214,38 @@ public class ConfigurationLoader implements Serializable {
294	214	return (T) value;
295	215	}
296	216
297		- private <T> Object getArray(String key, Field field, org.apache.commons.configuration.Configuration config) {
	217	+ private <T> Object getMap(Key key, Field field, org.apache.commons.configuration.Configuration config) {
	218	+ Map<String, Object> value = null;
	219	+
	220	+ String regexp = "^(" + key.getPrefix() + ")((.+)\\.)?(" + key.getName() + ")$";
	221	+ Pattern pattern = Pattern.compile(regexp);
	222	+ Matcher matcher;
	223	+
	224	+ String iterKey;
	225	+ String mapKey;
	226	+ String confKey;
	227	+
	228	+ for (@SuppressWarnings("unchecked")
	229	+ Iterator<String> iter = config.getKeys(); iter.hasNext();) {
	230	+ iterKey = iter.next();
	231	+ matcher = pattern.matcher(iterKey);
	232	+
	233	+ if (matcher.matches()) {
	234	+ confKey = matcher.group(1) + (matcher.group(2) == null ? "" : matcher.group(2)) + matcher.group(4);
	235	+
	236	+ if (value == null) {
	237	+ value = new HashMap<String, Object>();
	238	+ }
	239	+
	240	+ mapKey = matcher.group(3) == null ? "default" : matcher.group(3);
	241	+ value.put(mapKey, config.getProperty(confKey));
	242	+ }
	243	+ }
	244	+
	245	+ return value;
	246	+ }
	247	+
	248	+ private <T> Object getArray(Key key, Field field, org.apache.commons.configuration.Configuration config) {
298	249	Object value = null;
299	250
300	251	Class<?> fieldClass = (Class<?>) field.getType();
...	...	@@ -309,7 +260,7 @@ public class ConfigurationLoader implements Serializable {
309	260	methodName += "Array";
310	261
311	262	method = config.getClass().getMethod(methodName, String.class);
312		- value = method.invoke(config, key);
	263	+ value = method.invoke(config, key.toString());
313	264
314	265	} catch (Throwable cause) {
315	266	throw new ConfigurationException(getBundle().getString("error-converting-to-type", fieldClass.getName()),
...	...	@@ -319,7 +270,7 @@ public class ConfigurationLoader implements Serializable {
319	270	return value;
320	271	}
321	272
322		- private <T> Object getBasic(String key, Field field, org.apache.commons.configuration.Configuration config) {
	273	+ private <T> Object getBasic(Key key, Field field, org.apache.commons.configuration.Configuration config) {
323	274	Object value = null;
324	275
325	276	Class<?> fieldClass = (Class<?>) field.getType();
...	...	@@ -333,11 +284,11 @@ public class ConfigurationLoader implements Serializable {
333	284
334	285	if (!fieldClass.isPrimitive()) {
335	286	method = config.getClass().getMethod(methodName, String.class, fieldClass);
336		- value = method.invoke(config, key, null);
	287	+ value = method.invoke(config, key.toString(), null);
337	288
338		- } else if (config.containsKey(key)) {
	289	+ } else if (config.containsKey(key.toString())) {
339	290	method = config.getClass().getMethod(methodName, String.class);
340		- value = method.invoke(config, key);
	291	+ value = method.invoke(config, key.toString());
341	292	}
342	293
343	294	} catch (Throwable cause) {
...	...	@@ -348,11 +299,11 @@ public class ConfigurationLoader implements Serializable {
348	299	return value;
349	300	}
350	301
351		- private <T> Object getClass(String key, Field field, org.apache.commons.configuration.Configuration config) {
	302	+ private <T> Object getClass(Key key, Field field, org.apache.commons.configuration.Configuration config) {
352	303	Object value = null;
353	304
354	305	try {
355		- String canonicalName = config.getString(key);
	306	+ String canonicalName = config.getString(key.toString());
356	307
357	308	if (canonicalName != null) {
358	309	ClassLoader classLoader = getClassLoaderForClass(canonicalName);
...	...	@@ -395,17 +346,17 @@ public class ConfigurationLoader implements Serializable {
395	346	return "";
396	347	}
397	348
398		- private Object getProperty(String key, org.apache.commons.configuration.Configuration config) {
	349	+ private Object getProperty(Key key, org.apache.commons.configuration.Configuration config) {
399	350	Object value = null;
400	351
401	352	@SuppressWarnings("unchecked")
402		- Iterator<String> iterator = config.getKeys(key);
	353	+ Iterator<String> iterator = config.getKeys(key.toString());
403	354	if (iterator.hasNext()) {
404	355	Properties props = new Properties();
405	356
406	357	while (iterator.hasNext()) {
407	358	String fullKey = iterator.next();
408		- String prefix = key + ".";
	359	+ String prefix = key.toString() + ".";
409	360	String unprefixedKey = fullKey.substring(prefix.length());
410	361	props.put(unprefixedKey, config.getString(fullKey));
411	362	}
...	...	@@ -470,4 +421,59 @@ public class ConfigurationLoader implements Serializable {
470	421
471	422	return bootstrap;
472	423	}
	424	+
	425	+ private class Key {
	426	+
	427	+ private String prefix;
	428	+
	429	+ private String name;
	430	+
	431	+ private String key;
	432	+
	433	+ private Key(final Field field, final Class<?> type, final org.apache.commons.configuration.Configuration config) {
	434	+
	435	+ this.prefix = type.getAnnotation(Configuration.class).prefix();
	436	+ if (this.prefix == null) {
	437	+ this.prefix = "";
	438	+ }
	439	+
	440	+ if (field.isAnnotationPresent(Name.class)) {
	441	+ this.name = getNameByAnnotation(field);
	442	+ } else {
	443	+ this.name = getNameByField(field);
	444	+ }
	445	+
	446	+ this.key = this.prefix + this.name;
	447	+ }
	448	+
	449	+ private String getNameByAnnotation(Field field) {
	450	+ String key = null;
	451	+
	452	+ Name nameAnnotation = field.getAnnotation(Name.class);
	453	+ if (Strings.isEmpty(nameAnnotation.value())) {
	454	+ throw new ConfigurationException(getBundle().getString("configuration-name-attribute-cant-be-empty"));
	455	+ } else {
	456	+ key = nameAnnotation.value();
	457	+ }
	458	+
	459	+ return key;
	460	+ }
	461	+
	462	+ private String getNameByField(Field field) {
	463	+ return field.getName();
	464	+ }
	465	+
	466	+ public String getPrefix() {
	467	+ return prefix;
	468	+ }
	469	+
	470	+ public String getName() {
	471	+ return name;
	472	+ }
	473	+
	474	+ @Override
	475	+ public String toString() {
	476	+ return this.key;
	477	+ }
	478	+ }
473	479	}
...	...
...	...	@@ -202,7 +202,7 @@ public class SecurityContextImpl implements SecurityContext {
202	202	return Beans.getReference(SecurityConfigImpl.class);
203	203	}
204	204
205		- private void checkLoggedIn() throws NotLoggedInException {
	205	+ public void checkLoggedIn() throws NotLoggedInException {
206	206	if (!isLoggedIn()) {
207	207	ResourceBundle bundle = ResourceBundleProducer.create("demoiselle-core-bundle");
208	208	throw new NotLoggedInException(bundle.getString("user-not-authenticated"));
...	...
...	...	@@ -65,6 +65,8 @@ public interface SecurityContext extends Serializable {
65	65	* @return {@code true} if the user is logged in
66	66	*/
67	67	boolean isLoggedIn();
	68	+
	69	+ void checkLoggedIn() throws NotLoggedInException;
68	70
69	71	/**
70	72	* Checks if the logged user has permission to execute an specific operation on a specific resource.
...	...
...	...	@@ -9,7 +9,6 @@ import br.gov.frameworkdemoiselle.internal.implementation.DefaultAuthenticator;
9	9	import br.gov.frameworkdemoiselle.internal.implementation.DefaultAuthorizer;
10	10	import br.gov.frameworkdemoiselle.security.Authenticator;
11	11	import br.gov.frameworkdemoiselle.security.Authorizer;
12		-import br.gov.frameworkdemoiselle.security.User;
13	12
14	13	public class SecurityConfigTest {
15	14
...	...	@@ -38,7 +37,7 @@ public class SecurityConfigTest {
38	37	assertEquals("br.gov.frameworkdemoiselle.internal.implementation.DefaultAuthenticator", config
39	38	.getAuthenticatorClass().getName());
40	39	}
41		-
	40	+
42	41	@Test
43	42	public void testSetAuthorizerClass() {
44	43	Authorizer authorizer = new DefaultAuthorizer();
...	...
...	...	@@ -38,7 +38,6 @@ package br.gov.frameworkdemoiselle.internal.implementation;
38	38
39	39	import static org.easymock.EasyMock.expect;
40	40	import static org.powermock.api.easymock.PowerMock.mockStatic;
41		-import static org.powermock.api.easymock.PowerMock.replay;
42	41	import static org.powermock.api.easymock.PowerMock.replayAll;
43	42
44	43	import java.util.Locale;
...	...	@@ -51,10 +50,8 @@ import org.junit.runner.RunWith;
51	50	import org.powermock.api.easymock.PowerMock;
52	51	import org.powermock.core.classloader.annotations.PrepareForTest;
53	52	import org.powermock.modules.junit4.PowerMockRunner;
54		-import org.powermock.reflect.Whitebox;
55	53	import org.slf4j.Logger;
56	54
57		-import br.gov.frameworkdemoiselle.internal.producer.ResourceBundleProducer;
58	55	import br.gov.frameworkdemoiselle.message.Message;
59	56	import br.gov.frameworkdemoiselle.message.MessageContext;
60	57	import br.gov.frameworkdemoiselle.message.SeverityType;
...	...	@@ -68,19 +65,19 @@ public class MessageContextImplTest {
68	65	MessageContext messageContext;
69	66
70	67	Message m1;
71		-
	68	+
72	69	private ResourceBundle bundle;
73	70
74	71	@SuppressWarnings("unused")
75	72	@Before
76	73	public void before() {
77	74	messageContext = new MessageContextImpl();
78		-
	75	+
79	76	Locale locale = Locale.getDefault();
80		-
	77	+
81	78	mockStatic(Beans.class);
82	79	expect(Beans.getReference(Locale.class)).andReturn(locale).anyTimes();
83		-
	80	+
84	81	expect(Beans.getReference(ResourceBundle.class)).andReturn(bundle).anyTimes();
85	82	replayAll(Beans.class);
86	83
...	...	@@ -150,20 +147,20 @@ public class MessageContextImplTest {
150	147	messageContext.add(m1);
151	148	Assert.assertTrue(messageContext.getMessages().size() == 1);
152	149	Assert.assertTrue(messageContext.getMessages().get(0).getText().equals(m1.getText()));
153		- Assert.assertTrue(messageContext.getMessages().get(0).getSeverity().equals(m1.getSeverity()));
	150	+ Assert.assertTrue(messageContext.getMessages().get(0).getSeverity().equals(m1.getSeverity()));
154	151	}
155		-
	152	+
156	153	@Test
157	154	public void testClearMessages() {
158	155	Assert.assertTrue(messageContext.getMessages().isEmpty());
159	156
160	157	messageContext.add(m1);
161		- messageContext.add(m1, null);
162		-
	158	+ messageContext.add(m1, (Object[]) null);
	159	+
163	160	Assert.assertTrue(messageContext.getMessages().size() == 2);
164		-
	161	+
165	162	messageContext.clear();
166		-
	163	+
167	164	Assert.assertTrue(messageContext.getMessages().isEmpty());
168	165	}
169	166
...	...	@@ -171,88 +168,87 @@ public class MessageContextImplTest {
171	168	public void testGetMessages() {
172	169	Assert.assertNotNull(messageContext.getMessages());
173	170	Assert.assertTrue(messageContext.getMessages().isEmpty());
174		-
	171	+
175	172	messageContext.add("key1");
176	173	Assert.assertTrue(messageContext.getMessages().size() == 1);
177		-
	174	+
178	175	messageContext.add("key2");
179	176	Assert.assertTrue(messageContext.getMessages().size() == 2);
180		-
	177	+
181	178	Assert.assertTrue(messageContext.getMessages().get(0).getText().equals("key1"));
182	179	Assert.assertTrue(messageContext.getMessages().get(1).getText().equals("key2"));
183	180	}
184	181
185		-// @Test
186		-// public void testAddMessageObjectArray() {
187		-// Object[] param = { "1", "2" };
188		-// messageContext.add(m1, param);
189		-
190		-// Assert.assertTrue(messageContext.getMessages().size() == 1);
191		-// Assert.assertTrue(messageContext.getMessages().contains(m1));
192		-// Assert.assertNotNull(messageContext.getMessages().get(0).getParameters());
193		-// Assert.assertTrue(messageContext.getMessages().get(0).getParameters()[0] == param[0]);
194		-// Assert.assertTrue(messageContext.getMessages().get(0).getParameters()[1] == param[1]);
195		-// }
196		-
197		-// @Test
198		-// public void testAddStringObjectArray() {
199		-// String key = "my.key";
200		-// Object[] param = { "1", "2" };
201		-// messageContext.add(key, param);
202		-//
203		-// Assert.assertTrue(messageContext.getMessages().size() == 1);
204		-// Assert.assertTrue(messageContext.getMessages().get(0).getText().equals(key));
205		-// Assert.assertTrue(messageContext.getMessages().get(0).getParameters()[0] == param[0]);
206		-// Assert.assertTrue(messageContext.getMessages().get(0).getParameters()[1] == param[1]);
207		-// }
208		-//
209		-// @Test
210		-// public void testAddStringLocaleObjectArray() {
211		-// String key = "my.key";
212		-// Object[] param = { "1", "2" };
213		-// Locale locale = Locale.CANADA_FRENCH;
214		-// messageContext.add(key, locale, param);
215		-//
216		-// Assert.assertTrue(messageContext.getMessages().size() == 1);
217		-// Assert.assertTrue(messageContext.getMessages().get(0).getText().equals(key));
218		-// Assert.assertTrue(messageContext.getMessages().get(0).getLocale().equals(locale));
219		-// Assert.assertTrue(messageContext.getMessages().get(0).getParameters()[0] == param[0]);
220		-// Assert.assertTrue(messageContext.getMessages().get(0).getParameters()[1] == param[1]);
221		-// }
222		-//
223		-// @Test
224		-// public void testAddStringLocaleSeverityTypeObjectArray() {
225		-// String key = "my.key";
226		-// Object[] param = { "1", "2" };
227		-// Locale locale = Locale.CANADA_FRENCH;
228		-// SeverityType severity = SeverityType.ERROR;
229		-// messageContext.add(key, locale, severity, param);
230		-//
231		-// Assert.assertTrue(messageContext.getMessages().size() == 1);
232		-// Assert.assertTrue(messageContext.getMessages().get(0).getText().equals(key));
233		-// Assert.assertTrue(messageContext.getMessages().get(0).getLocale().equals(locale));
234		-// Assert.assertTrue(messageContext.getMessages().get(0).getSeverity().equals(severity));
235		-// Assert.assertTrue(messageContext.getMessages().get(0).getParameters()[0] == param[0]);
236		-// Assert.assertTrue(messageContext.getMessages().get(0).getParameters()[1] == param[1]);
237		-// }
238		-//
239		-// @Test
240		-// public void testAddStringLocaleSeverityTypeStringObjectArray() {
241		-// String key = "my.key";
242		-// Object[] param = { "1", "2" };
243		-// Locale locale = Locale.CANADA_FRENCH;
244		-// SeverityType severity = SeverityType.ERROR;
245		-// String resource = "myresourcename";
246		-// messageContext.add(key, locale, severity, resource, param);
247		-//
248		-// Assert.assertTrue(messageContext.getMessages().size() == 1);
249		-// Assert.assertTrue(messageContext.getMessages().get(0).getText().equals(key));
250		-// Assert.assertTrue(messageContext.getMessages().get(0).getLocale().equals(locale));
251		-// Assert.assertTrue(messageContext.getMessages().get(0).getSeverity().equals(severity));
252		-// Assert.assertTrue(messageContext.getMessages().get(0).getResourceName().equals(resource));
253		-// Assert.assertTrue(messageContext.getMessages().get(0).getParameters()[0] == param[0]);
254		-// Assert.assertTrue(messageContext.getMessages().get(0).getParameters()[1] == param[1]);
255		-// }
256		-
257		-
258		-}
259	182	\ No newline at end of file
	183	+ // @Test
	184	+ // public void testAddMessageObjectArray() {
	185	+ // Object[] param = { "1", "2" };
	186	+ // messageContext.add(m1, param);
	187	+
	188	+ // Assert.assertTrue(messageContext.getMessages().size() == 1);
	189	+ // Assert.assertTrue(messageContext.getMessages().contains(m1));
	190	+ // Assert.assertNotNull(messageContext.getMessages().get(0).getParameters());
	191	+ // Assert.assertTrue(messageContext.getMessages().get(0).getParameters()[0] == param[0]);
	192	+ // Assert.assertTrue(messageContext.getMessages().get(0).getParameters()[1] == param[1]);
	193	+ // }
	194	+
	195	+ // @Test
	196	+ // public void testAddStringObjectArray() {
	197	+ // String key = "my.key";
	198	+ // Object[] param = { "1", "2" };
	199	+ // messageContext.add(key, param);
	200	+ //
	201	+ // Assert.assertTrue(messageContext.getMessages().size() == 1);
	202	+ // Assert.assertTrue(messageContext.getMessages().get(0).getText().equals(key));
	203	+ // Assert.assertTrue(messageContext.getMessages().get(0).getParameters()[0] == param[0]);
	204	+ // Assert.assertTrue(messageContext.getMessages().get(0).getParameters()[1] == param[1]);
	205	+ // }
	206	+ //
	207	+ // @Test
	208	+ // public void testAddStringLocaleObjectArray() {
	209	+ // String key = "my.key";
	210	+ // Object[] param = { "1", "2" };
	211	+ // Locale locale = Locale.CANADA_FRENCH;
	212	+ // messageContext.add(key, locale, param);
	213	+ //
	214	+ // Assert.assertTrue(messageContext.getMessages().size() == 1);
	215	+ // Assert.assertTrue(messageContext.getMessages().get(0).getText().equals(key));
	216	+ // Assert.assertTrue(messageContext.getMessages().get(0).getLocale().equals(locale));
	217	+ // Assert.assertTrue(messageContext.getMessages().get(0).getParameters()[0] == param[0]);
	218	+ // Assert.assertTrue(messageContext.getMessages().get(0).getParameters()[1] == param[1]);
	219	+ // }
	220	+ //
	221	+ // @Test
	222	+ // public void testAddStringLocaleSeverityTypeObjectArray() {
	223	+ // String key = "my.key";
	224	+ // Object[] param = { "1", "2" };
	225	+ // Locale locale = Locale.CANADA_FRENCH;
	226	+ // SeverityType severity = SeverityType.ERROR;
	227	+ // messageContext.add(key, locale, severity, param);
	228	+ //
	229	+ // Assert.assertTrue(messageContext.getMessages().size() == 1);
	230	+ // Assert.assertTrue(messageContext.getMessages().get(0).getText().equals(key));
	231	+ // Assert.assertTrue(messageContext.getMessages().get(0).getLocale().equals(locale));
	232	+ // Assert.assertTrue(messageContext.getMessages().get(0).getSeverity().equals(severity));
	233	+ // Assert.assertTrue(messageContext.getMessages().get(0).getParameters()[0] == param[0]);
	234	+ // Assert.assertTrue(messageContext.getMessages().get(0).getParameters()[1] == param[1]);
	235	+ // }
	236	+ //
	237	+ // @Test
	238	+ // public void testAddStringLocaleSeverityTypeStringObjectArray() {
	239	+ // String key = "my.key";
	240	+ // Object[] param = { "1", "2" };
	241	+ // Locale locale = Locale.CANADA_FRENCH;
	242	+ // SeverityType severity = SeverityType.ERROR;
	243	+ // String resource = "myresourcename";
	244	+ // messageContext.add(key, locale, severity, resource, param);
	245	+ //
	246	+ // Assert.assertTrue(messageContext.getMessages().size() == 1);
	247	+ // Assert.assertTrue(messageContext.getMessages().get(0).getText().equals(key));
	248	+ // Assert.assertTrue(messageContext.getMessages().get(0).getLocale().equals(locale));
	249	+ // Assert.assertTrue(messageContext.getMessages().get(0).getSeverity().equals(severity));
	250	+ // Assert.assertTrue(messageContext.getMessages().get(0).getResourceName().equals(resource));
	251	+ // Assert.assertTrue(messageContext.getMessages().get(0).getParameters()[0] == param[0]);
	252	+ // Assert.assertTrue(messageContext.getMessages().get(0).getParameters()[1] == param[1]);
	253	+ // }
	254	+
	255	+}
...	...
...	...	@@ -0,0 +1,5 @@
	1	+/target
	2	+/.project
	3	+/.classpath
	4	+/.settings
	5	+/.externalToolBuilders
...	...