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

Conflicts: impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/context/ContextManager.java impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/context/CustomContext.java impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/context/ManagedContext.java impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/context/ThreadLocalContext.java

Merge remote-tracking branch 'origin/2.4.0' into 2.4.0
Conflicts: impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/context/ContextManager.java impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/context/CustomContext.java impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/context/ManagedContext.java impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/context/ThreadLocalContext.java
Dancovich
2 parents 5fa39fa1 8753c457
Showing 90 changed files with 1385 additions and 1007 deletions Show diff stats
documentation/reference/pt-BR/gerenciamento.xml
impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/bootstrap/ManagementBootstrap.java
impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/context/CustomContext.java
impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/context/ThreadLocalContext.java
impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/ConfigurationImpl.java
impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/ConfigurationLoader.java
impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/NotificationManagerImpl.java
impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/management/ManagedType.java
impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/management/Management.java
impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/management/ManagementNotificationEventImpl.java
impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/management/qualifier/AttributeChange.java
impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/management/qualifier/Generic.java
impl/core/src/main/java/br/gov/frameworkdemoiselle/lifecycle/ManagementExtension.java
impl/core/src/main/java/br/gov/frameworkdemoiselle/management/AttributeChangeNotification.java
impl/core/src/main/java/br/gov/frameworkdemoiselle/management/GenericNotification.java
impl/core/src/main/java/br/gov/frameworkdemoiselle/management/ManagedAttributeNotFoundException.java
impl/core/src/main/java/br/gov/frameworkdemoiselle/management/ManagedInvokationException.java
impl/core/src/main/java/br/gov/frameworkdemoiselle/management/ManagementNotificationEvent.java
impl/core/src/main/java/br/gov/frameworkdemoiselle/management/NotificationManager.java
impl/core/src/main/resources/demoiselle-core-bundle.properties
@@ -11,7 +11,7 @@
 		<para>Ao implantar um sistema para produção, muitas vezes é necessário monitorar aspectos sobre o funcionamento desse sistema. Quanta memória
 		ele está utilizando? Qual o pico de MIPS utilizados? Quantas sessões estão autenticadas no momento?</para>
-		<para>Além de monitorar um sistema, as vezes é necessário gerencia-lo alterando aspectos de seu comportamento. Se o sistema está implantado em um
+		<para>Além de monitorar um sistema, as vezes é necessário gerenciá-lo alterando aspectos de seu comportamento. Se o sistema está implantado em um
 		servidor alugado, talvez seja necessário ajustar o uso de MIPS para reduzir custos ou talvez deseje-se solicitar que o sistema limpe dados de sessão
 		de autenticação abandonados por usuários que desligaram suas estações sem efetuar "logoff".</para>
@@ -20,8 +20,9 @@
 		<emphasis>Java Management Extension</emphasis> (JMX).</para>
 		<para>O <emphasis>Demoiselle Framework</emphasis> dispõe de uma série de ferramentas para nivelar
-		o conhecimento do desenvolvedor e facilitar o uso e integraçao de várias tecnologias de gerenciamento e monitoração. Através de seu
-		uso o desenvolvedor pode se despreocupar com detalhes de implementação de cada tecnologia individual e facilmente integrar tais tecnologias.</para>
+		o conhecimento do desenvolvedor e facilitar o uso e integraçao de várias tecnologias de gerenciamento e 
+		monitoração. Através de seu uso o desenvolvedor pode facilmente integrar tais tecnologias, despreocupando-se 
+		com detalhes de implementação de cada uma delas.</para>
 	</section>
 	<section>
@@ -35,7 +36,7 @@
 @ManagementController
 public class GerenciadorUsuarios]]></programlisting>
-		<para>Essa anotação é suficiente para o mecanismo de gerenciamento descobrir sua classe e disponibiliza-la para ser monitorada e gerenciada.</para>
+		<para>Essa anotação é suficiente para o mecanismo de gerenciamento descobrir sua classe e disponibilizá-la para ser monitorada e gerenciada.</para>
 		<para>Contudo, a simples anotação acima não informa ao mecanismo quais aspectos da classe serão expostos. Por padrão, um <emphasis>Management Controller</emphasis>
 		não expõe nenhum aspecto seu. Para selecionar quais aspectos serão expostos usamos as anotações
@@ -43,7 +44,7 @@ public class GerenciadorUsuarios]]&gt;&lt;/programlisting&gt;
 		de classes anotadas com <code>@ManagementController</code>.</para>
 		<informaltable>
-			<tgroup cols="3">
+			<tgroup cols="3" rowsep="1" colsep="1">
 				<thead>
 					<row>
 						<entry>Anotação</entry>
@@ -53,7 +54,7 @@ public class GerenciadorUsuarios]]&gt;&lt;/programlisting&gt;
 				</thead>
 				<tbody>
-					<row>
+					<row valign="top">
 						<entry>
 							<emphasis role="BOLD">@ManagedProperty</emphasis>
 						</entry>
@@ -76,7 +77,7 @@ public class GerenciadorUsuarios]]&gt;&lt;/programlisting&gt;
 						</entry>
 					</row>
-					<row>
+					<row valign="top">
 						<entry>
 							<emphasis role="BOLD">@ManagedOperation</emphasis>
 						</entry>
@@ -98,7 +99,7 @@ public class GerenciadorUsuarios]]&gt;&lt;/programlisting&gt;
 						</entry>
 					</row>
-					<row>
+					<row valign="top">
 						<entry>
 							<emphasis role="BOLD">@OperationParameter</emphasis>
 						</entry>
@@ -148,6 +149,24 @@ public class ControleAcesso{
     monitorLogin.setContadorLogin( monitorLogin.getContadorLogin() + 1 );
   }
 }]]></programlisting>
+
+	<programlisting role="JAVA"><![CDATA[
+@ManagementController
+public class MonitorLogin{
+
+  @ManagedProperty
+  private int contadorLogin;
+
+  @ManagedOperation
+  public void setContadorLogin(int qtdUsuarioLogados){
+    contadorLogin = qtdUsuarioLogados;
+  }
+
+  @ManagedOperation
+  public int getContatorLogin(){
+    return contadorLogin;
+  }
+}]]></programlisting>
 		<para>Como é possível ver, classes anotadas com <emphasis>@ManagementController</emphasis> podem ser injetadas em qualquer ponto do código. Valores definidos
 		para seus atributos retêm seu estado, então um cliente que acesse remotamente o sistema e monitore o valor do atributo <emphasis>contadorLogin</emphasis> verá
@@ -181,7 +200,7 @@ public class ControleAcesso{
 			individualmente, as classes monitoradas serão então expostas para todas as extensões escolhidas.</para>
 		</tip>
-		<para>A figura <xref linkend="exemplo_jconsole"/> mostra como uma classe monitorada na aplicação <emphasis>Bookmark</emphasis> é exibida no <emphasis>JConsole</emphasis>.</para>
+		<para>A figura <xref linkend="exemplo_jconsole" /> mostra como uma classe monitorada na aplicação <emphasis>Bookmark</emphasis> é exibida no <emphasis>JConsole</emphasis>.</para>
 		<programlisting role="JAVA"><![CDATA[
 @ManagementController
+/*
+ * Demoiselle Framework
+ * Copyright (C) 2010 SERPRO
+ * ----------------------------------------------------------------------------
+ * This file is part of Demoiselle Framework.
+ * 
+ * Demoiselle Framework is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License version 3
+ * as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License version 3
+ * along with this program; if not,  see <http://www.gnu.org/licenses/>
+ * or write to the Free Software Foundation, Inc., 51 Franklin Street,
+ * Fifth Floor, Boston, MA  02110-1301, USA.
+ * ----------------------------------------------------------------------------
+ * Este arquivo é parte do Framework Demoiselle.
+ * 
+ * O Framework Demoiselle é um software livre; você pode redistribuí-lo e/ou
+ * modificá-lo dentro dos termos da GNU LGPL versão 3 como publicada pela Fundação
+ * do Software Livre (FSF).
+ * 
+ * Este programa é distribuído na esperança que possa ser útil, mas SEM NENHUMA
+ * GARANTIA; sem uma garantia implícita de ADEQUAÇÃO a qualquer MERCADO ou
+ * APLICAÇÃO EM PARTICULAR. Veja a Licença Pública Geral GNU/LGPL em português
+ * para maiores detalhes.
+ * 
+ * Você deve ter recebido uma cópia da GNU LGPL versão 3, sob o título
+ * "LICENCA.txt", junto com esse programa. Se não, acesse <http://www.gnu.org/licenses/>
+ * ou escreva para a Fundação do Software Livre (FSF) Inc.,
+ * 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA.
+ */
 package br.gov.frameworkdemoiselle.internal.bootstrap;
 import java.lang.reflect.Modifier;
@@ -0,0 +1,62 @@
+/*
+ * Demoiselle Framework
+ * Copyright (C) 2010 SERPRO
+ * ----------------------------------------------------------------------------
+ * This file is part of Demoiselle Framework.
+ * 
+ * Demoiselle Framework is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License version 3
+ * as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License version 3
+ * along with this program; if not,  see <http://www.gnu.org/licenses/>
+ * or write to the Free Software Foundation, Inc., 51 Franklin Street,
+ * Fifth Floor, Boston, MA  02110-1301, USA.
+ * ----------------------------------------------------------------------------
+ * Este arquivo é parte do Framework Demoiselle.
+ * 
+ * O Framework Demoiselle é um software livre; você pode redistribuí-lo e/ou
+ * modificá-lo dentro dos termos da GNU LGPL versão 3 como publicada pela Fundação
+ * do Software Livre (FSF).
+ * 
+ * Este programa é distribuído na esperança que possa ser útil, mas SEM NENHUMA
+ * GARANTIA; sem uma garantia implícita de ADEQUAÇÃO a qualquer MERCADO ou
+ * APLICAÇÃO EM PARTICULAR. Veja a Licença Pública Geral GNU/LGPL em português
+ * para maiores detalhes.
+ * 
+ * Você deve ter recebido uma cópia da GNU LGPL versão 3, sob o título
+ * "LICENCA.txt", junto com esse programa. Se não, acesse <http://www.gnu.org/licenses/>
+ * ou escreva para a Fundação do Software Livre (FSF) Inc.,
+ * 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA.
+ */
+package br.gov.frameworkdemoiselle.internal.context;
+
+import javax.enterprise.context.spi.Context;
+
+/**
+ * 
+ * Base interface for contexts managed by the framework.
+ * 
+ * @author serpro
+ *
+ */
+public interface CustomContext extends Context {
+
+	/**
+	 * Activates a custom context
+	 * 
+	 * @return <code>true</code> if context was activated, <code>false</code> if there was already another active
+	 * context for the same scope and the activation of this scope failed.
+	 */
+	boolean activate();
+	
+	/**
+	 * Deactivates this context, it will clear all beans stored on this context.
+	 */
+	void deactivate();
+}
@@ -0,0 +1,79 @@
+/*
+ * 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.
+ */
+/*
+ * Demoiselle Framework Copyright (c) 2010 Serpro and other contributors as indicated by the @author tag. See the
+ * copyright.txt in the distribution for a full listing of contributors. Demoiselle Framework is an open source Java EE
+ * library designed to accelerate the development of transactional database Web applications. Demoiselle Framework is
+ * released under the terms of the LGPL license 3 http://www.gnu.org/licenses/lgpl.html LGPL License 3 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 3 as published by the Free Software Foundation. Demoiselle Framework
+ * 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 Lesser General Public License for more details. You
+ * should have received a copy of the GNU Lesser General Public License along with Demoiselle Framework. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+package br.gov.frameworkdemoiselle.internal.context;
+
+import java.lang.annotation.Annotation;
+
+/**
+ * Base context that has a separated store for each thread
+ * 
+ * @author SERPRO
+ */
+public class ThreadLocalContext extends AbstractCustomContext {
+
+	private final ThreadLocal<Store> threadLocal = new ThreadLocal<Store>();
+
+	public ThreadLocalContext(final Class<? extends Annotation> scope) {
+		super(scope);
+	}
+	
+	@Override
+	protected boolean isStoreInitialized() {
+		return threadLocal.get()!=null;
+	}
+
+	@Override
+	protected Store getStore() {
+		if (this.threadLocal.get() == null) {
+			this.threadLocal.set(createStore());
+		}
+
+		return this.threadLocal.get();
+	}
+}
+/*
+ * Demoiselle Framework
+ * Copyright (C) 2010 SERPRO
+ * ----------------------------------------------------------------------------
+ * This file is part of Demoiselle Framework.
+ * 
+ * Demoiselle Framework is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License version 3
+ * as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License version 3
+ * along with this program; if not,  see <http://www.gnu.org/licenses/>
+ * or write to the Free Software Foundation, Inc., 51 Franklin Street,
+ * Fifth Floor, Boston, MA  02110-1301, USA.
+ * ----------------------------------------------------------------------------
+ * Este arquivo é parte do Framework Demoiselle.
+ * 
+ * O Framework Demoiselle é um software livre; você pode redistribuí-lo e/ou
+ * modificá-lo dentro dos termos da GNU LGPL versão 3 como publicada pela Fundação
+ * do Software Livre (FSF).
+ * 
+ * Este programa é distribuído na esperança que possa ser útil, mas SEM NENHUMA
+ * GARANTIA; sem uma garantia implícita de ADEQUAÇÃO a qualquer MERCADO ou
+ * APLICAÇÃO EM PARTICULAR. Veja a Licença Pública Geral GNU/LGPL em português
+ * para maiores detalhes.
+ * 
+ * Você deve ter recebido uma cópia da GNU LGPL versão 3, sob o título
+ * "LICENCA.txt", junto com esse programa. Se não, acesse <http://www.gnu.org/licenses/>
+ * ou escreva para a Fundação do Software Livre (FSF) Inc.,
+ * 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA.
+ */
 package br.gov.frameworkdemoiselle.internal.implementation;
 import java.io.Serializable;
@@ -193,8 +193,7 @@ public class ConfigurationLoader implements Serializable {
 		String prefix = this.object.getClass().getAnnotation(Configuration.class).prefix();
 		if (prefix.endsWith(".")) {
-			// prefix = prefix.substring(0, prefix.length() - 1);
-			// TODO Lançar warning pedindo para retirar o ponto (.)?
+			getLogger().warn(getBundle().getString("configuration-dot-after-prefix", this.resource));
 		} else if (!prefix.isEmpty()) {
 			prefix += ".";
 		}
@@ -243,8 +242,7 @@ public class ConfigurationLoader implements Serializable {
 		}
 		catch (Exception cause) {
-			// TODO Lançar mensagem informando que houve erro ao tentar extrair o valor com o extrator tal.
-			throw new ConfigurationException("", cause);
+			throw new ConfigurationException(getBundle().getString("configuration-generic-extraction-error", field.getType().toString(), getValueExtractor(field).getClass().getCanonicalName()), cause);
 		}
 		return value;
+/*
+ * Demoiselle Framework
+ * Copyright (C) 2010 SERPRO
+ * ----------------------------------------------------------------------------
+ * This file is part of Demoiselle Framework.
+ * 
+ * Demoiselle Framework is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License version 3
+ * as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License version 3
+ * along with this program; if not,  see <http://www.gnu.org/licenses/>
+ * or write to the Free Software Foundation, Inc., 51 Franklin Street,
+ * Fifth Floor, Boston, MA  02110-1301, USA.
+ * ----------------------------------------------------------------------------
+ * Este arquivo é parte do Framework Demoiselle.
+ * 
+ * O Framework Demoiselle é um software livre; você pode redistribuí-lo e/ou
+ * modificá-lo dentro dos termos da GNU LGPL versão 3 como publicada pela Fundação
+ * do Software Livre (FSF).
+ * 
+ * Este programa é distribuído na esperança que possa ser útil, mas SEM NENHUMA
+ * GARANTIA; sem uma garantia implícita de ADEQUAÇÃO a qualquer MERCADO ou
+ * APLICAÇÃO EM PARTICULAR. Veja a Licença Pública Geral GNU/LGPL em português
+ * para maiores detalhes.
+ * 
+ * Você deve ter recebido uma cópia da GNU LGPL versão 3, sob o título
+ * "LICENCA.txt", junto com esse programa. Se não, acesse <http://www.gnu.org/licenses/>
+ * ou escreva para a Fundação do Software Livre (FSF) Inc.,
+ * 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA.
+ */
 package br.gov.frameworkdemoiselle.internal.implementation;
 import java.io.Serializable;
@@ -60,7 +60,7 @@ import br.gov.frameworkdemoiselle.util.ResourceBundle;
  * <p>Instances if this class are passed to each discovered management extension during bootstrap so they can have
  * enough information to expose all discovered {@link ManagementController}'s to management clients.</p>
  * 
- * @author serpro
+ * @author SERPRO
  */
 public class ManagedType {
@@ -72,7 +72,7 @@ import br.gov.frameworkdemoiselle.util.ResourceBundle;
  * Central class used by management extensions to obtain information, access properties and call operations over
  * discovered {@link ManagementController} classes.
  * 
- * @author serpro
+ * @author SERPRO
  */
 @ApplicationScoped
 public class Management implements Serializable {
@@ -44,7 +44,7 @@ import br.gov.frameworkdemoiselle.management.NotificationManager;
  * Implementators can capture this event and be notified when the {@link NotificationManager}
  * sends notifications, so they can pass the notification to the underlying technology.
  * 
- * @author serpro
+ * @author SERPRO
  *
  */
 public class ManagementNotificationEventImpl implements br.gov.frameworkdemoiselle.management.ManagementNotificationEvent {
@@ -51,7 +51,7 @@ import br.gov.frameworkdemoiselle.management.ManagementNotificationEvent;
  * Enables {@link ManagementNotificationEvent} observers to trigger only with notifications
  * of the specialized type {@link AttributeChangeNotification}.
  * 
- * @author serpro
+ * @author SERPRO
  *
  */
 @Qualifier
@@ -51,7 +51,7 @@ import br.gov.frameworkdemoiselle.management.GenericNotification;
  * Enables {@link ManagementNotificationEvent} observers to trigger only with notifications
  * of the base type {@link GenericNotification}.
  * 
- * @author serpro
+ * @author SERPRO
  *
  */
 @Qualifier
@@ -54,7 +54,7 @@ import br.gov.frameworkdemoiselle.stereotype.ManagementController;
  * methods at the apropriate times.
  * </p>
  * 
- * @author serpro
+ * @author SERPRO
  */
 public interface ManagementExtension {
@@ -40,7 +40,7 @@ package br.gov.frameworkdemoiselle.management;
  * Special notification to denote an attribute has changed values.
  * 
  * @see GenericNotification
- * @author serpro
+ * @author SERPRO
  */
 public class AttributeChangeNotification extends GenericNotification {
@@ -39,7 +39,7 @@ package br.gov.frameworkdemoiselle.management;
 /**
  * Notification that can be sent by the {@link NotificationManager}.
  * 
- * @author serpro
+ * @author SERPRO
  */
 public class GenericNotification {
+/*
+ * 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.management;
 import br.gov.frameworkdemoiselle.DemoiselleException;
@@ -7,7 +43,7 @@ import br.gov.frameworkdemoiselle.DemoiselleException;
  * Thrown when a management client tries to read or write a property, but the
  * management engine has no knowledge of an attribute with the given name. 
  * 
- * @author serpro
+ * @author SERPRO
  *
  */
 public class ManagedAttributeNotFoundException extends DemoiselleException {
+/*
+ * 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.management;
 import br.gov.frameworkdemoiselle.DemoiselleException;
-
+/**
+ * 
+ * Thrown In case the operation doesn't exist or have a different signature
+ * 
+ * @author SERPRO
+ *
+ */
 public class ManagedInvokationException extends DemoiselleException {
 	private static final long serialVersionUID = -1542365184737242152L;
+/*
+ * 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.management;
 /**
@@ -5,7 +41,7 @@ package br.gov.frameworkdemoiselle.management;
  * Implementators can capture this event and be notified when the {@link NotificationManager}
  * sends notifications, so they can pass the notification to the underlying technology.
  * 
- * @author serpro
+ * @author SERPRO
  *
  */
 public interface ManagementNotificationEvent {
@@ -59,7 +59,7 @@ import br.gov.frameworkdemoiselle.util.Beans;
  * the implementator can use qualifiers like the {@link Generic} and {@link AttributeChange} qualifiers
  * to filter what king of notifications they will handle. One example of an implementator is the <b>demoiselle-jmx</b> extension.</p>
  * 
- * @author serpro
+ * @author SERPRO
  *
  */
 @ApplicationScoped
@@ -60,6 +60,8 @@ loading-configuration-class=Carregando a classe de configura\u00E7\u00E3o {0}
 configuration-field-loaded=Configura\u00E7\u00E3o {0} atribu\u00EDda a {1} com o valor {2}
 configuration-attribute-is-mandatory=A configura\u00E7\u00E3o {0} \u00E9 obrigat\u00F3ria, mas n\u00E3o foi encontrada em {1}
 configuration-name-attribute-cant-be-empty=A nota\u00E7\u00E3o Name n\u00E3o pode estar em branco
+configuration-generic-extraction-error=Ocorreu um erro durante a extra\u00E7\u00E3o do tipo {0} com o extrator {1}
+configuration-dot-after-prefix=N\u00E3o \u00E9 necess\u00E1rio adicionar o ponto ap\u00F3s o prefixo para uma classe de configura\u00E7\u00E3o. \u00C9 recomendado que sejam retirados, pois poder\u00E3o causar erros em vers\u00F5es futuras do  Framework.
 configuration-key-not-found=Chave de configura\u00E7\u00E3o {0} n\u00E3o encontrada
 configuration-extractor-not-found=N\u00E3o foi poss\u00EDvel encontrar a classe extratora para o atributo {0}. Implemente a interface {1} para criar sua classe extratora.
 configuration-not-conversion=N\u00E3o \u00E9 poss\u00EDvel converter o valor {0} para o tipo {1}
@@ -57,7 +57,7 @@ import br.gov.frameworkdemoiselle.util.Beans;
  * Test case that simulates a management extension and tests if properties and operations on a managed class can be
  * easily accessed and invoked.
  * 
- * @author serpro
+ * @author SERPRO
  */
 @RunWith(Arquillian.class)
 public class ManagementTest {
@@ -61,7 +61,7 @@ import br.gov.frameworkdemoiselle.util.ResourceBundle;
 /**
  * Test the {@link NotificationManager} with a dummy extension to check if notifications are correctly propagated
  * 
- * @author serpro
+ * @author SERPRO
  */
 @RunWith(Arquillian.class)
 public class NotificationTest {
@@ -44,7 +44,7 @@ import br.gov.frameworkdemoiselle.stereotype.ManagementController;
  * 
  * Used in tests to detect if the bootstrap detects wrong annotations
  * 
- * @author serpro
+ * @author SERPRO
  *
  */
 @ManagementController
@@ -48,7 +48,7 @@ import br.gov.frameworkdemoiselle.management.NotificationManager;
 /**
  * Dummy class to test receiving of notifications sent by the {@link NotificationManager} 
  * 
- * @author serpro
+ * @author SERPRO
  *
  */
 @ApplicationScoped
@@ -51,7 +51,7 @@ import br.gov.frameworkdemoiselle.util.Beans;
  * and can read/write properties and invoke operations on them, simulating a management
  * extension like JMX or SNMP. 
  * 
- * @author serpro
+ * @author SERPRO
  *
  */
 @ApplicationScoped
@@ -2,21 +2,20 @@ package management.testclasses;
 import br.gov.frameworkdemoiselle.util.Beans;
-
 public class RequestScopeBeanClient {
-	
-	public void operationOne(){
-		
+
+	public void operationOne() {
+
 		RequestScopedClass bean = Beans.getReference(RequestScopedClass.class);
-		bean.setInfo( bean.getInfo() + "-OPERATION ONE CALLED-");
-		
+		bean.setInfo(bean.getInfo() + "-OPERATION ONE CALLED-");
+
 	}
-	
-	public void operationTwo(){
-		
+
+	public void operationTwo() {
+
 		RequestScopedClass bean = Beans.getReference(RequestScopedClass.class);
-		bean.setInfo( bean.getInfo() + "-OPERATION TWO CALLED-");
-		
+		bean.setInfo(bean.getInfo() + "-OPERATION TWO CALLED-");
+
 	}
 }
@@ -4,19 +4,15 @@ import javax.enterprise.context.RequestScoped;
 @RequestScoped
 public class RequestScopedClass {
-	
+
 	private String info = "";
-	
 	public String getInfo() {
 		return info;
 	}
-	
 	public void setInfo(String info) {
 		this.info = info;
 	}
-	
-	
 }
@@ -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;
+	}
+
+}
@@ -1,29 +0,0 @@
-package productor;
-
-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;
-	}
-}
@@ -1,80 +0,0 @@
-package productor;
-
-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.Assert;
-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 ProductorTest {
-	
-	private static final String PATH = "src/test/resources/productor";
-	
-	@Deployment
-	public static WebArchive createDeployment() {
-		WebArchive deployment = Tests.createDeployment(ProductorTest.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);
-		Assert.assertNotNull(manager);
-		Assert.assertEquals(EntityManagerProxy.class,manager.getClass());
-		
-	}
-	
-	@Test
-	public void produceMultipleEntityManagers(){
-		
-		EntityManager m1 = Beans.getReference(EntityManager.class,new NameQualifier("pu"));
-		
-		Assert.assertNotNull(m1);
-		Assert.assertEquals(EntityManagerProxy.class,m1.getClass());
-		
-		EntityManager m2 = Beans.getReference(EntityManager.class,new NameQualifier("pu2"));
-		
-		Assert.assertNotNull(m2);
-		Assert.assertEquals(EntityManagerProxy.class,m2.getClass());
-		
-	}
-	
-	@Test
-	public void produceOneEntityManagerPerRequest(){
-		EntityManager m1 = Beans.getReference(EntityManager.class,new NameQualifier("pu"));
-		
-		Assert.assertNotNull(m1);
-		Assert.assertEquals(EntityManagerProxy.class,m1.getClass());
-		
-		EntityManager m2 = Beans.getReference(EntityManager.class,new NameQualifier("pu"));
-		
-		Assert.assertNotNull(m2);
-		Assert.assertEquals(EntityManagerProxy.class,m2.getClass());
-		
-		MyEntity entity = new MyEntity();
-		entity.setId(createId("testID"));
-		
-		m1.persist(entity);
-		
-		Assert.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 @@
+frameworkdemoiselle.persistence.default.unit.name=pu
 \ 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
@@ -1 +0,0 @@
-frameworkdemoiselle.persistence.default.unit.name=pu
 \ No newline at end of file
@@ -1,64 +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.
--->
-<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>productor.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>
-	
-	<persistence-unit name="pu2" transaction-type="RESOURCE_LOCAL">
-		<non-jta-data-source>jdbc/__default</non-jta-data-source>
-
-		<class>productor.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>
-
-</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>
@@ -47,8 +47,12 @@ import java.lang.annotation.Inherited;
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
+/**
+ * Used to indicate which page to redirect after the execution of some method.
+ * 
+ * @author SERPRO
+ */
-// TODO Este qualifier é realmente necessário? Verificar também na anotação PreviousView.
 @Inherited
 @Documented
 @Target({ TYPE, FIELD, METHOD, PARAMETER })
@@ -47,6 +47,11 @@ import java.lang.annotation.Inherited;
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
+/**
+ * Used to indicate which page to return after the execution of some method.
+ * 
+ * @author SERPRO
+ */
 @Inherited
 @Documented
 @Target({ TYPE, FIELD, METHOD, PARAMETER })
@@ -48,6 +48,17 @@ import br.gov.frameworkdemoiselle.util.Parameter;
 import br.gov.frameworkdemoiselle.util.Reflections;
 import br.gov.frameworkdemoiselle.util.ResourceBundle;
+/**
+ * Template Managed Bean class that implements the methods defined by the interface EditPageBean.
+ * 
+ * @param <T>
+ *            bean object type
+ * @param <I>
+ *            bean id type
+ *            
+ * @author SERPRO
+ * @see EditPageBean
+ */
 public abstract class AbstractEditPageBean<T, I> extends AbstractPageBean implements EditPageBean<T> {
 	private static final long serialVersionUID = 1L;
@@ -49,7 +49,17 @@ import javax.inject.Inject;
 import br.gov.frameworkdemoiselle.pagination.Pagination;
 import br.gov.frameworkdemoiselle.pagination.PaginationContext;
 import br.gov.frameworkdemoiselle.util.Reflections;
-
+/**
+ * Template Managed Bean class that implements the methods defined by the interface ListPageBean.
+ * 
+ * @param <T>
+ *            bean object type
+ * @param <I>
+ *            bean id type
+ *
+ * @author SERPRO
+ * @see ListPageBean
+ */
 public abstract class AbstractListPageBean<T, I> extends AbstractPageBean implements ListPageBean<T, I> {
 	private static final long serialVersionUID = 1L;
@@ -42,6 +42,12 @@ import javax.inject.Inject;
 import br.gov.frameworkdemoiselle.annotation.NextView;
 import br.gov.frameworkdemoiselle.annotation.PreviousView;
+/**
+ * Template Managed Bean class that implements the methods defined by the interface PageBean.
+ * 
+ * @author SERPRO
+ * @see PageBean
+ */
 public abstract class AbstractPageBean implements PageBean {
 	private static final long serialVersionUID = 1L;
@@ -36,6 +36,15 @@
  */
 package br.gov.frameworkdemoiselle.template;
+/**
+ * Interface that defines a contract of facilities that a page with funcionalities of insert, edit and delete could implement.
+ *
+ * @param <T>
+ *            bean object type
+ *            
+ * @author SERPRO
+ * 
+ */
 public interface EditPageBean<T> extends PageBean {
 	String delete();
@@ -41,6 +41,17 @@ import java.util.Map;
 import javax.faces.model.DataModel;
+/**
+ * Interface that defines a contract of facilities that a page with the funcionality of list could implement.
+ *  
+ * @param <T>
+ *            bean object type
+ * @param <I>
+ *            bean id type
+ *
+ * @author SERPRO
+ * 
+ */
 public interface ListPageBean<T, I> extends PageBean {
 	DataModel<T> getDataModel();
@@ -38,6 +38,12 @@ package br.gov.frameworkdemoiselle.template;
 import java.io.Serializable;
+/**
+ * Interface that defines a contract of facilities that all pages could implement. 
+ * 
+ * @author SERPRO
+ * 
+ */
 public interface PageBean extends Serializable {
 	String getCurrentView();
@@ -55,6 +55,11 @@ import br.gov.frameworkdemoiselle.exception.ApplicationException;
 import br.gov.frameworkdemoiselle.message.Message;
 import br.gov.frameworkdemoiselle.message.SeverityType;
+/**
+ * Utility class to insert messages in the FacesContext.
+ * 
+ * @author SERPRO
+ * */
 public class Faces {
 	private Faces() {
@@ -43,6 +43,11 @@ import javax.faces.context.FacesContext;
 import javax.inject.Inject;
 import javax.inject.Named;
+/**
+ * Utility class to configure the Locale.
+ * 
+ * @author SERPRO
+ * */
 @Named
 public class Locales implements Serializable {
@@ -38,6 +38,12 @@ package br.gov.frameworkdemoiselle.util;
 import br.gov.frameworkdemoiselle.DemoiselleException;
+/**
+ * 
+ * Utility class that serves as the exception to be thrown when a page is not found.
+ * 
+ * @author SERPRO
+ * */
 public class PageNotFoundException extends DemoiselleException {
 	private static final long serialVersionUID = 1L;
@@ -40,6 +40,15 @@ import java.io.Serializable;
 import javax.faces.convert.Converter;
+/**
+ * 
+ * Interface that defines the methods to be implemented to get and set values on a parameter.
+ * 
+ * @param <T>
+ *            bean object type  
+ * 
+ * @author SERPRO
+ * */
 public interface Parameter<T extends Serializable> {
 	void setValue(T value);
@@ -47,6 +47,12 @@ import javax.faces.FacesException;
 import javax.faces.application.ViewHandler;
 import javax.faces.context.FacesContext;
+/**
+ * 
+ * Utility class to redirect determined page to another one.
+ * 
+ * @author SERPRO
+ * */
 public class Redirector {
 	private Redirector() {
@@ -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);
 	}
@@ -1,46 +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.
--->
-<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,46 @@
+<!--
+ 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>
@@ -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>
@@ -41,6 +41,13 @@ import java.io.Serializable;
 import javax.enterprise.context.RequestScoped;
 import javax.inject.Named;
+/**
+ * This classes keeps credential informations, username and password.
+ * 
+ * @author SERPRO
+ * 
+ */
+
 @Named
 @RequestScoped
 public class Credentials implements Serializable {
@@ -51,6 +58,9 @@ public class Credentials implements Serializable {
 	private String password;
+	/**
+	 * Cleans the stored information, setting username and password to null.
+	 */
 	public void clear() {
 		this.username = null;
 		this.password = null;
@@ -48,6 +48,13 @@ import br.gov.frameworkdemoiselle.util.Beans;
 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.
+ * 
+ * @author SERPRO
+ */
+
 @Priority(L2_PRIORITY)
 public class ServletAuthenticator implements Authenticator {
@@ -82,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,23 @@ 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.
+ * 
+ * @author SERPRO
+ */
+
 @Priority(L2_PRIORITY)
 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) {
@@ -68,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;
@@ -45,6 +45,13 @@ import javax.servlet.ServletException;
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
+/**
+ * Implements the {@link javax.servlet.Filter} interface.
+ * 
+ * @author SERPRO
+ *
+ */
+
 public class ServletFilter implements Filter {
 	@Override
@@ -41,6 +41,14 @@ import javax.servlet.ServletContextEvent;
 import br.gov.frameworkdemoiselle.lifecycle.AfterShutdownProccess;
 import br.gov.frameworkdemoiselle.lifecycle.AfterStartupProccess;
+/**
+ * Implements the {@link javax.servlet.ServletContextListener} interface, and fire two events: 
+ * {@link AfterStartupProccess} and {@link AfterShutdownProccess}.
+ * 
+ * @author SERPRO
+ *
+ */
+
 public class ServletListener implements javax.servlet.ServletContextListener {
 	@Override
@@ -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>
@@ -101,8 +101,8 @@
 		<connection>scm:git:git@github.com:demoiselle/${project.alias}.git</connection>
 		<developerConnection>scm:git:git@github.com:demoiselle/${project.alias}.git</developerConnection>
 		<url>http://github.com/demoiselle/${project.alias}</url>
-	  <tag>HEAD</tag>
-  </scm>
+		<tag>HEAD</tag>
+	</scm>
 	<repositories>
 		<repository>
		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	+ */
1	package br.gov.frameworkdemoiselle.internal.bootstrap;	37	package br.gov.frameworkdemoiselle.internal.bootstrap;
2		38
3	import java.lang.reflect.Modifier;	39	import java.lang.reflect.Modifier;
@@ -0,0 +1,62 @@		@@ -0,0 +1,62 @@
	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.context;
	38	+
	39	+import javax.enterprise.context.spi.Context;
	40	+
	41	+/**
	42	+ *
	43	+ * Base interface for contexts managed by the framework.
	44	+ *
	45	+ * @author serpro
	46	+ *
	47	+ */
	48	+public interface CustomContext extends Context {
	49	+
	50	+ /**
	51	+ * Activates a custom context
	52	+ *
	53	+ * @return <code>true</code> if context was activated, <code>false</code> if there was already another active
	54	+ * context for the same scope and the activation of this scope failed.
	55	+ */
	56	+ boolean activate();
	57	+
	58	+ /**
	59	+ * Deactivates this context, it will clear all beans stored on this context.
	60	+ */
	61	+ void deactivate();
	62	+}
@@ -0,0 +1,79 @@		@@ -0,0 +1,79 @@
	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	+/*
	38	+ * Demoiselle Framework Copyright (c) 2010 Serpro and other contributors as indicated by the @author tag. See the
	39	+ * copyright.txt in the distribution for a full listing of contributors. Demoiselle Framework is an open source Java EE
	40	+ * library designed to accelerate the development of transactional database Web applications. Demoiselle Framework is
	41	+ * released under the terms of the LGPL license 3 http://www.gnu.org/licenses/lgpl.html LGPL License 3 This file is part
	42	+ * of Demoiselle Framework. Demoiselle Framework is free software: you can redistribute it and/or modify it under the
	43	+ * terms of the GNU Lesser General Public License 3 as published by the Free Software Foundation. Demoiselle Framework
	44	+ * is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
	45	+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You
	46	+ * should have received a copy of the GNU Lesser General Public License along with Demoiselle Framework. If not, see
	47	+ * <http://www.gnu.org/licenses/>.
	48	+ */
	49	+package br.gov.frameworkdemoiselle.internal.context;
	50	+
	51	+import java.lang.annotation.Annotation;
	52	+
	53	+/**
	54	+ * Base context that has a separated store for each thread
	55	+ *
	56	+ * @author SERPRO
	57	+ */
	58	+public class ThreadLocalContext extends AbstractCustomContext {
	59	+
	60	+ private final ThreadLocal<Store> threadLocal = new ThreadLocal<Store>();
	61	+
	62	+ public ThreadLocalContext(final Class<? extends Annotation> scope) {
	63	+ super(scope);
	64	+ }
	65	+
	66	+ @Override
	67	+ protected boolean isStoreInitialized() {
	68	+ return threadLocal.get()!=null;
	69	+ }
	70	+
	71	+ @Override
	72	+ protected Store getStore() {
	73	+ if (this.threadLocal.get() == null) {
	74	+ this.threadLocal.set(createStore());
	75	+ }
	76	+
	77	+ return this.threadLocal.get();
	78	+ }
	79	+}
	@@ -60,7 +60,7 @@ import br.gov.frameworkdemoiselle.util.ResourceBundle;		@@ -60,7 +60,7 @@ import br.gov.frameworkdemoiselle.util.ResourceBundle;
60	* <p>Instances if this class are passed to each discovered management extension during bootstrap so they can have	60	* <p>Instances if this class are passed to each discovered management extension during bootstrap so they can have
61	* enough information to expose all discovered {@link ManagementController}'s to management clients.</p>	61	* enough information to expose all discovered {@link ManagementController}'s to management clients.</p>
62	*	62	*
63	- * @author serpro	63	+ * @author SERPRO
64	*/	64	*/
65	public class ManagedType {	65	public class ManagedType {
66		66
	@@ -72,7 +72,7 @@ import br.gov.frameworkdemoiselle.util.ResourceBundle;		@@ -72,7 +72,7 @@ import br.gov.frameworkdemoiselle.util.ResourceBundle;
72	* Central class used by management extensions to obtain information, access properties and call operations over	72	* Central class used by management extensions to obtain information, access properties and call operations over
73	* discovered {@link ManagementController} classes.	73	* discovered {@link ManagementController} classes.
74	*	74	*
75	- * @author serpro	75	+ * @author SERPRO
76	*/	76	*/
77	@ApplicationScoped	77	@ApplicationScoped
78	public class Management implements Serializable {	78	public class Management implements Serializable {
	@@ -44,7 +44,7 @@ import br.gov.frameworkdemoiselle.management.NotificationManager;		@@ -44,7 +44,7 @@ import br.gov.frameworkdemoiselle.management.NotificationManager;
44	* Implementators can capture this event and be notified when the {@link NotificationManager}	44	* Implementators can capture this event and be notified when the {@link NotificationManager}
45	* sends notifications, so they can pass the notification to the underlying technology.	45	* sends notifications, so they can pass the notification to the underlying technology.
46	*	46	*
47	- * @author serpro	47	+ * @author SERPRO
48	*	48	*
49	*/	49	*/
50	public class ManagementNotificationEventImpl implements br.gov.frameworkdemoiselle.management.ManagementNotificationEvent {	50	public class ManagementNotificationEventImpl implements br.gov.frameworkdemoiselle.management.ManagementNotificationEvent {
	@@ -51,7 +51,7 @@ import br.gov.frameworkdemoiselle.management.ManagementNotificationEvent;		@@ -51,7 +51,7 @@ import br.gov.frameworkdemoiselle.management.ManagementNotificationEvent;
51	* Enables {@link ManagementNotificationEvent} observers to trigger only with notifications	51	* Enables {@link ManagementNotificationEvent} observers to trigger only with notifications
52	* of the specialized type {@link AttributeChangeNotification}.	52	* of the specialized type {@link AttributeChangeNotification}.
53	*	53	*
54	- * @author serpro	54	+ * @author SERPRO
55	*	55	*
56	*/	56	*/
57	@Qualifier	57	@Qualifier
	@@ -54,7 +54,7 @@ import br.gov.frameworkdemoiselle.stereotype.ManagementController;		@@ -54,7 +54,7 @@ import br.gov.frameworkdemoiselle.stereotype.ManagementController;
54	* methods at the apropriate times.	54	* methods at the apropriate times.
55	* </p>	55	* </p>
56	*	56	*
57	- * @author serpro	57	+ * @author SERPRO
58	*/	58	*/
59	public interface ManagementExtension {	59	public interface ManagementExtension {
60		60
	@@ -40,7 +40,7 @@ package br.gov.frameworkdemoiselle.management;		@@ -40,7 +40,7 @@ package br.gov.frameworkdemoiselle.management;
40	* Special notification to denote an attribute has changed values.	40	* Special notification to denote an attribute has changed values.
41	*	41	*
42	* @see GenericNotification	42	* @see GenericNotification
43	- * @author serpro	43	+ * @author SERPRO
44	*/	44	*/
45	public class AttributeChangeNotification extends GenericNotification {	45	public class AttributeChangeNotification extends GenericNotification {
46		46
	@@ -39,7 +39,7 @@ package br.gov.frameworkdemoiselle.management;		@@ -39,7 +39,7 @@ package br.gov.frameworkdemoiselle.management;
39	/**	39	/**
40	* Notification that can be sent by the {@link NotificationManager}.	40	* Notification that can be sent by the {@link NotificationManager}.
41	*	41	*
42	- * @author serpro	42	+ * @author SERPRO
43	*/	43	*/
44	public class GenericNotification {	44	public class GenericNotification {
45		45