Ajuste no build dos projetos

Cleverson Sacramento
1 parent 69f80244
Showing 40 changed files with 798 additions and 743 deletions Show diff stats
impl/extension/jdbc/src/main/java/br/gov/frameworkdemoiselle/internal/producer/ConnectionProducer.java
impl/extension/jdbc/src/main/java/br/gov/frameworkdemoiselle/internal/producer/DataSourceProducer.java
impl/extension/jdbc/src/test/java/test/Tests.java
impl/extension/jdbc/src/test/resources/.glassfish.profile
impl/extension/jpa/src/test/java/producer/MyEntity.java
impl/extension/jpa/src/test/java/producer/ProducerTest.java
impl/extension/jpa/src/test/java/transaction/interceptor/JPATransactionTest.java
impl/extension/jpa/src/test/resources/.glassfish.profile
impl/extension/jpa/src/test/resources/producer/persistence.xml
impl/extension/jpa/src/test/resources/template/persistence.xml
impl/extension/jpa/src/test/resources/test/beans.xml
impl/extension/jpa/src/test/resources/transaction/interceptor/persistence.xml
impl/extension/jpa/src/test/resources/transaction/manual/persistence.xml
impl/extension/jsf/src/test/resources/.drone.profile
impl/extension/jsf/src/test/resources/.glassfish.profile
impl/extension/jta/src/test/java/test/Tests.java
impl/extension/jta/src/test/resources/.glassfish.profile
impl/extension/se/.arquillian-weld-se-embedded
impl/extension/se/src/test/resources/.weldse.profile
impl/extension/servlet/pom.xml
@@ -22,6 +22,8 @@ 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.Beans;
+import br.gov.frameworkdemoiselle.util.NameQualifier;
 import br.gov.frameworkdemoiselle.util.ResourceBundle;
 @RequestScoped
@@ -29,15 +31,29 @@ public class ConnectionProducer implements Serializable {
 	private static final long serialVersionUID = 1L;
-	@Inject
-	private Logger logger;
+	private transient Logger logger;
-	@Inject
-	@Name("demoiselle-jdbc-bundle")
-	private ResourceBundle bundle;
+	private transient ResourceBundle bundle;
+
+	private ResourceBundle getBundle() {
+		if (bundle == null) {
+			bundle = Beans.getReference(ResourceBundle.class, new NameQualifier("demoiselle-jdbc-bundle"));
+		}
+
+		return bundle;
+	}
+
+	private Logger getLogger() {
+		if (logger == null) {
+			logger = Beans.getReference(Logger.class, new NameQualifier(DataSourceProducer.class.getName()));
+		}
+
+		return logger;
+	}
 	private final Map<String, Connection> cache = Collections.synchronizedMap(new HashMap<String, Connection>());
-	private final Map<Connection,Status> statusCache = Collections.synchronizedMap(new HashMap<Connection, Status>());
+
+	private final Map<Connection, Status> statusCache = Collections.synchronizedMap(new HashMap<Connection, Status>());
 	@Inject
 	private DataSourceProducer producer;
@@ -81,10 +97,10 @@ public class ConnectionProducer implements Serializable {
 				cache.put(name, connection);
 				statusCache.put(connection, new Status());
-				logger.info(bundle.getString("connection-was-created", name));
+				getLogger().info(getBundle().getString("connection-was-created", name));
 			} catch (Exception cause) {
-				throw new DemoiselleException(bundle.getString("connection-creation-failed", name), cause);
+				throw new DemoiselleException(getBundle().getString("connection-creation-failed", name), cause);
 			}
 		}
@@ -96,7 +112,7 @@ public class ConnectionProducer implements Serializable {
 			connection.setAutoCommit(false);
 		} catch (SQLException cause) {
-			logger.debug(bundle.getString("set-autocommit-failed"));
+			getLogger().debug(getBundle().getString("set-autocommit-failed"));
 		}
 	}
@@ -104,7 +120,7 @@ public class ConnectionProducer implements Serializable {
 		String result = config.getDefaultDataSourceName();
 		if (result != null) {
-			logger.debug(bundle.getString("getting-default-datasource-name-from-properties", result));
+			getLogger().debug(getBundle().getString("getting-default-datasource-name-from-properties", result));
 		}
 		return result;
@@ -115,7 +131,7 @@ public class ConnectionProducer implements Serializable {
 		Set<String> names = producer.getCache().keySet();
 		if (names.size() > 1) {
-			throw new DemoiselleException(bundle.getString("more-than-one-datasource-defined",
+			throw new DemoiselleException(getBundle().getString("more-than-one-datasource-defined",
 					Name.class.getSimpleName()));
 		} else {
 			result = names.iterator().next();
@@ -133,16 +149,16 @@ public class ConnectionProducer implements Serializable {
 			try {
 				if (connection.isClosed()) {
-					logger.warn(bundle.getString("connection-has-already-been-closed", key));
+					getLogger().warn(getBundle().getString("connection-has-already-been-closed", key));
 				} else {
 					connection.close();
-					logger.info(bundle.getString("connection-was-closed", key));
+					getLogger().info(getBundle().getString("connection-was-closed", key));
 				}
 			} catch (Exception cause) {
-				throw new DemoiselleException(bundle.getString("connection-close-failed", key), cause);
+				throw new DemoiselleException(getBundle().getString("connection-close-failed", key), cause);
 			}
 		}
@@ -152,11 +168,11 @@ public class ConnectionProducer implements Serializable {
 	public Map<String, Connection> getCache() {
 		return cache;
 	}
-	
+
 	public Status getStatus(Connection connection) {
 		return statusCache.get(connection);
 	}
-	
+
 	public static class Status implements Serializable {
 		private static final long serialVersionUID = 1L;
@@ -181,5 +197,4 @@ public class ConnectionProducer implements Serializable {
 			this.markedRollback = markedRollback;
 		}
 	}
-
 }
@@ -10,7 +10,6 @@ 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;
@@ -19,10 +18,10 @@ 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.internal.proxy.BasicDataSourceProxy;
 import br.gov.frameworkdemoiselle.util.Beans;
+import br.gov.frameworkdemoiselle.util.NameQualifier;
 import br.gov.frameworkdemoiselle.util.ResourceBundle;
 @ApplicationScoped
@@ -30,12 +29,25 @@ public class DataSourceProducer implements Serializable {
 	private static final long serialVersionUID = 1L;
-	@Inject
-	private Logger logger;
+	private transient Logger logger;
-	@Inject
-	@Name("demoiselle-jdbc-bundle")
-	private ResourceBundle bundle;
+	private transient ResourceBundle bundle;
+
+	private ResourceBundle getBundle() {
+		if (bundle == null) {
+			bundle = Beans.getReference(ResourceBundle.class, new NameQualifier("demoiselle-jdbc-bundle"));
+		}
+
+		return bundle;
+	}
+
+	private Logger getLogger() {
+		if (logger == null) {
+			logger = Beans.getReference(Logger.class, new NameQualifier(DataSourceProducer.class.getName()));
+		}
+
+		return logger;
+	}
 	private final Map<ClassLoader, Map<String, DataSource>> cache = Collections
 			.synchronizedMap(new HashMap<ClassLoader, Map<String, DataSource>>());
@@ -52,7 +64,7 @@ public class DataSourceProducer implements Serializable {
 				throw new DemoiselleException(cause);
 			}
-			logger.debug(bundle.getString("datasource-name-found", dataBaseName));
+			getLogger().debug(getBundle().getString("datasource-name-found", dataBaseName));
 		}
 	}
@@ -70,7 +82,7 @@ public class DataSourceProducer implements Serializable {
 		}
 		if (result.isEmpty()) {
-			throw new DemoiselleException(bundle.getString("datasource-name-not-found"));
+			throw new DemoiselleException(getBundle().getString("datasource-name-not-found"));
 		}
 		return result;
@@ -117,10 +129,10 @@ public class DataSourceProducer implements Serializable {
 			result = initJNDIDataSource(dataSourceName, jndi);
 		} else if (url != null) {
-			result = new BasicDataSourceProxy(dataSourceName, config, bundle);
-			
+			result = new BasicDataSourceProxy(dataSourceName, config, getBundle());
+
 		} else {
-			throw new DemoiselleException(bundle.getString("uncompleted-datasource-configuration", dataSourceName));
+			throw new DemoiselleException(getBundle().getString("uncompleted-datasource-configuration", dataSourceName));
 		}
 		return result;
@@ -134,10 +146,11 @@ public class DataSourceProducer implements Serializable {
 			result = (DataSource) context.lookup(jndi);
 		} catch (NamingException cause) {
-			throw new DemoiselleException(bundle.getString("load-jndi-datasource-failed", dataSourceName, jndi), cause);
+			throw new DemoiselleException(getBundle().getString("load-jndi-datasource-failed", dataSourceName, jndi),
+					cause);
 		} catch (ClassCastException cause) {
-			throw new DemoiselleException(bundle.getString("load-duplicated-configuration-failed"), cause);
+			throw new DemoiselleException(getBundle().getString("load-duplicated-configuration-failed"), cause);
 		}
 		return result;
@@ -153,7 +166,7 @@ public class DataSourceProducer implements Serializable {
 		Map<String, DataSource> result = cache.get(classLoader);
 		if (result == null || result.isEmpty()) {
-			logger.debug(bundle.getString("datasource-not-found-in-cache"));
+			getLogger().debug(getBundle().getString("datasource-not-found-in-cache"));
 			for (String name : getDataSourceNames(classLoader)) {
 				create(name);
@@ -67,7 +67,7 @@ public final class Tests {
 	private static WebArchive createDeployment() {
 		File[] libs = Maven.resolver().offline().loadPomFromFile("pom.xml", "arquillian-test")
-				.importCompileAndRuntimeDependencies().importTestDependencies().resolve().withTransitivity().asFile();
+				.importCompileAndRuntimeDependencies().resolve().withTransitivity().asFile();
 		return ShrinkWrap
 				.create(WebArchive.class)
@@ -0,0 +1,29 @@
+package producer;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+
+@Entity
+public class MyEntity {
+
+	@Id
+	private String id;
+
+	private String description;
+
+	public String getId() {
+		return id;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public String getDescription() {
+		return description;
+	}
+
+	public void setDescription(String description) {
+		this.description = description;
+	}
+}
@@ -0,0 +1,79 @@
+package producer;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import javax.persistence.EntityManager;
+
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import test.Tests;
+import br.gov.frameworkdemoiselle.internal.proxy.EntityManagerProxy;
+import br.gov.frameworkdemoiselle.util.Beans;
+import br.gov.frameworkdemoiselle.util.NameQualifier;
+
+@RunWith(Arquillian.class)
+public class ProducerTest {
+
+	private static final String PATH = "src/test/resources/producer";
+
+	@Deployment
+	public static WebArchive createDeployment() {
+		WebArchive deployment = Tests.createDeployment(ProducerTest.class);
+		deployment.addAsResource(Tests.createFileAsset(PATH + "/persistence.xml"), "META-INF/persistence.xml");
+		deployment.addAsResource(Tests.createFileAsset(PATH + "/demoiselle.properties"), "demoiselle.properties");
+
+		return deployment;
+	}
+
+	@Test
+	public void produceEntityManager() {
+		EntityManager manager = Beans.getReference(EntityManager.class);
+
+		assertNotNull(manager);
+		assertEquals(EntityManagerProxy.class, manager.getClass());
+	}
+
+	@Test
+	public void produceMultipleEntityManagers() {
+		EntityManager m1 = Beans.getReference(EntityManager.class, new NameQualifier("pu"));
+
+		assertNotNull(m1);
+		assertEquals(EntityManagerProxy.class, m1.getClass());
+
+		EntityManager m2 = Beans.getReference(EntityManager.class, new NameQualifier("pu2"));
+
+		assertNotNull(m2);
+		assertEquals(EntityManagerProxy.class, m2.getClass());
+	}
+
+	@Test
+	public void produceOneEntityManagerPerRequest() {
+		EntityManager m1 = Beans.getReference(EntityManager.class, new NameQualifier("pu"));
+
+		assertNotNull(m1);
+		assertEquals(EntityManagerProxy.class, m1.getClass());
+
+		EntityManager m2 = Beans.getReference(EntityManager.class, new NameQualifier("pu"));
+
+		assertNotNull(m2);
+		assertEquals(EntityManagerProxy.class, m2.getClass());
+
+		MyEntity entity = new MyEntity();
+		entity.setId(createId("testID"));
+
+		m1.persist(entity);
+
+		assertTrue(m2.contains(entity));
+	}
+
+	private String createId(String id) {
+		return this.getClass().getName() + "_" + id;
+	}
+
+}
 package transaction.interceptor;
+import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.assertFalse;
+import static junit.framework.Assert.assertNull;
+import static junit.framework.Assert.assertTrue;
+
 import javax.inject.Inject;
 import javax.persistence.EntityManager;
-import junit.framework.Assert;
-
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
@@ -20,10 +23,10 @@ import br.gov.frameworkdemoiselle.transaction.TransactionContext;
 public class JPATransactionTest {
 	private static final String PATH = "src/test/resources/transaction/interceptor";
-	
+
 	@Inject
 	private TransactionalBusiness tb;
-	
+
 	@Inject
 	@Name("pu1")
 	private EntityManager em1;
@@ -31,7 +34,7 @@ public class JPATransactionTest {
 	@Inject
 	@Name("pu2")
 	private EntityManager em2;
-	
+
 	@Inject
 	private TransactionContext transactionContext;
@@ -42,52 +45,51 @@ public class JPATransactionTest {
 		return deployment;
 	}
-	
+
 	@Before
-	public void eraseDatabases(){
+	public void eraseDatabases() {
 		transactionContext.getCurrentTransaction().begin();
 		em1.createQuery("DELETE FROM MyEntity1").executeUpdate();
 		em2.createQuery("DELETE FROM MyEntity2").executeUpdate();
 		transactionContext.getCurrentTransaction().commit();
 	}
-	
+
 	@Test
-	public void isTransactionActiveWithInterceptor(){
-		Assert.assertTrue(tb.isTransactionActiveWithInterceptor());
+	public void isTransactionActiveWithInterceptor() {
+		assertTrue(tb.isTransactionActiveWithInterceptor());
 	}
-	
+
 	@Test
-	public void isTransactionActiveWithoutInterceptor(){
-		Assert.assertFalse(tb.isTransactionActiveWithoutInterceptor());
+	public void isTransactionActiveWithoutInterceptor() {
+		assertFalse(tb.isTransactionActiveWithoutInterceptor());
 	}
 	@Test
 	public void commitWithSuccess() {
-		
+
 		tb.commitWithSuccess();
 		MyEntity1 entity1 = em1.find(MyEntity1.class, tb.createId("id-1"));
 		MyEntity2 entity2 = em2.find(MyEntity2.class, tb.createId("id-2"));
-		
-		Assert.assertEquals("desc-1", entity1.getDescription());
-		Assert.assertEquals("desc-2", entity2.getDescription());
+
+		assertEquals("desc-1", entity1.getDescription());
+		assertEquals("desc-2", entity2.getDescription());
 	}
 	@Test
 	public void rollbackWithSuccess() {
-		
-		try{
+
+		try {
 			tb.rollbackWithSuccess();
 		} catch (Exception e) {
-			Assert.assertEquals("Exceção criada para marcar transação para rollback", e.getMessage());
-		}
-		finally{
+			assertEquals("Exceção criada para marcar transação para rollback", e.getMessage());
+		} finally {
 			MyEntity1 entity1 = em1.find(MyEntity1.class, tb.createId("id-3"));
 			MyEntity2 entity2 = em2.find(MyEntity2.class, tb.createId("id-4"));
-			
-			Assert.assertNull(entity1);
-			Assert.assertNull(entity2);
+
+			assertNull(entity1);
+			assertNull(entity2);
 		}
 	}
-	
-}
 \ No newline at end of file
+
+}
@@ -0,0 +1,76 @@
+<!--
+ 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.
+-->
+<persistence version="2.0" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
+
+	<persistence-unit name="pu" transaction-type="RESOURCE_LOCAL">
+		<non-jta-data-source>jdbc/__default</non-jta-data-source>
+
+		<class>producer.MyEntity</class>
+
+		<properties>
+			<property name="eclipselink.ddl-generation" value="drop-and-create-tables" />
+			<property name="eclipselink.logging.level.sql" value="FINE" />
+			<property name="eclipselink.logging.parameters" value="true" />
+			
+			<!--
+			<property name="hibernate.show_sql" value="true" />
+			<property name="hibernate.format_sql" value="false" />
+			<property name="hibernate.hbm2ddl.auto" value="create-drop" />
+			-->
+		</properties>
+	</persistence-unit>
+
+	<persistence-unit name="pu2" transaction-type="RESOURCE_LOCAL">
+		<non-jta-data-source>jdbc/__default</non-jta-data-source>
+
+		<class>producer.MyEntity</class>
+
+		<properties>
+			<property name="eclipselink.ddl-generation" value="drop-and-create-tables" />
+			<property name="eclipselink.logging.level.sql" value="FINE" />
+			<property name="eclipselink.logging.parameters" value="true" />
+			
+			<!--
+			<property name="hibernate.show_sql" value="true" />
+			<property name="hibernate.format_sql" value="false" />
+			<property name="hibernate.hbm2ddl.auto" value="create-drop" />
+			-->
+		</properties>
+	</persistence-unit>
+
+</persistence>
 \ No newline at end of file
@@ -37,9 +37,8 @@
 <persistence version="2.0" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
-	<!--
 	<persistence-unit name="pu" transaction-type="RESOURCE_LOCAL">
-		<non-jta-data-source>jdbc/arquillian1</non-jta-data-source>
+		<non-jta-data-source>jdbc/__default</non-jta-data-source>
 		<class>template.MyEntity</class>
@@ -47,21 +46,12 @@
 			<property name="eclipselink.ddl-generation" value="drop-and-create-tables" />
 			<property name="eclipselink.logging.level.sql" value="FINE" />
 			<property name="eclipselink.logging.parameters" value="true" />
-		</properties>
-	</persistence-unit>
-	-->
-
-	<!--
-	-->
-	<persistence-unit name="pu" transaction-type="RESOURCE_LOCAL">
-		<non-jta-data-source>jdbc/__default</non-jta-data-source>
-
-		<class>template.MyEntity</class>
-
-		<properties>
+			
+			<!--
 			<property name="hibernate.show_sql" value="true" />
 			<property name="hibernate.format_sql" value="false" />
 			<property name="hibernate.hbm2ddl.auto" value="create-drop" />
+			-->
 		</properties>
 	</persistence-unit>
-<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">
+<!--
+ 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">
 	<interceptors>
 		<class>br.gov.frameworkdemoiselle.transaction.TransactionalInterceptor</class>
@@ -37,36 +37,6 @@
 <persistence version="2.0" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
-	<!--
-	<persistence-unit name="pu1" transaction-type="RESOURCE_LOCAL">
-		<non-jta-data-source>jdbc/arquillian1</non-jta-data-source>
-
-		<class>transaction.manual.MyEntity1</class>
-		<class>transaction.manual.MyEntity2</class>
-
-		<properties>
-			<property name="eclipselink.ddl-generation" value="drop-and-create-tables" />
-			<property name="eclipselink.logging.level.sql" value="FINE" />
-			<property name="eclipselink.logging.parameters" value="true" />
-		</properties>
-	</persistence-unit>
-
-	<persistence-unit name="pu2" transaction-type="RESOURCE_LOCAL">
-		<non-jta-data-source>jdbc/arquillian2</non-jta-data-source>
-
-		<class>transaction.manual.MyEntity1</class>
-		<class>transaction.manual.MyEntity2</class>
-
-		<properties>
-			<property name="eclipselink.ddl-generation" value="drop-and-create-tables" />
-			<property name="eclipselink.logging.level.sql" value="FINE" />
-			<property name="eclipselink.logging.parameters" value="true" />
-		</properties>
-	</persistence-unit>
-	-->
-
-	<!--
-	-->
 	<persistence-unit name="pu1" transaction-type="RESOURCE_LOCAL">
 		<non-jta-data-source>jdbc/__default</non-jta-data-source>
@@ -74,9 +44,15 @@
 		<class>transaction.interceptor.MyEntity2</class>
 		<properties>
+			<property name="eclipselink.ddl-generation" value="drop-and-create-tables" />
+			<property name="eclipselink.logging.level.sql" value="FINE" />
+			<property name="eclipselink.logging.parameters" value="true" />
+			
+			<!--
 			<property name="hibernate.show_sql" value="true" />
 			<property name="hibernate.format_sql" value="false" />
 			<property name="hibernate.hbm2ddl.auto" value="create-drop" />
+			-->
 		</properties>
 	</persistence-unit>
@@ -87,10 +63,16 @@
 		<class>transaction.interceptor.MyEntity2</class>
 		<properties>
+			<property name="eclipselink.ddl-generation" value="drop-and-create-tables" />
+			<property name="eclipselink.logging.level.sql" value="FINE" />
+			<property name="eclipselink.logging.parameters" value="true" />
+			
+			<!--
 			<property name="hibernate.show_sql" value="true" />
 			<property name="hibernate.format_sql" value="false" />
 			<property name="hibernate.hbm2ddl.auto" value="create-drop" />
+			-->
 		</properties>
 	</persistence-unit>
-	
+
 </persistence>
 \ No newline at end of file
@@ -37,22 +37,8 @@
 <persistence version="2.0" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
-	<!--
 	<persistence-unit name="pu1" transaction-type="RESOURCE_LOCAL">
-		<non-jta-data-source>jdbc/arquillian1</non-jta-data-source>
-
-		<class>transaction.manual.MyEntity1</class>
-		<class>transaction.manual.MyEntity2</class>
-
-		<properties>
-			<property name="eclipselink.ddl-generation" value="drop-and-create-tables" />
-			<property name="eclipselink.logging.level.sql" value="FINE" />
-			<property name="eclipselink.logging.parameters" value="true" />
-		</properties>
-	</persistence-unit>
-
-	<persistence-unit name="pu2" transaction-type="RESOURCE_LOCAL">
-		<non-jta-data-source>jdbc/arquillian2</non-jta-data-source>
+		<non-jta-data-source>jdbc/__default</non-jta-data-source>
 		<class>transaction.manual.MyEntity1</class>
 		<class>transaction.manual.MyEntity2</class>
@@ -61,22 +47,12 @@
 			<property name="eclipselink.ddl-generation" value="drop-and-create-tables" />
 			<property name="eclipselink.logging.level.sql" value="FINE" />
 			<property name="eclipselink.logging.parameters" value="true" />
-		</properties>
-	</persistence-unit>
-	-->
-
-	<!--
-	-->
-	<persistence-unit name="pu1" transaction-type="RESOURCE_LOCAL">
-		<non-jta-data-source>jdbc/__default</non-jta-data-source>
-
-		<class>transaction.manual.MyEntity1</class>
-		<class>transaction.manual.MyEntity2</class>
-
-		<properties>
+			
+			<!--
 			<property name="hibernate.show_sql" value="true" />
 			<property name="hibernate.format_sql" value="false" />
 			<property name="hibernate.hbm2ddl.auto" value="create-drop" />
+			-->
 		</properties>
 	</persistence-unit>
@@ -87,12 +63,18 @@
 		<class>transaction.manual.MyEntity2</class>
 		<properties>
+			<property name="eclipselink.ddl-generation" value="drop-and-create-tables" />
+			<property name="eclipselink.logging.level.sql" value="FINE" />
+			<property name="eclipselink.logging.parameters" value="true" />
+			
+			<!--
 			<property name="hibernate.show_sql" value="true" />
 			<property name="hibernate.format_sql" value="false" />
 			<property name="hibernate.hbm2ddl.auto" value="create-drop" />
+			-->
 		</properties>
 	</persistence-unit>
-	
+
 	<persistence-unit name="pu3" transaction-type="RESOURCE_LOCAL">
 		<non-jta-data-source>jdbc/__default</non-jta-data-source>
@@ -100,9 +82,15 @@
 		<class>transaction.manual.MyEntity2</class>
 		<properties>
+			<property name="eclipselink.ddl-generation" value="drop-and-create-tables" />
+			<property name="eclipselink.logging.level.sql" value="FINE" />
+			<property name="eclipselink.logging.parameters" value="true" />
+			
+			<!--
 			<property name="hibernate.show_sql" value="true" />
 			<property name="hibernate.format_sql" value="false" />
 			<property name="hibernate.hbm2ddl.auto" value="create-drop" />
+			-->
 		</properties>
 	</persistence-unit>
@@ -71,7 +71,7 @@ public final class Tests {
 				.addClass(JTATransaction.class)
 				.addAsResource(createFileAsset("src/main/resources/demoiselle-jta-bundle.properties") , "demoiselle-jta-bundle.properties" )
 				.addAsResource(createFileAsset("src/test/resources/log/log4j.properties") , "log4j.properties" )
-				.addAsWebInfResource(createFileAsset("src/test/resources/beans.xml"), "beans.xml")
+				.addAsWebInfResource(createFileAsset("src/test/resources/test/beans.xml"), "beans.xml")
 				.addAsLibraries(libs);
 	}
@@ -77,11 +77,13 @@
 			<version>1.4</version>
 		</dependency>
+		<!--
 		<dependency>
 			<groupId>javax.el</groupId>
 			<artifactId>el-api</artifactId>
 			<scope>test</scope>
 		</dependency>
+		-->
 	</dependencies>
 	<repositories>
@@ -108,4 +110,17 @@
 			</releases>
 		</repository>
 	</repositories>
+
+	<profiles>
+		<profile>
+			<id>arquillian-test</id>
+			<dependencies>
+				<dependency>
+					<groupId>javax.servlet</groupId>
+					<artifactId>javax.servlet-api</artifactId>
+					<scope>provided</scope>
+				</dependency>
+			</dependencies>
+		</profile>
+	</profiles>
 </project>
@@ -49,11 +49,10 @@ import br.gov.frameworkdemoiselle.util.NameQualifier;
 import br.gov.frameworkdemoiselle.util.ResourceBundle;
 /**
- * Implements the {@link Authenticator} interface, offering a way to implement 
- * offering a manner to use the authenticator's functionalities.
+ * Implements the {@link Authenticator} interface, offering a way to implement offering a manner to use the
+ * authenticator's functionalities.
  * 
  * @author SERPRO
- *
  */
 @Priority(L2_PRIORITY)
@@ -90,30 +89,30 @@ public class ServletAuthenticator implements Authenticator {
 	@Override
 	public User getUser() {
 		final Principal principal = getRequest().getUserPrincipal();
-		
+
 		User user = null;
-		
-		if (principal!=null) {
-			user =  new User() {
-				
+
+		if (principal != null) {
+			user = new User() {
+
 				private static final long serialVersionUID = 1L;
-				
+
 				@Override
 				public String getId() {
 					return principal.getName();
 				}
-				
+
 				@Override
 				public void setAttribute(Object key, Object value) {
 				}
-				
+
 				@Override
 				public Object getAttribute(Object key) {
 					return null;
 				}
 			};
 		}
-		
+
 		return user;
 	}
@@ -42,16 +42,15 @@ import javax.servlet.http.HttpServletRequest;
 import br.gov.frameworkdemoiselle.DemoiselleException;
 import br.gov.frameworkdemoiselle.annotation.Priority;
-import br.gov.frameworkdemoiselle.internal.producer.ResourceBundleProducer;
 import br.gov.frameworkdemoiselle.util.Beans;
+import br.gov.frameworkdemoiselle.util.NameQualifier;
 import br.gov.frameworkdemoiselle.util.ResourceBundle;
 /**
- * Implements the {@link Authorizer} interface, offering a way to implement 
- * offering a manner to use the authorizer's functionalities.
+ * Implements the {@link Authorizer} interface, offering a way to implement offering a manner to use the authorizer's
+ * functionalities.
  * 
  * @author SERPRO
- *
  */
 @Priority(L2_PRIORITY)
@@ -59,7 +58,7 @@ public class ServletAuthorizer implements Authorizer {
 	private static final long serialVersionUID = 1L;
-	private static ResourceBundle bundle;
+	private transient ResourceBundle bundle;
 	@Override
 	public boolean hasRole(String role) {
@@ -76,9 +75,9 @@ public class ServletAuthorizer implements Authorizer {
 		return Beans.getReference(HttpServletRequest.class);
 	}
-	private static ResourceBundle getBundle() {
+	private ResourceBundle getBundle() {
 		if (bundle == null) {
-			bundle = new ResourceBundleProducer().create("demoiselle-servlet-bundle");
+			bundle = Beans.getReference(ResourceBundle.class, new NameQualifier("demoiselle-servlet-bundle"));
 		}
 		return bundle;
@@ -1,82 +0,0 @@
-///*
-// * Demoiselle Framework
-// * Copyright (C) 2010 SERPRO
-// * ----------------------------------------------------------------------------
-// * This file is part of Demoiselle Framework.
-// * 
-// * Demoiselle Framework is free software; you can redistribute it and/or
-// * modify it under the terms of the GNU Lesser General Public License version 3
-// * as published by the Free Software Foundation.
-// * 
-// * This program is distributed in the hope that it will be useful,
-// * but WITHOUT ANY WARRANTY; without even the implied warranty of
-// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// * GNU General Public License for more details.
-// * 
-// * You should have received a copy of the GNU Lesser General Public License version 3
-// * along with this program; if not,  see <http://www.gnu.org/licenses/>
-// * or write to the Free Software Foundation, Inc., 51 Franklin Street,
-// * Fifth Floor, Boston, MA  02110-1301, USA.
-// * ----------------------------------------------------------------------------
-// * Este arquivo é parte do Framework Demoiselle.
-// * 
-// * O Framework Demoiselle é um software livre; você pode redistribuí-lo e/ou
-// * modificá-lo dentro dos termos da GNU LGPL versão 3 como publicada pela Fundação
-// * do Software Livre (FSF).
-// * 
-// * Este programa é distribuído na esperança que possa ser útil, mas SEM NENHUMA
-// * GARANTIA; sem uma garantia implícita de ADEQUAÇÃO a qualquer MERCADO ou
-// * APLICAÇÃO EM PARTICULAR. Veja a Licença Pública Geral GNU/LGPL em português
-// * para maiores detalhes.
-// * 
-// * Você deve ter recebido uma cópia da GNU LGPL versão 3, sob o título
-// * "LICENCA.txt", junto com esse programa. Se não, acesse <http://www.gnu.org/licenses/>
-// * ou escreva para a Fundação do Software Livre (FSF) Inc.,
-// * 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA.
-// */
-//package br.gov.frameworkdemoiselle.internal.producer;
-//
-//import static org.easymock.EasyMock.replay;
-//import static org.powermock.api.easymock.PowerMock.createMock;
-//import static org.powermock.api.easymock.PowerMock.verifyAll;
-//
-//import javax.servlet.http.HttpServletRequest;
-//
-//import junit.framework.Assert;
-//
-//import org.junit.Test;
-//import org.powermock.reflect.Whitebox;
-//
-//public class HttpServletRequestProducerTest {
-//
-//	private HttpServletRequestProducer httpServletRequestProducer;
-//
-//	private HttpServletRequest request;
-//
-//	@Test
-//	public void testCreate() {
-//		request = createMock(HttpServletRequest.class);
-//		replay(request);
-//
-//		httpServletRequestProducer = new HttpServletRequestProducer();
-//		Whitebox.setInternalState(httpServletRequestProducer, "request", request);
-//
-//		Assert.assertEquals(httpServletRequestProducer.create(), request);
-//
-//		verifyAll();
-//	}
-//
-//	@Test
-//	public void testSetDelegate() {
-//		request = createMock(HttpServletRequest.class);
-//		replay(request);
-//
-//		httpServletRequestProducer = new HttpServletRequestProducer();
-//
-//		httpServletRequestProducer.setDelegate(request);
-//		Assert.assertEquals(Whitebox.getInternalState(httpServletRequestProducer, "request"), request);
-//
-//		verifyAll();
-//	}
-//
-//}
@@ -1,82 +0,0 @@
-///*
-// * Demoiselle Framework
-// * Copyright (C) 2010 SERPRO
-// * ----------------------------------------------------------------------------
-// * This file is part of Demoiselle Framework.
-// * 
-// * Demoiselle Framework is free software; you can redistribute it and/or
-// * modify it under the terms of the GNU Lesser General Public License version 3
-// * as published by the Free Software Foundation.
-// * 
-// * This program is distributed in the hope that it will be useful,
-// * but WITHOUT ANY WARRANTY; without even the implied warranty of
-// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// * GNU General Public License for more details.
-// * 
-// * You should have received a copy of the GNU Lesser General Public License version 3
-// * along with this program; if not,  see <http://www.gnu.org/licenses/>
-// * or write to the Free Software Foundation, Inc., 51 Franklin Street,
-// * Fifth Floor, Boston, MA  02110-1301, USA.
-// * ----------------------------------------------------------------------------
-// * Este arquivo é parte do Framework Demoiselle.
-// * 
-// * O Framework Demoiselle é um software livre; você pode redistribuí-lo e/ou
-// * modificá-lo dentro dos termos da GNU LGPL versão 3 como publicada pela Fundação
-// * do Software Livre (FSF).
-// * 
-// * Este programa é distribuído na esperança que possa ser útil, mas SEM NENHUMA
-// * GARANTIA; sem uma garantia implícita de ADEQUAÇÃO a qualquer MERCADO ou
-// * APLICAÇÃO EM PARTICULAR. Veja a Licença Pública Geral GNU/LGPL em português
-// * para maiores detalhes.
-// * 
-// * Você deve ter recebido uma cópia da GNU LGPL versão 3, sob o título
-// * "LICENCA.txt", junto com esse programa. Se não, acesse <http://www.gnu.org/licenses/>
-// * ou escreva para a Fundação do Software Livre (FSF) Inc.,
-// * 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA.
-// */
-//package br.gov.frameworkdemoiselle.internal.producer;
-//
-//import static org.easymock.EasyMock.replay;
-//import static org.powermock.api.easymock.PowerMock.createMock;
-//import static org.powermock.api.easymock.PowerMock.verifyAll;
-//
-//import javax.servlet.http.HttpServletResponse;
-//
-//import junit.framework.Assert;
-//
-//import org.junit.Test;
-//import org.powermock.reflect.Whitebox;
-//
-//public class HttpServletResponseProducerTest {
-//
-//	private HttpServletResponseProducer httpServletResponseProducer;
-//
-//	private HttpServletResponse response;
-//
-//	@Test
-//	public void testCreate() {
-//		response = createMock(HttpServletResponse.class);
-//		replay(response);
-//
-//		httpServletResponseProducer = new HttpServletResponseProducer();
-//		Whitebox.setInternalState(httpServletResponseProducer, "response", response);
-//
-//		Assert.assertEquals(httpServletResponseProducer.create(), response);
-//
-//		verifyAll();
-//	}
-//
-//	@Test
-//	public void testSetDelegate() {
-//		response = createMock(HttpServletResponse.class);
-//		replay(response);
-//
-//		httpServletResponseProducer = new HttpServletResponseProducer();
-//
-//		httpServletResponseProducer.setDelegate(response);
-//		Assert.assertEquals(Whitebox.getInternalState(httpServletResponseProducer, "response"), response);
-//
-//		verifyAll();
-//	}
-//
-//}
@@ -1,79 +0,0 @@
-///*
-// * Demoiselle Framework
-// * Copyright (C) 2010 SERPRO
-// * ----------------------------------------------------------------------------
-// * This file is part of Demoiselle Framework.
-// * 
-// * Demoiselle Framework is free software; you can redistribute it and/or
-// * modify it under the terms of the GNU Lesser General Public License version 3
-// * as published by the Free Software Foundation.
-// * 
-// * This program is distributed in the hope that it will be useful,
-// * but WITHOUT ANY WARRANTY; without even the implied warranty of
-// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// * GNU General Public License for more details.
-// * 
-// * You should have received a copy of the GNU Lesser General Public License version 3
-// * along with this program; if not,  see <http://www.gnu.org/licenses/>
-// * or write to the Free Software Foundation, Inc., 51 Franklin Street,
-// * Fifth Floor, Boston, MA  02110-1301, USA.
-// * ----------------------------------------------------------------------------
-// * Este arquivo é parte do Framework Demoiselle.
-// * 
-// * O Framework Demoiselle é um software livre; você pode redistribuí-lo e/ou
-// * modificá-lo dentro dos termos da GNU LGPL versão 3 como publicada pela Fundação
-// * do Software Livre (FSF).
-// * 
-// * Este programa é distribuído na esperança que possa ser útil, mas SEM NENHUMA
-// * GARANTIA; sem uma garantia implícita de ADEQUAÇÃO a qualquer MERCADO ou
-// * APLICAÇÃO EM PARTICULAR. Veja a Licença Pública Geral GNU/LGPL em português
-// * para maiores detalhes.
-// * 
-// * Você deve ter recebido uma cópia da GNU LGPL versão 3, sob o título
-// * "LICENCA.txt", junto com esse programa. Se não, acesse <http://www.gnu.org/licenses/>
-// * ou escreva para a Fundação do Software Livre (FSF) Inc.,
-// * 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA.
-// */
-//package br.gov.frameworkdemoiselle.internal.producer;
-//
-//import static org.easymock.EasyMock.createMock;
-//import static org.easymock.EasyMock.replay;
-//import static org.powermock.api.easymock.PowerMock.verifyAll;
-//
-//import javax.servlet.http.HttpServletRequest;
-//import javax.servlet.http.HttpSession;
-//
-//import junit.framework.Assert;
-//
-//import org.easymock.EasyMock;
-//import org.junit.Test;
-//
-//public class HttpSessionProducerTest {
-//
-//	private HttpSessionProducer httpSessionProducer;
-//
-//	private HttpServletRequest request;
-//
-//	@Test
-//	public void testCreateWithRequestNull() {
-//		httpSessionProducer = new HttpSessionProducer();
-//		Assert.assertNull(httpSessionProducer.create(null));
-//
-//		verifyAll();
-//	}
-//
-//	@Test
-//	public void testCreateWithRequest() {
-//		request = createMock(HttpServletRequest.class);
-//		HttpSession session = createMock(HttpSession.class);
-//		EasyMock.expect(request.getSession()).andReturn(session);
-//		replay(request, session);
-//
-//		httpSessionProducer = new HttpSessionProducer();
-//		Assert.assertNotNull(httpSessionProducer.create(request));
-//
-//		verifyAll();
-//
-//	}
-//
-//}
@@ -1,84 +0,0 @@
-///*
-// * Demoiselle Framework
-// * Copyright (C) 2010 SERPRO
-// * ----------------------------------------------------------------------------
-// * This file is part of Demoiselle Framework.
-// * 
-// * Demoiselle Framework is free software; you can redistribute it and/or
-// * modify it under the terms of the GNU Lesser General Public License version 3
-// * as published by the Free Software Foundation.
-// * 
-// * This program is distributed in the hope that it will be useful,
-// * but WITHOUT ANY WARRANTY; without even the implied warranty of
-// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// * GNU General Public License for more details.
-// * 
-// * You should have received a copy of the GNU Lesser General Public License version 3
-// * along with this program; if not,  see <http://www.gnu.org/licenses/>
-// * or write to the Free Software Foundation, Inc., 51 Franklin Street,
-// * Fifth Floor, Boston, MA  02110-1301, USA.
-// * ----------------------------------------------------------------------------
-// * Este arquivo é parte do Framework Demoiselle.
-// * 
-// * O Framework Demoiselle é um software livre; você pode redistribuí-lo e/ou
-// * modificá-lo dentro dos termos da GNU LGPL versão 3 como publicada pela Fundação
-// * do Software Livre (FSF).
-// * 
-// * Este programa é distribuído na esperança que possa ser útil, mas SEM NENHUMA
-// * GARANTIA; sem uma garantia implícita de ADEQUAÇÃO a qualquer MERCADO ou
-// * APLICAÇÃO EM PARTICULAR. Veja a Licença Pública Geral GNU/LGPL em português
-// * para maiores detalhes.
-// * 
-// * Você deve ter recebido uma cópia da GNU LGPL versão 3, sob o título
-// * "LICENCA.txt", junto com esse programa. Se não, acesse <http://www.gnu.org/licenses/>
-// * ou escreva para a Fundação do Software Livre (FSF) Inc.,
-// * 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA.
-// */
-//package br.gov.frameworkdemoiselle.internal.producer;
-//
-//import static org.easymock.EasyMock.createMock;
-//import static org.easymock.EasyMock.expect;
-//import static org.powermock.api.easymock.PowerMock.mockStatic;
-//import static org.powermock.api.easymock.PowerMock.replay;
-//import static org.powermock.api.easymock.PowerMock.verifyAll;
-//
-//import javax.servlet.http.HttpServletRequest;
-//
-//import org.junit.Test;
-//import org.junit.runner.RunWith;
-//import org.powermock.core.classloader.annotations.PrepareForTest;
-//import org.powermock.modules.junit4.PowerMockRunner;
-//
-//import br.gov.frameworkdemoiselle.util.Beans;
-//
-//@RunWith(PowerMockRunner.class)
-//@PrepareForTest(Beans.class)
-//public class ServletLocaleProducerTest {
-//
-//	private ServletLocaleProducer servletLocaleProducer;
-//
-//	private HttpServletRequest request;
-//
-//	@Test
-//	public void testCreate() {
-//		request = createMock(HttpServletRequest.class);
-//
-//		mockStatic(Beans.class);
-//		expect(Beans.getReference(HttpServletRequest.class)).andReturn(request);
-//		replay(Beans.class);
-//
-//		servletLocaleProducer = new ServletLocaleProducer();
-//		servletLocaleProducer.create();
-//
-//		verifyAll();
-//	}
-//
-//	@Test
-//	public void testCreate2() {
-//		servletLocaleProducer = new ServletLocaleProducer();
-//		servletLocaleProducer.create();
-//
-//		verifyAll();
-//	}
-//
-//}
@@ -1,45 +0,0 @@
-///*
-// * Demoiselle Framework
-// * Copyright (C) 2010 SERPRO
-// * ----------------------------------------------------------------------------
-// * This file is part of Demoiselle Framework.
-// * 
-// * Demoiselle Framework is free software; you can redistribute it and/or
-// * modify it under the terms of the GNU Lesser General Public License version 3
-// * as published by the Free Software Foundation.
-// * 
-// * This program is distributed in the hope that it will be useful,
-// * but WITHOUT ANY WARRANTY; without even the implied warranty of
-// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// * GNU General Public License for more details.
-// * 
-// * You should have received a copy of the GNU Lesser General Public License version 3
-// * along with this program; if not,  see <http://www.gnu.org/licenses/>
-// * or write to the Free Software Foundation, Inc., 51 Franklin Street,
-// * Fifth Floor, Boston, MA  02110-1301, USA.
-// * ----------------------------------------------------------------------------
-// * Este arquivo é parte do Framework Demoiselle.
-// * 
-// * O Framework Demoiselle é um software livre; você pode redistribuí-lo e/ou
-// * modificá-lo dentro dos termos da GNU LGPL versão 3 como publicada pela Fundação
-// * do Software Livre (FSF).
-// * 
-// * Este programa é distribuído na esperança que possa ser útil, mas SEM NENHUMA
-// * GARANTIA; sem uma garantia implícita de ADEQUAÇÃO a qualquer MERCADO ou
-// * APLICAÇÃO EM PARTICULAR. Veja a Licença Pública Geral GNU/LGPL em português
-// * para maiores detalhes.
-// * 
-// * Você deve ter recebido uma cópia da GNU LGPL versão 3, sob o título
-// * "LICENCA.txt", junto com esse programa. Se não, acesse <http://www.gnu.org/licenses/>
-// * ou escreva para a Fundação do Software Livre (FSF) Inc.,
-// * 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA.
-// */
-//package br.gov.frameworkdemoiselle.internal.proxy;
-//
-//import org.junit.runner.RunWith;
-//import org.powermock.modules.junit4.PowerMockRunner;
-//
-//@RunWith(PowerMockRunner.class)
-//public class HttpServletRequestProxyTest {
-//
-//}
@@ -1,113 +0,0 @@
-///*
-// * Demoiselle Framework
-// * Copyright (C) 2010 SERPRO
-// * ----------------------------------------------------------------------------
-// * This file is part of Demoiselle Framework.
-// * 
-// * Demoiselle Framework is free software; you can redistribute it and/or
-// * modify it under the terms of the GNU Lesser General Public License version 3
-// * as published by the Free Software Foundation.
-// * 
-// * This program is distributed in the hope that it will be useful,
-// * but WITHOUT ANY WARRANTY; without even the implied warranty of
-// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// * GNU General Public License for more details.
-// * 
-// * You should have received a copy of the GNU Lesser General Public License version 3
-// * along with this program; if not,  see <http://www.gnu.org/licenses/>
-// * or write to the Free Software Foundation, Inc., 51 Franklin Street,
-// * Fifth Floor, Boston, MA  02110-1301, USA.
-// * ----------------------------------------------------------------------------
-// * Este arquivo é parte do Framework Demoiselle.
-// * 
-// * O Framework Demoiselle é um software livre; você pode redistribuí-lo e/ou
-// * modificá-lo dentro dos termos da GNU LGPL versão 3 como publicada pela Fundação
-// * do Software Livre (FSF).
-// * 
-// * Este programa é distribuído na esperança que possa ser útil, mas SEM NENHUMA
-// * GARANTIA; sem uma garantia implícita de ADEQUAÇÃO a qualquer MERCADO ou
-// * APLICAÇÃO EM PARTICULAR. Veja a Licença Pública Geral GNU/LGPL em português
-// * para maiores detalhes.
-// * 
-// * Você deve ter recebido uma cópia da GNU LGPL versão 3, sob o título
-// * "LICENCA.txt", junto com esse programa. Se não, acesse <http://www.gnu.org/licenses/>
-// * ou escreva para a Fundação do Software Livre (FSF) Inc.,
-// * 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA.
-// */
-//package br.gov.frameworkdemoiselle.util;
-//
-//import static org.easymock.EasyMock.expect;
-//import static org.powermock.api.easymock.PowerMock.createMock;
-//import static org.powermock.api.easymock.PowerMock.mockStatic;
-//import static org.powermock.api.easymock.PowerMock.replay;
-//import static org.powermock.api.easymock.PowerMock.verifyAll;
-//
-//import java.io.IOException;
-//
-//import javax.servlet.FilterChain;
-//import javax.servlet.FilterConfig;
-//import javax.servlet.ServletException;
-//import javax.servlet.http.HttpServletRequest;
-//import javax.servlet.http.HttpServletResponse;
-//
-//import org.junit.Ignore;
-//import org.junit.Test;
-//import org.junit.runner.RunWith;
-//import org.powermock.api.easymock.PowerMock;
-//import org.powermock.core.classloader.annotations.PrepareForTest;
-//import org.powermock.modules.junit4.PowerMockRunner;
-//
-//import br.gov.frameworkdemoiselle.internal.producer.HttpServletRequestProducer;
-//import br.gov.frameworkdemoiselle.internal.producer.HttpServletResponseProducer;
-//
-//@RunWith(PowerMockRunner.class)
-//@PrepareForTest(Beans.class)
-//public class ServletFilterTest {
-//
-//	private ServletFilter filter;
-//
-//	@Test
-//	public void testInit() throws ServletException {
-//		FilterConfig config = createMock(FilterConfig.class);
-//		replay(config);
-//
-//		filter = new ServletFilter();
-//		filter.init(config);
-//
-//		verifyAll();
-//	}
-//
-//	@Test
-//	public void testDoFilter() throws IOException, ServletException {
-//		HttpServletRequest request = createMock(HttpServletRequest.class);
-//		HttpServletResponse response = createMock(HttpServletResponse.class);
-//
-//		FilterChain chain = createMock(FilterChain.class);
-//		HttpServletRequestProducer requestProducer = createMock(HttpServletRequestProducer.class);
-//		HttpServletResponseProducer responseProducer = createMock(HttpServletResponseProducer.class);
-//
-//		mockStatic(Beans.class);
-//		expect(Beans.getReference(HttpServletRequestProducer.class)).andReturn(requestProducer);
-//		expect(Beans.getReference(HttpServletResponseProducer.class)).andReturn(responseProducer);
-//		requestProducer.setDelegate(request);
-//		PowerMock.expectLastCall().times(1);
-//		responseProducer.setDelegate(response);
-//		PowerMock.expectLastCall().times(1);
-//		chain.doFilter(request, response);
-//		PowerMock.expectLastCall().times(1);
-//
-//		replay(Beans.class, request, response, chain, requestProducer, responseProducer);
-//
-//		filter = new ServletFilter();
-//		filter.doFilter(request, response, chain);
-//
-//		verifyAll();
-//	}
-//
-//	@Test
-//	public void testDestroy() {
-//		filter = new ServletFilter();
-//		filter.destroy();
-//		verifyAll();
-//	}
-//}
@@ -1,100 +0,0 @@
-///*
-// * Demoiselle Framework
-// * Copyright (C) 2010 SERPRO
-// * ----------------------------------------------------------------------------
-// * This file is part of Demoiselle Framework.
-// * 
-// * Demoiselle Framework is free software; you can redistribute it and/or
-// * modify it under the terms of the GNU Lesser General Public License version 3
-// * as published by the Free Software Foundation.
-// * 
-// * This program is distributed in the hope that it will be useful,
-// * but WITHOUT ANY WARRANTY; without even the implied warranty of
-// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// * GNU General Public License for more details.
-// * 
-// * You should have received a copy of the GNU Lesser General Public License version 3
-// * along with this program; if not,  see <http://www.gnu.org/licenses/>
-// * or write to the Free Software Foundation, Inc., 51 Franklin Street,
-// * Fifth Floor, Boston, MA  02110-1301, USA.
-// * ----------------------------------------------------------------------------
-// * Este arquivo é parte do Framework Demoiselle.
-// * 
-// * O Framework Demoiselle é um software livre; você pode redistribuí-lo e/ou
-// * modificá-lo dentro dos termos da GNU LGPL versão 3 como publicada pela Fundação
-// * do Software Livre (FSF).
-// * 
-// * Este programa é distribuído na esperança que possa ser útil, mas SEM NENHUMA
-// * GARANTIA; sem uma garantia implícita de ADEQUAÇÃO a qualquer MERCADO ou
-// * APLICAÇÃO EM PARTICULAR. Veja a Licença Pública Geral GNU/LGPL em português
-// * para maiores detalhes.
-// * 
-// * Você deve ter recebido uma cópia da GNU LGPL versão 3, sob o título
-// * "LICENCA.txt", junto com esse programa. Se não, acesse <http://www.gnu.org/licenses/>
-// * ou escreva para a Fundação do Software Livre (FSF) Inc.,
-// * 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA.
-// */
-//package br.gov.frameworkdemoiselle.util;
-//
-//import static org.easymock.EasyMock.createMock;
-//import static org.easymock.EasyMock.expect;
-//import static org.powermock.api.easymock.PowerMock.mockStatic;
-//import static org.powermock.api.easymock.PowerMock.replayAll;
-//import static org.powermock.api.easymock.PowerMock.verifyAll;
-//
-//import javax.enterprise.inject.spi.BeanManager;
-//import javax.servlet.ServletContextEvent;
-//
-//import org.easymock.EasyMock;
-//import org.junit.Test;
-//import org.junit.runner.RunWith;
-//import org.powermock.api.easymock.PowerMock;
-//import org.powermock.core.classloader.annotations.PrepareForTest;
-//import org.powermock.modules.junit4.PowerMockRunner;
-//
-//import br.gov.frameworkdemoiselle.internal.bootstrap.ShutdownBootstrap;
-//import br.gov.frameworkdemoiselle.lifecycle.AfterStartupProccess;
-//
-//@RunWith(PowerMockRunner.class)
-//@PrepareForTest(Beans.class)
-//public class ServletListenerTest {
-//
-//	private ServletListener listener;
-//
-//	@Test
-//	public void testContextInitialized() {
-//		ServletContextEvent event = createMock(ServletContextEvent.class);
-//		BeanManager beanManager = PowerMock.createMock(BeanManager.class);
-//
-//		mockStatic(Beans.class);
-//		expect(Beans.getBeanManager()).andReturn(beanManager);
-//		beanManager.fireEvent(EasyMock.anyObject(AfterStartupProccess.class));
-//		PowerMock.expectLastCall().times(1);
-//
-//		replayAll();
-//
-//		listener = new ServletListener();
-//		listener.contextInitialized(event);
-//
-//		verifyAll();
-//	}
-//
-//	@Test
-//	public void testContextDestroyed() {
-//		ServletContextEvent event = createMock(ServletContextEvent.class);
-//		BeanManager beanManager = PowerMock.createMock(BeanManager.class);
-//
-//		mockStatic(Beans.class);
-//		expect(Beans.getBeanManager()).andReturn(beanManager);
-//		beanManager.fireEvent(EasyMock.anyObject(ShutdownBootstrap.class));
-//		PowerMock.expectLastCall().times(1);
-//
-//		replayAll();
-//
-//		listener = new ServletListener();
-//		listener.contextDestroyed(event);
-//
-//		verifyAll();
-//	}
-//
-//}
@@ -0,0 +1,99 @@
+/*
+ * Demoiselle Framework
+ * Copyright (C) 2010 SERPRO
+ * ----------------------------------------------------------------------------
+ * This file is part of Demoiselle Framework.
+ * 
+ * Demoiselle Framework is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License version 3
+ * as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License version 3
+ * along with this program; if not,  see <http://www.gnu.org/licenses/>
+ * or write to the Free Software Foundation, Inc., 51 Franklin Street,
+ * Fifth Floor, Boston, MA  02110-1301, USA.
+ * ----------------------------------------------------------------------------
+ * Este arquivo é parte do Framework Demoiselle.
+ * 
+ * O Framework Demoiselle é um software livre; você pode redistribuí-lo e/ou
+ * modificá-lo dentro dos termos da GNU LGPL versão 3 como publicada pela Fundação
+ * do Software Livre (FSF).
+ * 
+ * Este programa é distribuído na esperança que possa ser útil, mas SEM NENHUMA
+ * GARANTIA; sem uma garantia implícita de ADEQUAÇÃO a qualquer MERCADO ou
+ * APLICAÇÃO EM PARTICULAR. Veja a Licença Pública Geral GNU/LGPL em português
+ * para maiores detalhes.
+ * 
+ * Você deve ter recebido uma cópia da GNU LGPL versão 3, sob o título
+ * "LICENCA.txt", junto com esse programa. Se não, acesse <http://www.gnu.org/licenses/>
+ * ou escreva para a Fundação do Software Livre (FSF) Inc.,
+ * 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA.
+ */
+package test;
+
+import java.io.File;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.FileAsset;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.jboss.shrinkwrap.resolver.api.maven.Maven;
+import org.junit.Ignore;
+
+import br.gov.frameworkdemoiselle.internal.implementation.BasicAuthenticationFilter;
+import br.gov.frameworkdemoiselle.internal.implementation.HttpServletRequestProducerFilter;
+import br.gov.frameworkdemoiselle.internal.implementation.HttpServletResponseProducerFilter;
+import br.gov.frameworkdemoiselle.internal.implementation.InternalProcessorFilterImpl;
+import br.gov.frameworkdemoiselle.internal.producer.HttpServletRequestProducer;
+import br.gov.frameworkdemoiselle.internal.producer.HttpServletResponseProducer;
+import br.gov.frameworkdemoiselle.internal.producer.HttpSessionProducer;
+import br.gov.frameworkdemoiselle.internal.producer.ServletLocaleProducer;
+import br.gov.frameworkdemoiselle.security.Credentials;
+import br.gov.frameworkdemoiselle.security.ServletAuthenticator;
+import br.gov.frameworkdemoiselle.security.ServletAuthorizer;
+import br.gov.frameworkdemoiselle.util.ServletFilter;
+import br.gov.frameworkdemoiselle.util.ServletListener;
+
+@Ignore
+public final class Tests {
+
+	private Tests() {
+	}
+
+	public static WebArchive createDeployment(final Class<?> baseClass) {
+		return createDeployment().addPackages(true, baseClass.getPackage()).addClass(Tests.class);
+	}
+
+	public static WebArchive createDeployment() {
+		File[] libs = Maven.resolver().offline().loadPomFromFile("pom.xml", "arquillian-test")
+				.importCompileAndRuntimeDependencies().resolve().withTransitivity().asFile();
+
+		return ShrinkWrap
+				.create(WebArchive.class)
+				.addClass(Credentials.class)
+				.addClass(ServletAuthenticator.class)
+				.addClass(ServletAuthorizer.class)
+				.addClass(ServletFilter.class)
+				.addClass(ServletListener.class)
+				.addClass(HttpServletRequestProducer.class)
+				.addClass(HttpServletResponseProducer.class)
+				.addClass(HttpSessionProducer.class)
+				.addClass(ServletLocaleProducer.class)
+				.addClass(BasicAuthenticationFilter.class)
+				.addClass(HttpServletRequestProducerFilter.class)
+				.addClass(HttpServletResponseProducerFilter.class)
+				.addClass(InternalProcessorFilterImpl.class)
+				.addAsResource(createFileAsset("src/main/resources/demoiselle-servlet-bundle.properties"),
+						"demoiselle-servlet-bundle.properties")
+				.addAsWebInfResource(createFileAsset("src/test/resources/test/beans.xml"), "beans.xml")
+				.addAsLibraries(libs);
+	}
+
+	public static FileAsset createFileAsset(final String pathname) {
+		return new FileAsset(new File(pathname));
+	}
+}
@@ -0,0 +1,35 @@
+package xxxx;
+
+import java.io.IOException;
+
+import javax.inject.Inject;
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import br.gov.frameworkdemoiselle.security.Credentials;
+import br.gov.frameworkdemoiselle.security.SecurityContext;
+
+@WebServlet("/login")
+public class XServlet extends HttpServlet {
+
+	private static final long serialVersionUID = 1L;
+
+	@Inject
+	private SecurityContext securityContext;
+
+	@Inject
+	private Credentials credentials;
+
+	@Override
+	protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+		super.doGet(request, response);
+
+		credentials.setUsername("admin");
+		credentials.setPassword("changeit");
+
+		securityContext.login();
+	}
+}
@@ -0,0 +1,45 @@
+package xxxx;
+
+import java.net.URL;
+
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.drone.api.annotation.Drone;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import test.Tests;
+
+import com.thoughtworks.selenium.DefaultSelenium;
+
+@RunWith(Arquillian.class)
+public class XTest {
+
+	private static final String PATH = "src/test/resources/xxx";
+
+	@Drone
+	private DefaultSelenium browser;
+
+	@ArquillianResource
+	private URL deploymentUrl;
+
+	@Deployment(testable = false)
+	public static WebArchive createDeployment() {
+		return Tests.createDeployment().addAsWebInfResource(Tests.createFileAsset(PATH + "/web.xml"), "web.xml");
+	}
+
+	@Test
+	public void xxxx() {
+		browser.open(deploymentUrl + "login");
+
+		// browser.type("id=xxx-input", "demo");
+		// browser.waitForPageToLoad("15000");
+
+		// assertTrue("User should be logged in!",
+		// browser.isElementPresent("xpath=//li[contains(text(), 'Welcome')]"));
+		// assertTrue("Username should be shown!",
+		// browser.isElementPresent("xpath=//p[contains(text(), 'You are signed in as demo.')]"));
+	}
+}
@@ -0,0 +1,68 @@
+<!--
+ 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.
+-->
+<arquillian xmlns="http://jboss.org/schema/arquillian" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://jboss.org/schema/arquillian http://jboss.org/schema/arquillian/arquillian_1_0.xsd">
+
+	<!--
+	-->
+	<engine>
+		<property name="deploymentExportPath">target/deployments</property>
+	</engine>
+
+	<!--
+	<extension qualifier="selenium">
+		<property name="browser">*googlechrome</property>
+	</extension>
+	-->
+
+	<!--
+	<container qualifier="glassfish" default="true">
+		<configuration>
+			<property name="autoDelete">true</property>
+		</configuration>
+	</container>
+	-->
+
+	<!--
+	<container qualifier="jbossas-managed" default="true">
+		<protocol type="Servlet 3.0" />
+		<configuration>
+			<property name="jbossHome">target/jboss-as-${jboss.as.version}</property>
+		</configuration>
+	</container>
+	-->
+</arquillian>
@@ -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.
+-->
+<beans xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
+
+	<interceptors>
+		<class>br.gov.frameworkdemoiselle.transaction.TransactionalInterceptor</class>
+		<class>br.gov.frameworkdemoiselle.security.RequiredPermissionInterceptor</class>
+		<class>br.gov.frameworkdemoiselle.security.RequiredRoleInterceptor</class>
+		<class>br.gov.frameworkdemoiselle.exception.ExceptionHandlerInterceptor</class>
+	</interceptors>
+
+</beans>
@@ -0,0 +1,52 @@
+<!--
+ 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.
+-->
+<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+	xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" version="3.0">
+
+	<listener>
+		<listener-class>br.gov.frameworkdemoiselle.util.ServletListener</listener-class>
+	</listener>
+	<filter>
+		<filter-name>Demoiselle Servlet Filter</filter-name>
+		<filter-class>br.gov.frameworkdemoiselle.util.ServletFilter</filter-class>
+	</filter>
+	<filter-mapping>
+		<filter-name>Demoiselle Servlet Filter</filter-name>
+		<url-pattern>/*</url-pattern>
+	</filter-mapping>
+
+</web-app>
 \ No newline at end of file
@@ -191,7 +191,7 @@
 			<id>arquillian-weld-se-embedded</id>
 			<activation>
 				<file>
-					<exists>.arquillian-weld-se-embedded</exists>
+					<exists>src/test/resources/.weldse.profile</exists>
 				</file>
 			</activation>
 			<dependencies>
@@ -209,7 +209,12 @@
 		<profile>
 			<id>arquillian-glassfish-embedded</id>
 			<activation>
+				<file>
+					<exists>src/test/resources/.glassfish.profile</exists>
+				</file>
+				<!--
 				<activeByDefault>true</activeByDefault>
+				-->
 			</activation>
 			<dependencies>
 				<dependency>
@@ -230,7 +235,7 @@
 			<id>arquillian-jbossas7-managed</id>
 			<activation>
 				<file>
-					<exists>.arquillian-jbossas7-managed</exists>
+					<exists>src/test/resources/.jbossas7.profile</exists>
 				</file>
 			</activation>
 			<build>
@@ -312,6 +317,58 @@
 				</dependency>
 			</dependencies>
 		</profile>
+		<profile>
+			<id>arquillian-drone</id>
+			<activation>
+				<file>
+					<exists>src/test/resources/.drone.profile</exists>
+				</file>
+			</activation>
+			<dependencyManagement>
+				<dependencies>
+					<dependency>
+						<groupId>org.jboss.arquillian.extension</groupId>
+						<artifactId>arquillian-drone-bom</artifactId>
+						<version>${arquillian.bom.version}</version>
+						<type>pom</type>
+						<scope>import</scope>
+					</dependency>
+				</dependencies>
+			</dependencyManagement>
+			<dependencies>
+				<dependency>
+					<groupId>org.jboss.arquillian.extension</groupId>
+					<artifactId>arquillian-drone-impl</artifactId>
+					<scope>test</scope>
+				</dependency>
+				<dependency>
+					<groupId>org.jboss.arquillian.extension</groupId>
+					<artifactId>arquillian-drone-selenium</artifactId>
+					<scope>test</scope>
+				</dependency>
+				<dependency>
+					<groupId>org.jboss.arquillian.extension</groupId>
+					<artifactId>arquillian-drone-selenium-server</artifactId>
+					<scope>test</scope>
+				</dependency>
+				<dependency>
+					<groupId>org.seleniumhq.selenium</groupId>
+					<artifactId>selenium-java</artifactId>
+					<scope>test</scope>
+				</dependency>
+				<dependency>
+					<groupId>org.seleniumhq.selenium</groupId>
+					<artifactId>selenium-server</artifactId>
+					<scope>test</scope>
+					<exclusions>
+						<exclusion>
+							<groupId>org.mortbay.jetty</groupId>
+							<artifactId>servlet-api-2.5</artifactId>
+						</exclusion>
+					</exclusions>
+				</dependency>
+			</dependencies>
+		</profile>
 	</profiles>
 	<properties>
@@ -56,6 +56,16 @@
 	</description>
 	<url>http://www.frameworkdemoiselle.gov.br</url>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-eclipse-plugin</artifactId>
+				<version>2.9</version>
+			</plugin>
+		</plugins>
+	</build>
+
 	<licenses>
 		<license>
 			<name>GNU Lesser General Public License, Version 3</name>
@@ -94,6 +94,11 @@
 					<skip>true</skip>
 				</configuration>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-eclipse-plugin</artifactId>
+				<version>2.9</version>
+			</plugin>
 		</plugins>
 	</build>
	@@ -67,7 +67,7 @@ public final class Tests {		@@ -67,7 +67,7 @@ public final class Tests {
67		67
68	private static WebArchive createDeployment() {	68	private static WebArchive createDeployment() {
69	File[] libs = Maven.resolver().offline().loadPomFromFile("pom.xml", "arquillian-test")	69	File[] libs = Maven.resolver().offline().loadPomFromFile("pom.xml", "arquillian-test")
70	- .importCompileAndRuntimeDependencies().importTestDependencies().resolve().withTransitivity().asFile();	70	+ .importCompileAndRuntimeDependencies().resolve().withTransitivity().asFile();
71		71
72	return ShrinkWrap	72	return ShrinkWrap
73	.create(WebArchive.class)	73	.create(WebArchive.class)
@@ -0,0 +1,29 @@		@@ -0,0 +1,29 @@
	1	+package producer;
	2	+
	3	+import javax.persistence.Entity;
	4	+import javax.persistence.Id;
	5	+
	6	+@Entity
	7	+public class MyEntity {
	8	+
	9	+ @Id
	10	+ private String id;
	11	+
	12	+ private String description;
	13	+
	14	+ public String getId() {
	15	+ return id;
	16	+ }
	17	+
	18	+ public void setId(String id) {
	19	+ this.id = id;
	20	+ }
	21	+
	22	+ public String getDescription() {
	23	+ return description;
	24	+ }
	25	+
	26	+ public void setDescription(String description) {
	27	+ this.description = description;
	28	+ }
	29	+}
@@ -0,0 +1,79 @@		@@ -0,0 +1,79 @@
	1	+package producer;
	2	+
	3	+import static org.junit.Assert.assertEquals;
	4	+import static org.junit.Assert.assertNotNull;
	5	+import static org.junit.Assert.assertTrue;
	6	+
	7	+import javax.persistence.EntityManager;
	8	+
	9	+import org.jboss.arquillian.container.test.api.Deployment;
	10	+import org.jboss.arquillian.junit.Arquillian;
	11	+import org.jboss.shrinkwrap.api.spec.WebArchive;
	12	+import org.junit.Test;
	13	+import org.junit.runner.RunWith;
	14	+
	15	+import test.Tests;
	16	+import br.gov.frameworkdemoiselle.internal.proxy.EntityManagerProxy;
	17	+import br.gov.frameworkdemoiselle.util.Beans;
	18	+import br.gov.frameworkdemoiselle.util.NameQualifier;
	19	+
	20	+@RunWith(Arquillian.class)
	21	+public class ProducerTest {
	22	+
	23	+ private static final String PATH = "src/test/resources/producer";
	24	+
	25	+ @Deployment
	26	+ public static WebArchive createDeployment() {
	27	+ WebArchive deployment = Tests.createDeployment(ProducerTest.class);
	28	+ deployment.addAsResource(Tests.createFileAsset(PATH + "/persistence.xml"), "META-INF/persistence.xml");
	29	+ deployment.addAsResource(Tests.createFileAsset(PATH + "/demoiselle.properties"), "demoiselle.properties");
	30	+
	31	+ return deployment;
	32	+ }
	33	+
	34	+ @Test
	35	+ public void produceEntityManager() {
	36	+ EntityManager manager = Beans.getReference(EntityManager.class);
	37	+
	38	+ assertNotNull(manager);
	39	+ assertEquals(EntityManagerProxy.class, manager.getClass());
	40	+ }
	41	+
	42	+ @Test
	43	+ public void produceMultipleEntityManagers() {
	44	+ EntityManager m1 = Beans.getReference(EntityManager.class, new NameQualifier("pu"));
	45	+
	46	+ assertNotNull(m1);
	47	+ assertEquals(EntityManagerProxy.class, m1.getClass());
	48	+
	49	+ EntityManager m2 = Beans.getReference(EntityManager.class, new NameQualifier("pu2"));
	50	+
	51	+ assertNotNull(m2);
	52	+ assertEquals(EntityManagerProxy.class, m2.getClass());
	53	+ }
	54	+
	55	+ @Test
	56	+ public void produceOneEntityManagerPerRequest() {
	57	+ EntityManager m1 = Beans.getReference(EntityManager.class, new NameQualifier("pu"));
	58	+
	59	+ assertNotNull(m1);
	60	+ assertEquals(EntityManagerProxy.class, m1.getClass());
	61	+
	62	+ EntityManager m2 = Beans.getReference(EntityManager.class, new NameQualifier("pu"));
	63	+
	64	+ assertNotNull(m2);
	65	+ assertEquals(EntityManagerProxy.class, m2.getClass());
	66	+
	67	+ MyEntity entity = new MyEntity();
	68	+ entity.setId(createId("testID"));
	69	+
	70	+ m1.persist(entity);
	71	+
	72	+ assertTrue(m2.contains(entity));
	73	+ }
	74	+
	75	+ private String createId(String id) {
	76	+ return this.getClass().getName() + "_" + id;
	77	+ }
	78	+
	79	+}
	@@ -0,0 +1,76 @@		@@ -0,0 +1,76 @@
		1	+<!--
		2	+ Demoiselle Framework
		3	+ Copyright (C) 2010 SERPRO
		4	+ ============================================================================
		5	+ This file is part of Demoiselle Framework.
		6	+
		7	+ Demoiselle Framework is free software; you can redistribute it and/or
		8	+ modify it under the terms of the GNU Lesser General Public License version 3
		9	+ as published by the Free Software Foundation.
		10	+
		11	+ This program is distributed in the hope that it will be useful,
		12	+ but WITHOUT ANY WARRANTY; without even the implied warranty of
		13	+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		14	+ GNU General Public License for more details.
		15	+
		16	+ You should have received a copy of the GNU Lesser General Public License version 3
		17	+ along with this program; if not, see <http://www.gnu.org/licenses/>
		18	+ or write to the Free Software Foundation, Inc., 51 Franklin Street,
		19	+ Fifth Floor, Boston, MA 02110-1301, USA.
		20	+ ============================================================================
		21	+ Este arquivo é parte do Framework Demoiselle.
		22	+
		23	+ O Framework Demoiselle é um software livre; você pode redistribuí-lo e/ou
		24	+ modificá-lo dentro dos termos da GNU LGPL versão 3 como publicada pela Fundação
		25	+ do Software Livre (FSF).
		26	+
		27	+ Este programa é distribuído na esperança que possa ser útil, mas SEM NENHUMA
		28	+ GARANTIA; sem uma garantia implícita de ADEQUAÇÃO a qualquer MERCADO ou
		29	+ APLICAÇÃO EM PARTICULAR. Veja a Licença Pública Geral GNU/LGPL em português
		30	+ para maiores detalhes.
		31	+
		32	+ Você deve ter recebido uma cópia da GNU LGPL versão 3, sob o título
		33	+ "LICENCA.txt", junto com esse programa. Se não, acesse <http://www.gnu.org/licenses/>
		34	+ ou escreva para a Fundação do Software Livre (FSF) Inc.,
		35	+ 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA.
		36	+-->
		37	+<persistence version="2.0" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
		38	+ xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
		39	+
		40	+ <persistence-unit name="pu" transaction-type="RESOURCE_LOCAL">
		41	+ <non-jta-data-source>jdbc/__default</non-jta-data-source>
		42	+
		43	+ <class>producer.MyEntity</class>
		44	+
		45	+ <properties>
		46	+ <property name="eclipselink.ddl-generation" value="drop-and-create-tables" />
		47	+ <property name="eclipselink.logging.level.sql" value="FINE" />
		48	+ <property name="eclipselink.logging.parameters" value="true" />
		49	+
		50	+ <!--
		51	+ <property name="hibernate.show_sql" value="true" />
		52	+ <property name="hibernate.format_sql" value="false" />
		53	+ <property name="hibernate.hbm2ddl.auto" value="create-drop" />
		54	+ -->
		55	+ </properties>
		56	+ </persistence-unit>
		57	+
		58	+ <persistence-unit name="pu2" transaction-type="RESOURCE_LOCAL">
		59	+ <non-jta-data-source>jdbc/__default</non-jta-data-source>
		60	+
		61	+ <class>producer.MyEntity</class>
		62	+
		63	+ <properties>
		64	+ <property name="eclipselink.ddl-generation" value="drop-and-create-tables" />
		65	+ <property name="eclipselink.logging.level.sql" value="FINE" />
		66	+ <property name="eclipselink.logging.parameters" value="true" />
		67	+
		68	+ <!--
		69	+ <property name="hibernate.show_sql" value="true" />
		70	+ <property name="hibernate.format_sql" value="false" />
		71	+ <property name="hibernate.hbm2ddl.auto" value="create-drop" />
		72	+ -->
		73	+ </properties>
		74	+ </persistence-unit>
		75	+
		76	+</persistence>
0	\ No newline at end of file	77	\ No newline at end of file
1	-<beans xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2	- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/beans_1_0.xsd">	1	+<!--
		2	+ Demoiselle Framework
		3	+ Copyright (C) 2010 SERPRO
		4	+ ============================================================================
		5	+ This file is part of Demoiselle Framework.
		6	+
		7	+ Demoiselle Framework is free software; you can redistribute it and/or
		8	+ modify it under the terms of the GNU Lesser General Public License version 3
		9	+ as published by the Free Software Foundation.
		10	+
		11	+ This program is distributed in the hope that it will be useful,
		12	+ but WITHOUT ANY WARRANTY; without even the implied warranty of
		13	+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		14	+ GNU General Public License for more details.
		15	+
		16	+ You should have received a copy of the GNU Lesser General Public License version 3
		17	+ along with this program; if not, see <http://www.gnu.org/licenses />
		18	+ or write to the Free Software Foundation, Inc., 51 Franklin Street,
		19	+ Fifth Floor, Boston, MA 02110-1301, USA.
		20	+ ============================================================================
		21	+ Este arquivo é parte do Framework Demoiselle.
		22	+
		23	+ O Framework Demoiselle é um software livre; você pode redistribuí-lo e/ou
		24	+ modificá-lo dentro dos termos da GNU LGPL versão 3 como publicada pela Fundação
		25	+ do Software Livre (FSF).
		26	+
		27	+ Este programa é distribuído na esperança que possa ser útil, mas SEM NENHUMA
		28	+ GARANTIA; sem uma garantia implícita de ADEQUAÇÃO a qualquer MERCADO ou
		29	+ APLICAÇÃO EM PARTICULAR. Veja a Licença Pública Geral GNU/LGPL em português
		30	+ para maiores detalhes.
		31	+
		32	+ Você deve ter recebido uma cópia da GNU LGPL versão 3, sob o título
		33	+ "LICENCA.txt", junto com esse programa. Se não, acesse <http://www.gnu.org/licenses />
		34	+ ou escreva para a Fundação do Software Livre (FSF) Inc.,
		35	+ 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA.
		36	+-->
		37	+<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">
3		38
4	<interceptors>	39	<interceptors>
5	<class>br.gov.frameworkdemoiselle.transaction.TransactionalInterceptor</class>	40	<class>br.gov.frameworkdemoiselle.transaction.TransactionalInterceptor</class>
	@@ -71,7 +71,7 @@ public final class Tests {		@@ -71,7 +71,7 @@ public final class Tests {
71	.addClass(JTATransaction.class)	71	.addClass(JTATransaction.class)
72	.addAsResource(createFileAsset("src/main/resources/demoiselle-jta-bundle.properties") , "demoiselle-jta-bundle.properties" )	72	.addAsResource(createFileAsset("src/main/resources/demoiselle-jta-bundle.properties") , "demoiselle-jta-bundle.properties" )
73	.addAsResource(createFileAsset("src/test/resources/log/log4j.properties") , "log4j.properties" )	73	.addAsResource(createFileAsset("src/test/resources/log/log4j.properties") , "log4j.properties" )
74	- .addAsWebInfResource(createFileAsset("src/test/resources/beans.xml"), "beans.xml")	74	+ .addAsWebInfResource(createFileAsset("src/test/resources/test/beans.xml"), "beans.xml")
75	.addAsLibraries(libs);	75	.addAsLibraries(libs);
76	}	76	}
77		77
	@@ -77,11 +77,13 @@		@@ -77,11 +77,13 @@
77	<version>1.4</version>	77	<version>1.4</version>
78	</dependency>	78	</dependency>
79		79
		80	+ <!--
80	<dependency>	81	<dependency>
81	<groupId>javax.el</groupId>	82	<groupId>javax.el</groupId>
82	<artifactId>el-api</artifactId>	83	<artifactId>el-api</artifactId>
83	<scope>test</scope>	84	<scope>test</scope>
84	</dependency>	85	</dependency>
		86	+ -->
85	</dependencies>	87	</dependencies>
86		88
87	<repositories>	89	<repositories>
	@@ -108,4 +110,17 @@		@@ -108,4 +110,17 @@
108	</releases>	110	</releases>
109	</repository>	111	</repository>
110	</repositories>	112	</repositories>
		113	+
		114	+ <profiles>
		115	+ <profile>
		116	+ <id>arquillian-test</id>
		117	+ <dependencies>
		118	+ <dependency>
		119	+ <groupId>javax.servlet</groupId>
		120	+ <artifactId>javax.servlet-api</artifactId>
		121	+ <scope>provided</scope>
		122	+ </dependency>
		123	+ </dependencies>
		124	+ </profile>
		125	+ </profiles>
111	</project>	126	</project>
	@@ -1,82 +0,0 @@	@@ -1,82 +0,0 @@
1	-///*
2	-// * Demoiselle Framework
3	-// * Copyright (C) 2010 SERPRO
4	-// * ----------------------------------------------------------------------------
5	-// * This file is part of Demoiselle Framework.
6	-// *
7	-// * Demoiselle Framework is free software; you can redistribute it and/or
8	-// * modify it under the terms of the GNU Lesser General Public License version 3
9	-// * as published by the Free Software Foundation.
10	-// *
11	-// * This program is distributed in the hope that it will be useful,
12	-// * but WITHOUT ANY WARRANTY; without even the implied warranty of
13	-// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14	-// * GNU General Public License for more details.
15	-// *
16	-// * You should have received a copy of the GNU Lesser General Public License version 3
17	-// * along with this program; if not, see <http://www.gnu.org/licenses/>
18	-// * or write to the Free Software Foundation, Inc., 51 Franklin Street,
19	-// * Fifth Floor, Boston, MA 02110-1301, USA.
20	-// * ----------------------------------------------------------------------------
21	-// * Este arquivo é parte do Framework Demoiselle.
22	-// *
23	-// * O Framework Demoiselle é um software livre; você pode redistribuí-lo e/ou
24	-// * modificá-lo dentro dos termos da GNU LGPL versão 3 como publicada pela Fundação
25	-// * do Software Livre (FSF).
26	-// *
27	-// * Este programa é distribuído na esperança que possa ser útil, mas SEM NENHUMA
28	-// * GARANTIA; sem uma garantia implícita de ADEQUAÇÃO a qualquer MERCADO ou
29	-// * APLICAÇÃO EM PARTICULAR. Veja a Licença Pública Geral GNU/LGPL em português
30	-// * para maiores detalhes.
31	-// *
32	-// * Você deve ter recebido uma cópia da GNU LGPL versão 3, sob o título
33	-// * "LICENCA.txt", junto com esse programa. Se não, acesse <http://www.gnu.org/licenses/>
34	-// * ou escreva para a Fundação do Software Livre (FSF) Inc.,
35	-// * 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA.
36	-// */
37	-//package br.gov.frameworkdemoiselle.internal.producer;
38	-//
39	-//import static org.easymock.EasyMock.replay;
40	-//import static org.powermock.api.easymock.PowerMock.createMock;
41	-//import static org.powermock.api.easymock.PowerMock.verifyAll;
42	-//
43	-//import javax.servlet.http.HttpServletRequest;
44	-//
45	-//import junit.framework.Assert;
46	-//
47	-//import org.junit.Test;
48	-//import org.powermock.reflect.Whitebox;
49	-//
50	-//public class HttpServletRequestProducerTest {
51	-//
52	-// private HttpServletRequestProducer httpServletRequestProducer;
53	-//
54	-// private HttpServletRequest request;
55	-//
56	-// @Test
57	-// public void testCreate() {
58	-// request = createMock(HttpServletRequest.class);
59	-// replay(request);
60	-//
61	-// httpServletRequestProducer = new HttpServletRequestProducer();
62	-// Whitebox.setInternalState(httpServletRequestProducer, "request", request);
63	-//
64	-// Assert.assertEquals(httpServletRequestProducer.create(), request);
65	-//
66	-// verifyAll();
67	-// }
68	-//
69	-// @Test
70	-// public void testSetDelegate() {
71	-// request = createMock(HttpServletRequest.class);
72	-// replay(request);
73	-//
74	-// httpServletRequestProducer = new HttpServletRequestProducer();
75	-//
76	-// httpServletRequestProducer.setDelegate(request);
77	-// Assert.assertEquals(Whitebox.getInternalState(httpServletRequestProducer, "request"), request);
78	-//
79	-// verifyAll();
80	-// }
81	-//
82	-//}
	@@ -1,79 +0,0 @@	@@ -1,79 +0,0 @@
1	-///*
2	-// * Demoiselle Framework
3	-// * Copyright (C) 2010 SERPRO
4	-// * ----------------------------------------------------------------------------
5	-// * This file is part of Demoiselle Framework.
6	-// *
7	-// * Demoiselle Framework is free software; you can redistribute it and/or
8	-// * modify it under the terms of the GNU Lesser General Public License version 3
9	-// * as published by the Free Software Foundation.
10	-// *
11	-// * This program is distributed in the hope that it will be useful,
12	-// * but WITHOUT ANY WARRANTY; without even the implied warranty of
13	-// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14	-// * GNU General Public License for more details.
15	-// *
16	-// * You should have received a copy of the GNU Lesser General Public License version 3
17	-// * along with this program; if not, see <http://www.gnu.org/licenses/>
18	-// * or write to the Free Software Foundation, Inc., 51 Franklin Street,
19	-// * Fifth Floor, Boston, MA 02110-1301, USA.
20	-// * ----------------------------------------------------------------------------
21	-// * Este arquivo é parte do Framework Demoiselle.
22	-// *
23	-// * O Framework Demoiselle é um software livre; você pode redistribuí-lo e/ou
24	-// * modificá-lo dentro dos termos da GNU LGPL versão 3 como publicada pela Fundação
25	-// * do Software Livre (FSF).
26	-// *
27	-// * Este programa é distribuído na esperança que possa ser útil, mas SEM NENHUMA
28	-// * GARANTIA; sem uma garantia implícita de ADEQUAÇÃO a qualquer MERCADO ou
29	-// * APLICAÇÃO EM PARTICULAR. Veja a Licença Pública Geral GNU/LGPL em português
30	-// * para maiores detalhes.
31	-// *
32	-// * Você deve ter recebido uma cópia da GNU LGPL versão 3, sob o título
33	-// * "LICENCA.txt", junto com esse programa. Se não, acesse <http://www.gnu.org/licenses/>
34	-// * ou escreva para a Fundação do Software Livre (FSF) Inc.,
35	-// * 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA.
36	-// */
37	-//package br.gov.frameworkdemoiselle.internal.producer;
38	-//
39	-//import static org.easymock.EasyMock.createMock;
40	-//import static org.easymock.EasyMock.replay;
41	-//import static org.powermock.api.easymock.PowerMock.verifyAll;
42	-//
43	-//import javax.servlet.http.HttpServletRequest;
44	-//import javax.servlet.http.HttpSession;
45	-//
46	-//import junit.framework.Assert;
47	-//
48	-//import org.easymock.EasyMock;
49	-//import org.junit.Test;
50	-//
51	-//public class HttpSessionProducerTest {
52	-//
53	-// private HttpSessionProducer httpSessionProducer;
54	-//
55	-// private HttpServletRequest request;
56	-//
57	-// @Test
58	-// public void testCreateWithRequestNull() {
59	-// httpSessionProducer = new HttpSessionProducer();
60	-// Assert.assertNull(httpSessionProducer.create(null));
61	-//
62	-// verifyAll();
63	-// }
64	-//
65	-// @Test
66	-// public void testCreateWithRequest() {
67	-// request = createMock(HttpServletRequest.class);
68	-// HttpSession session = createMock(HttpSession.class);
69	-// EasyMock.expect(request.getSession()).andReturn(session);
70	-// replay(request, session);
71	-//
72	-// httpSessionProducer = new HttpSessionProducer();
73	-// Assert.assertNotNull(httpSessionProducer.create(request));
74	-//
75	-// verifyAll();
76	-//
77	-// }
78	-//
79	-//}
	@@ -1,84 +0,0 @@	@@ -1,84 +0,0 @@
1	-///*
2	-// * Demoiselle Framework
3	-// * Copyright (C) 2010 SERPRO
4	-// * ----------------------------------------------------------------------------
5	-// * This file is part of Demoiselle Framework.
6	-// *
7	-// * Demoiselle Framework is free software; you can redistribute it and/or
8	-// * modify it under the terms of the GNU Lesser General Public License version 3
9	-// * as published by the Free Software Foundation.
10	-// *
11	-// * This program is distributed in the hope that it will be useful,
12	-// * but WITHOUT ANY WARRANTY; without even the implied warranty of
13	-// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14	-// * GNU General Public License for more details.
15	-// *
16	-// * You should have received a copy of the GNU Lesser General Public License version 3
17	-// * along with this program; if not, see <http://www.gnu.org/licenses/>
18	-// * or write to the Free Software Foundation, Inc., 51 Franklin Street,
19	-// * Fifth Floor, Boston, MA 02110-1301, USA.
20	-// * ----------------------------------------------------------------------------
21	-// * Este arquivo é parte do Framework Demoiselle.
22	-// *
23	-// * O Framework Demoiselle é um software livre; você pode redistribuí-lo e/ou
24	-// * modificá-lo dentro dos termos da GNU LGPL versão 3 como publicada pela Fundação
25	-// * do Software Livre (FSF).
26	-// *
27	-// * Este programa é distribuído na esperança que possa ser útil, mas SEM NENHUMA
28	-// * GARANTIA; sem uma garantia implícita de ADEQUAÇÃO a qualquer MERCADO ou
29	-// * APLICAÇÃO EM PARTICULAR. Veja a Licença Pública Geral GNU/LGPL em português
30	-// * para maiores detalhes.
31	-// *
32	-// * Você deve ter recebido uma cópia da GNU LGPL versão 3, sob o título
33	-// * "LICENCA.txt", junto com esse programa. Se não, acesse <http://www.gnu.org/licenses/>
34	-// * ou escreva para a Fundação do Software Livre (FSF) Inc.,
35	-// * 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA.
36	-// */
37	-//package br.gov.frameworkdemoiselle.internal.producer;
38	-//
39	-//import static org.easymock.EasyMock.createMock;
40	-//import static org.easymock.EasyMock.expect;
41	-//import static org.powermock.api.easymock.PowerMock.mockStatic;
42	-//import static org.powermock.api.easymock.PowerMock.replay;
43	-//import static org.powermock.api.easymock.PowerMock.verifyAll;
44	-//
45	-//import javax.servlet.http.HttpServletRequest;
46	-//
47	-//import org.junit.Test;
48	-//import org.junit.runner.RunWith;
49	-//import org.powermock.core.classloader.annotations.PrepareForTest;
50	-//import org.powermock.modules.junit4.PowerMockRunner;
51	-//
52	-//import br.gov.frameworkdemoiselle.util.Beans;
53	-//
54	-//@RunWith(PowerMockRunner.class)
55	-//@PrepareForTest(Beans.class)
56	-//public class ServletLocaleProducerTest {
57	-//
58	-// private ServletLocaleProducer servletLocaleProducer;
59	-//
60	-// private HttpServletRequest request;
61	-//
62	-// @Test
63	-// public void testCreate() {
64	-// request = createMock(HttpServletRequest.class);
65	-//
66	-// mockStatic(Beans.class);
67	-// expect(Beans.getReference(HttpServletRequest.class)).andReturn(request);
68	-// replay(Beans.class);
69	-//
70	-// servletLocaleProducer = new ServletLocaleProducer();
71	-// servletLocaleProducer.create();
72	-//
73	-// verifyAll();
74	-// }
75	-//
76	-// @Test
77	-// public void testCreate2() {
78	-// servletLocaleProducer = new ServletLocaleProducer();
79	-// servletLocaleProducer.create();
80	-//
81	-// verifyAll();
82	-// }
83	-//
84	-//}