Merge remote branch 'origin/2.4.0' into 2.4.0

Conflicts: impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/bootstrap/ManagementBootstrap.java impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/Management.java impl/extension/jmx/src/main/java/br/gov/frameworkdemoiselle/internal/DynamicMBeanProxy.java impl/extension/jmx/src/main/java/br/gov/frameworkdemoiselle/internal/JMXManagementExtension.java impl/extension/jmx/src/main/java/br/gov/frameworkdemoiselle/internal/NotificationEventListener.java impl/extension/jsf/src/test/java/test/Tests.java

Merge remote branch 'origin/2.4.0' into 2.4.0
Conflicts: impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/bootstrap/ManagementBootstrap.java impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/Management.java impl/extension/jmx/src/main/java/br/gov/frameworkdemoiselle/internal/DynamicMBeanProxy.java impl/extension/jmx/src/main/java/br/gov/frameworkdemoiselle/internal/JMXManagementExtension.java impl/extension/jmx/src/main/java/br/gov/frameworkdemoiselle/internal/NotificationEventListener.java impl/extension/jsf/src/test/java/test/Tests.java
Luciano Borges
2 parents 4b6c112d 26c10066
Showing 47 changed files with 1237 additions and 836 deletions Show diff stats
impl/core/src/main/java/br/gov/frameworkdemoiselle/context/CustomContext.java
impl/core/src/main/java/br/gov/frameworkdemoiselle/context/RequestContext.java
impl/core/src/main/java/br/gov/frameworkdemoiselle/context/SessionContext.java
impl/core/src/main/java/br/gov/frameworkdemoiselle/context/StaticContext.java
impl/core/src/main/java/br/gov/frameworkdemoiselle/context/ViewContext.java
impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/bootstrap/AbstractLifecycleBootstrap.java
impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/bootstrap/CoreBootstrap.java
impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/bootstrap/CustomContextBootstrap.java
impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/bootstrap/ManagementBootstrap.java
impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/context/AbstractCustomContext.java
impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/context/AbstractStaticContext.java
impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/context/AbstractThreadLocalContext.java
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/CustomContextProducer.java
impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/context/ManagedContext.java
impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/context/RequestContextImpl.java
impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/context/SessionContextImpl.java
impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/context/StaticContext.java
impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/context/StaticContextImpl.java
@@ -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.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,5 @@
+package br.gov.frameworkdemoiselle.context;
+
+
+public interface RequestContext extends CustomContext {
+}
@@ -0,0 +1,6 @@
+package br.gov.frameworkdemoiselle.context;
+
+
+
+public interface SessionContext extends CustomContext {
+}
 \ No newline at end of file
@@ -0,0 +1,6 @@
+package br.gov.frameworkdemoiselle.context;
+
+
+
+public interface StaticContext extends CustomContext {
+}
@@ -0,0 +1,6 @@
+package br.gov.frameworkdemoiselle.context;
+
+
+
+public interface ViewContext extends CustomContext {
+}
@@ -42,11 +42,7 @@ import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
-import javax.enterprise.context.ConversationScoped;
-import javax.enterprise.context.RequestScoped;
-import javax.enterprise.context.SessionScoped;
 import javax.enterprise.event.Observes;
-import javax.enterprise.inject.spi.AfterBeanDiscovery;
 import javax.enterprise.inject.spi.AnnotatedMethod;
 import javax.enterprise.inject.spi.AnnotatedType;
 import javax.enterprise.inject.spi.Extension;
@@ -55,9 +51,9 @@ import javax.enterprise.inject.spi.ProcessAnnotatedType;
 import org.slf4j.Logger;
 import br.gov.frameworkdemoiselle.DemoiselleException;
-import br.gov.frameworkdemoiselle.annotation.ViewScoped;
-import br.gov.frameworkdemoiselle.internal.context.ContextManager;
-import br.gov.frameworkdemoiselle.internal.context.ThreadLocalContext;
+import br.gov.frameworkdemoiselle.context.RequestContext;
+import br.gov.frameworkdemoiselle.context.SessionContext;
+import br.gov.frameworkdemoiselle.context.ViewContext;
 import br.gov.frameworkdemoiselle.internal.implementation.AnnotatedMethodProcessor;
 import br.gov.frameworkdemoiselle.util.Beans;
 import br.gov.frameworkdemoiselle.util.NameQualifier;
@@ -109,7 +105,7 @@ public abstract class AbstractLifecycleBootstrap&lt;A extends Annotation&gt; implement
 		}
 	}
-	public void loadTempContexts(@Observes final AfterBeanDiscovery event) {
+	/*public void loadTempContexts(@Observes final AfterBeanDiscovery event) {
 		// Caso este bootstrap rode antes do CoreBootstrap. Não há problemas em chamar este método várias vezes, ele
 		// ignora chamadas adicionais.
 		ContextManager.initialize(event);
@@ -119,7 +115,7 @@ public abstract class AbstractLifecycleBootstrap&lt;A extends Annotation&gt; implement
 		ContextManager.add(new ThreadLocalContext(SessionScoped.class), event);
 		ContextManager.add(new ThreadLocalContext(ConversationScoped.class), event);
 		ContextManager.add(new ThreadLocalContext(RequestScoped.class), event);
-	}
+	}*/
 	@SuppressWarnings({ "unchecked", "rawtypes" })
 	protected synchronized void proccessEvent() {
@@ -127,12 +123,15 @@ public abstract class AbstractLifecycleBootstrap&lt;A extends Annotation&gt; implement
 		Collections.sort(processors);
 		Exception failure = null;
+		
+		RequestContext tempRequestContext = Beans.getReference(RequestContext.class);
+		SessionContext tempSessionContext = Beans.getReference(SessionContext.class);
+		ViewContext tempViewContext = Beans.getReference(ViewContext.class);
 		if (!registered) {
-			ContextManager.activate(ThreadLocalContext.class, ViewScoped.class);
-			ContextManager.activate(ThreadLocalContext.class, SessionScoped.class);
-			ContextManager.activate(ThreadLocalContext.class, ConversationScoped.class);
-			ContextManager.activate(ThreadLocalContext.class, RequestScoped.class);
+			tempRequestContext.activate();
+			tempSessionContext.activate();
+			tempViewContext.activate();
 			registered = true;
 		}
@@ -155,10 +154,9 @@ public abstract class AbstractLifecycleBootstrap&lt;A extends Annotation&gt; implement
 		}
 		if (processors.isEmpty()) {
-			ContextManager.deactivate(ThreadLocalContext.class, ViewScoped.class);
-			ContextManager.deactivate(ThreadLocalContext.class, SessionScoped.class);
-			ContextManager.deactivate(ThreadLocalContext.class, ConversationScoped.class);
-			ContextManager.deactivate(ThreadLocalContext.class, RequestScoped.class);
+			tempRequestContext.deactivate();
+			tempSessionContext.deactivate();
+			tempViewContext.deactivate();
 		}
 		if (failure != null) {
@@ -39,7 +39,6 @@ package br.gov.frameworkdemoiselle.internal.bootstrap;
 import java.util.Locale;
 import javax.enterprise.event.Observes;
-import javax.enterprise.inject.spi.AfterBeanDiscovery;
 import javax.enterprise.inject.spi.AfterDeploymentValidation;
 import javax.enterprise.inject.spi.BeanManager;
 import javax.enterprise.inject.spi.BeforeBeanDiscovery;
@@ -48,9 +47,6 @@ import javax.enterprise.inject.spi.Extension;
 import org.slf4j.Logger;
-import br.gov.frameworkdemoiselle.annotation.StaticScoped;
-import br.gov.frameworkdemoiselle.internal.context.ContextManager;
-import br.gov.frameworkdemoiselle.internal.context.StaticContext;
 import br.gov.frameworkdemoiselle.internal.producer.LoggerProducer;
 import br.gov.frameworkdemoiselle.util.Beans;
 import br.gov.frameworkdemoiselle.util.ResourceBundle;
@@ -60,7 +56,7 @@ public class CoreBootstrap implements Extension {
 	private Logger logger;
 	private transient ResourceBundle bundle;
-
+	
 	private Logger getLogger() {
 		if (this.logger == null) {
 			this.logger = LoggerProducer.create(CoreBootstrap.class);
@@ -83,18 +79,7 @@ public class CoreBootstrap implements Extension {
 		Beans.setBeanManager(beanManager);
 		getLogger().info(getBundle().getString("setting-up-bean-manager", Beans.class.getCanonicalName()));
 	}
-
-	public void initializeCustomContexts(@Observes final AfterBeanDiscovery event) {
-		// StaticContext já é criado e gerenciado por esta chamada
-		ContextManager.initialize(event);
-
-		ContextManager.activate(StaticContext.class, StaticScoped.class);
-	}
-
-	public void terminateCustomContexts(@Observes final BeforeShutdown event) {
-		ContextManager.shutdown();
-	}
-
+	
 	public void takeOff(@Observes final AfterDeploymentValidation event) {
 		getLogger().info(getBundle().getString("taking-off"));
 	}
@@ -0,0 +1,90 @@
+package br.gov.frameworkdemoiselle.internal.bootstrap;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.enterprise.event.Observes;
+import javax.enterprise.inject.spi.AfterBeanDiscovery;
+import javax.enterprise.inject.spi.AfterDeploymentValidation;
+import javax.enterprise.inject.spi.Extension;
+
+import br.gov.frameworkdemoiselle.context.CustomContext;
+import br.gov.frameworkdemoiselle.context.StaticContext;
+import br.gov.frameworkdemoiselle.internal.context.CustomContextProducer;
+import br.gov.frameworkdemoiselle.internal.context.RequestContextImpl;
+import br.gov.frameworkdemoiselle.internal.context.SessionContextImpl;
+import br.gov.frameworkdemoiselle.internal.context.StaticContextImpl;
+import br.gov.frameworkdemoiselle.internal.context.ThreadLocalViewContextImpl;
+import br.gov.frameworkdemoiselle.util.Beans;
+
+/**
+ * This portable extension registers and starts custom contexts used by
+ * the framework.
+ * 
+ * @author serpro
+ *
+ */
+public class CustomContextBootstrap implements Extension{
+	
+	private List<CustomContext> contexts;
+	
+	/*private Logger logger;
+
+	private transient ResourceBundle bundle;
+	
+	private Logger getLogger() {
+		if (this.logger == null) {
+			this.logger = LoggerProducer.create(CoreBootstrap.class);
+		}
+
+		return this.logger;
+	}
+
+	private ResourceBundle getBundle() {
+		if (bundle == null) {
+			bundle = new ResourceBundle("demoiselle-core-bundle", Locale.getDefault());
+		}
+
+		return bundle;
+	}*/
+	
+	public void initializeContexts(@Observes AfterBeanDiscovery event){
+		//Cadastra os contextos contidos no demoiselle-core
+		if (contexts==null || contexts.isEmpty()){
+			CustomContext ctx;
+			
+			contexts = new ArrayList<CustomContext>();
+			
+			ctx = new RequestContextImpl();
+			contexts.add(ctx);
+			
+			ctx = new SessionContextImpl();
+			contexts.add(ctx);
+			
+			ctx = new StaticContextImpl();
+			contexts.add(ctx);
+			
+			ctx = new ThreadLocalViewContextImpl();
+			contexts.add(ctx);
+			
+			for (CustomContext c : contexts){
+				event.addContext(c);
+			}
+		}
+		
+		//Ativa um contexto para gerenciar o StaticScope, um escopo criado para gerenciar classes de configuração.
+		for (CustomContext ctx : contexts){
+			if (ctx instanceof StaticContext){
+				StaticContext staticContext = (StaticContext)ctx;
+				staticContext.activate();
+				break;
+			}
+		}
+	}
+	
+	public void storeContexts(@Observes AfterDeploymentValidation event){
+		CustomContextProducer producer = Beans.getReference(CustomContextProducer.class);
+		producer.addRegisteredContexts(contexts);
+	}
+	
+}
@@ -44,7 +44,6 @@ import java.util.Locale;
 import java.util.Set;
 import javax.enterprise.event.Observes;
-import javax.enterprise.inject.spi.AfterBeanDiscovery;
 import javax.enterprise.inject.spi.AfterDeploymentValidation;
 import javax.enterprise.inject.spi.AnnotatedType;
 import javax.enterprise.inject.spi.Bean;
@@ -53,8 +52,6 @@ import javax.enterprise.inject.spi.Extension;
 import javax.enterprise.inject.spi.ProcessAnnotatedType;
 import br.gov.frameworkdemoiselle.DemoiselleException;
-import br.gov.frameworkdemoiselle.internal.context.ContextManager;
-import br.gov.frameworkdemoiselle.internal.context.ManagedContext;
 import br.gov.frameworkdemoiselle.internal.implementation.ManagedType;
 import br.gov.frameworkdemoiselle.internal.implementation.Management;
 import br.gov.frameworkdemoiselle.lifecycle.AfterShutdownProccess;
@@ -76,10 +73,10 @@ public class ManagementBootstrap implements Extension {
 		}
 	}
-	public void activateContexts(@Observes final AfterBeanDiscovery event) {
+	/*public void activateContexts(@Observes final AfterBeanDiscovery event) {
 		ContextManager.initialize(event);
 		ContextManager.add(new ManagedContext(), event);
-	}
+	}*/
 	@SuppressWarnings("unchecked")
 	public void registerAvailableManagedTypes(@Observes final AfterDeploymentValidation event, BeanManager beanManager) {
@@ -39,20 +39,34 @@ package br.gov.frameworkdemoiselle.internal.context;
 import java.lang.annotation.Annotation;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.Locale;
 import java.util.Map;
 import javax.enterprise.context.ContextNotActiveException;
+import javax.enterprise.context.spi.Context;
 import javax.enterprise.context.spi.Contextual;
 import javax.enterprise.context.spi.CreationalContext;
 import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.inject.spi.BeanManager;
+
+import org.slf4j.Logger;
+
+import br.gov.frameworkdemoiselle.context.CustomContext;
+import br.gov.frameworkdemoiselle.internal.producer.LoggerProducer;
+import br.gov.frameworkdemoiselle.util.Beans;
+import br.gov.frameworkdemoiselle.util.ResourceBundle;
 public abstract class AbstractCustomContext implements CustomContext {
 	private boolean active;
 	private final Class<? extends Annotation> scope;
+	
+	private Logger logger;
+	
+	private transient ResourceBundle bundle;
-	public AbstractCustomContext(final Class<? extends Annotation> scope) {
+	AbstractCustomContext(final Class<? extends Annotation> scope) {
 		this.scope = scope;
 		this.active = false;
 	}
@@ -97,14 +111,44 @@ public abstract class AbstractCustomContext implements CustomContext {
 		return this.active;
 	}
-	public void setActive(boolean active) {
-		if (!active && this.active) {
-			// Limpando contexto
+	@Override
+	public boolean activate() {
+		if (!this.active){
+			BeanManager beanManager = Beans.getBeanManager();
+			if (beanManager!=null){
+				try{
+					Context ctx = beanManager.getContext(this.getScope());
+					if (ctx!=null){
+						getLogger().debug( getBundle().getString("custom-context-already-activated" , this.getClass().getCanonicalName() , this.getScope().getSimpleName() , ctx.getClass().getCanonicalName() ) );
+					}
+				}
+				catch(ContextNotActiveException ce){
+					this.active = true;
+					getLogger().debug( getBundle().getString("custom-context-was-activated" , this.getClass().getCanonicalName() , this.getScope().getSimpleName() ) );
+				}
+			}
+			else{
+				this.active = true;
+				getLogger().debug( getBundle().getString("custom-context-was-activated" , this.getClass().getCanonicalName() , this.getScope().getSimpleName() ) );
+			}
+		}
+		
+		return this.active;
+	}
+	
+	@Override
+	public void deactivate(){
+		if (this.active){
 			if (isStoreInitialized()){
 				getStore().clear();
 			}
+			
+			this.active = false;
+			
+			Logger logger = getLogger();
+			ResourceBundle bundle = getBundle();
+			logger.debug( bundle.getString("custom-context-was-deactivated" , this.getClass().getCanonicalName() , this.getScope().getSimpleName() ) );
 		}
-		this.active = active;
 	}
 	@Override
@@ -115,6 +159,22 @@ public abstract class AbstractCustomContext implements CustomContext {
 	protected static Store createStore() {
 		return new Store();
 	}
+	
+	private ResourceBundle getBundle(){
+		if (bundle==null){
+			bundle = new ResourceBundle("demoiselle-core-bundle", Locale.getDefault());
+		}
+		
+		return bundle;
+	}
+	
+	private Logger getLogger(){
+		if (logger==null){
+			logger = LoggerProducer.create(this.getClass());
+		}
+		
+		return logger;
+	}
 	static class Store {
@@ -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.
+ */
+package br.gov.frameworkdemoiselle.internal.context;
+
+import java.lang.annotation.Annotation;
+
+import br.gov.frameworkdemoiselle.annotation.Priority;
+import br.gov.frameworkdemoiselle.annotation.StaticScoped;
+import br.gov.frameworkdemoiselle.configuration.Configuration;
+
+/**
+ * 
+ * <p>This context has a unified static store that keeps all scoped beans available
+ * to all threads of an application. It is intended to keep beans avaliable to
+ * long lasting scopes (like the Session scope and Application scope) on environments
+ * that lack those scopes by default (like desktop Swing applications).</p>
+ * 
+ * <p>This context also keeps beans of the custom {@link StaticScoped} scope, like the beans
+ * annotated with {@link Configuration}.</p>
+ * 
+ * @author serpro
+ *
+ */
+@Priority(Priority.MIN_PRIORITY)
+public abstract class AbstractStaticContext extends AbstractCustomContext {
+
+	private final static Store store = createStore();
+	
+	/**
+	 * Constructs this context to control the provided scope
+	 */
+	AbstractStaticContext(Class<? extends Annotation> scope) {
+		super(scope);
+	}
+
+	@Override
+	protected Store getStore() {
+		return store;
+	}
+
+	@Override
+	protected boolean isStoreInitialized() {
+		return store!=null;
+	}
+}
@@ -0,0 +1,81 @@
+/*
+ * 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;
+
+/**
+ * This context keeps a separated store for beans for each running thread. It is intended
+ * to keep beans of short lived scopes like the Request scope, on environments that lack
+ * those scopes by default.
+ * 
+ * @author serpro
+ */
+public abstract class AbstractThreadLocalContext extends AbstractCustomContext {
+
+	private final ThreadLocal<Store> threadLocal = new ThreadLocal<Store>();
+
+	AbstractThreadLocalContext(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();
+	}
+}
@@ -1,360 +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.context;
-
-import java.lang.annotation.Annotation;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-
-import javax.enterprise.context.ContextNotActiveException;
-import javax.enterprise.context.spi.Context;
-import javax.enterprise.inject.spi.AfterBeanDiscovery;
-import javax.enterprise.inject.spi.BeanManager;
-
-import org.slf4j.Logger;
-
-import br.gov.frameworkdemoiselle.DemoiselleException;
-import br.gov.frameworkdemoiselle.annotation.StaticScoped;
-import br.gov.frameworkdemoiselle.internal.producer.LoggerProducer;
-import br.gov.frameworkdemoiselle.util.Beans;
-import br.gov.frameworkdemoiselle.util.ResourceBundle;
-
-/**
- * <p>
- * Manage custom contexts relevant to Demoiselle operations.
- * </p>
- * <p>
- * When starting, the ContextManager must be initialized by calling {@link #initialize(AfterBeanDiscovery event)} inside
- * any methods observing the {@link AfterBeanDiscovery} event. Upon initialization a {@link StaticContext} will be
- * created to handle {@link StaticScoped} beans (but not activated, you must call
- * {@link #activate(Class customContextClass, Class scope)} to activate this context).
- * </p>
- * <p>
- * If an extension wants to manage another custom context, it must first call
- * {@link #add(CustomContext context, AfterBeanDiscovery event)} to add it's context to the list of managed contexts and
- * then call {@link #activate(Class customContextClass, Class scope)} whenever it wants to activate this added context
- * (contexts added through the {@link #add(CustomContext context, AfterBeanDiscovery event)} method are also not
- * activated upon adding).
- * </p>
- * 
- * @author SERPRO
- */
-public final class ContextManager {
-
-	private static final Map<ClassLoader, List<CustomContextCounter>> contextsCache = Collections
-			.synchronizedMap(new HashMap<ClassLoader, List<CustomContextCounter>>());
-
-	private static final Map<ClassLoader, Boolean> initializedCache = Collections
-			.synchronizedMap(new HashMap<ClassLoader, Boolean>());
-
-	private ContextManager() {
-	}
-
-	private synchronized static List<CustomContextCounter> getContexts() {
-		List<CustomContextCounter> contexts = contextsCache.get(getCurrentClassLoader());
-
-		if (contexts == null) {
-			contexts = Collections.synchronizedList(new ArrayList<CustomContextCounter>());
-			contextsCache.put(getCurrentClassLoader(), contexts);
-		}
-
-		return contexts;
-	}
-
-	private synchronized static boolean isInitialized() {
-		Boolean initialized = initializedCache.get(getCurrentClassLoader());
-		
-		if (initialized == null) {
-			initialized = false;
-			initializedCache.put(getCurrentClassLoader(), initialized);
-		}
-		
-		return initialized;
-	}
-
-	private static void setInitialized(boolean initialized) {
-		initializedCache.put(getCurrentClassLoader(), initialized);
-	}
-
-	private static ClassLoader getCurrentClassLoader() {
-		return Thread.currentThread().getContextClassLoader();
-	}
-
-	/**
-	 * <p>
-	 * Initializes this manager and adds the {@link StaticContext} context to the list of managed contexts. Other
-	 * contexts must be added before they can be activated.
-	 * </p>
-	 * <p>
-	 * It's OK to call this method multiple times, it will be initialized only once.
-	 * </p>
-	 * 
-	 * @param event
-	 *            The CDI event indicating all beans have been discovered.
-	 */
-	public static void initialize(AfterBeanDiscovery event) {
-		if (isInitialized()) {
-			return;
-		}
-
-		add(new StaticContext(), event);
-		setInitialized(true);
-	}
-
-	/**
-	 * <p>
-	 * Adds a context to the list of managed contexts.
-	 * </p>
-	 * <p>
-	 * A context added through this method will be deactivated before management can start. Only after calling
-	 * {@link #activate(Class customContextClass, Class scope)} the context will be activated.
-	 * </p>
-	 * <p>
-	 * Trying to add a context already managed will result in this method call being ignored.
-	 * </p>
-	 * 
-	 * @param context
-	 *            The context to be added
-	 * @param event
-	 *            The CDI event indicating all beans have been discovered.
-	 */
-	public static void add(CustomContext context, AfterBeanDiscovery event) {
-		for (CustomContextCounter contextCounter : getContexts()) {
-			if (contextCounter.isSame(context.getClass(), context.getScope())) {
-
-				ContextManager.getLogger().trace(
-						ContextManager.getBundle().getString("bootstrap-context-already-managed",
-								context.getClass().getCanonicalName(), context.getScope().getCanonicalName()));
-
-				return;
-			}
-		}
-
-		ContextManager.getLogger().trace(
-				ContextManager.getBundle().getString("bootstrap-context-added", context.getClass().getCanonicalName(),
-						context.getScope().getCanonicalName()));
-
-		context.setActive(false);
-		event.addContext(context);
-		getContexts().add(new CustomContextCounter(context));
-	}
-
-	/**
-	 * <p>
-	 * Activates a managed context.
-	 * </p>
-	 * <p>
-	 * To be activated, a context must fulfill the following requisites:
-	 * <ul>
-	 * <li>Must be managed by this class (be of type {@link StaticScoped} or be added with
-	 * {@link #add(CustomContext context, AfterBeanDiscovery event)})</li>
-	 * <li>Must be of a scope not already attached to another active context</li>
-	 * </ul>
-	 * </p>
-	 * 
-	 * @param customContextClass
-	 *            Type of context to activate
-	 * @param scope
-	 *            The scope to activate this context for
-	 * @return <code>true</code> if there is a managed context of the provided type and scope and no other context is
-	 *         active for the provided scope, <code>false</code> if there is a managed context of the provided type and
-	 *         scope but another context is active for the provided scope.
-	 * @throws DemoiselleException
-	 *             if there is no managed context of the provided type and scope.
-	 */
-	public static synchronized void activate(Class<? extends CustomContext> customContextClass,
-			Class<? extends Annotation> scope) {
-		if (!isInitialized()) {
-			throw new DemoiselleException(getBundle().getString("custom-context-manager-not-initialized"));
-		}
-
-		for (CustomContextCounter context : getContexts()) {
-			if (context.isSame(customContextClass, scope)) {
-				context.activate();
-				return;
-			}
-		}
-
-		throw new DemoiselleException(getBundle().getString("custom-context-not-found",
-				customContextClass.getCanonicalName(), scope.getSimpleName()));
-	}
-
-	/**
-	 * <p>
-	 * Deactivates a managed context.
-	 * </p>
-	 * <p>
-	 * To be deactivated, a context must fulfill the following requisites:
-	 * <ul>
-	 * <li>Must be managed by this class (be of type {@link StaticScoped} or be added with
-	 * {@link #add(CustomContext context, AfterBeanDiscovery event)})</li>
-	 * <li>Must have been activated by a previous call to {@link #activate(Class customContextClass, Class scope)}</li>
-	 * <li>This previous call must have returned <code>true</code>.
-	 * </ul>
-	 * </p>
-	 * 
-	 * @param customContextClass
-	 *            Type of context to deactivate
-	 * @param scope
-	 *            The scope the context controled when it was active
-	 * @return <code>true</code> if there was an active context of this type and scope and it was activated by a
-	 *         previous call to {@link #activate(Class customContextClass, Class scope)}
-	 * @throws DemoiselleException
-	 *             if there is no managed context of the provided type and scope.
-	 */
-	public static synchronized void deactivate(Class<? extends CustomContext> customContextClass,
-			Class<? extends Annotation> scope) {
-		if (!isInitialized()) {
-			throw new DemoiselleException(getBundle().getString("custom-context-manager-not-initialized"));
-		}
-
-		for (CustomContextCounter context : getContexts()) {
-			if (context.isSame(customContextClass, scope)) {
-				context.deactivate();
-				return;
-			}
-		}
-
-		throw new DemoiselleException(getBundle().getString("custom-context-not-found",
-				customContextClass.getCanonicalName(), scope.getSimpleName()));
-	}
-
-	/**
-	 * <p>
-	 * This method should be called when the application is shutting down.
-	 * </p>
-	 */
-	public static synchronized void shutdown() {
-		for (CustomContextCounter context : getContexts()) {
-			context.shutdown();
-		}
-
-		getContexts().clear();
-		setInitialized(false);
-	}
-
-	static Logger getLogger() {
-		return LoggerProducer.create(ContextManager.class);
-	}
-
-	static ResourceBundle getBundle() {
-		return new ResourceBundle("demoiselle-core-bundle", Locale.getDefault());
-	}
-}
-
-/**
- * Class that counts how many attemps to activate and deactivate this context received, avoiding cases where one client
- * activates given context and another one deactivates it, leaving the first client with no active context before
- * completion.
- * 
- * @author serpro
- */
-class CustomContextCounter {
-
-	private CustomContext context;
-
-	private int activationCounter = 0;
-
-	public CustomContextCounter(CustomContext customContext) {
-		this.context = customContext;
-	}
-
-	public boolean isSame(Class<? extends CustomContext> customContextClass, Class<? extends Annotation> scope) {
-		if (context.getClass().getCanonicalName().equals(customContextClass.getCanonicalName())
-				&& context.getScope().equals(scope)) {
-			return true;
-		}
-
-		return false;
-	}
-
-	public CustomContext getInternalContext() {
-		return this.context;
-	}
-
-	public void setInternalContext(CustomContext context) {
-		this.context = context;
-	}
-
-	public synchronized void activate() {
-		try {
-			BeanManager beanManager = Beans.getReference(BeanManager.class);
-			Context c = beanManager.getContext(context.getScope());
-
-			if (c == context) {
-				activationCounter++;
-			} else {
-				ContextManager.getLogger().trace(
-						ContextManager.getBundle().getString("custom-context-already-activated",
-								context.getClass().getCanonicalName(), c.getScope().getCanonicalName(),
-								c.getClass().getCanonicalName()));
-			}
-		} catch (ContextNotActiveException ce) {
-			context.setActive(true);
-			activationCounter++;
-			ContextManager.getLogger().trace(
-					ContextManager.getBundle().getString("custom-context-was-activated",
-							context.getClass().getCanonicalName(), context.getScope().getCanonicalName()));
-		}
-	}
-
-	public synchronized void deactivate() {
-		try {
-			Context c = Beans.getBeanManager().getContext(context.getScope());
-			if (c == context) {
-				activationCounter--;
-				if (activationCounter == 0) {
-					context.setActive(false);
-					ContextManager.getLogger().trace(
-							ContextManager.getBundle().getString("custom-context-was-deactivated",
-									context.getClass().getCanonicalName(), context.getScope().getCanonicalName()));
-				}
-			}
-		} catch (ContextNotActiveException ce) {
-		}
-	}
-
-	public synchronized void shutdown() {
-		context.setActive(false);
-		context = null;
-		activationCounter = 0;
-	}
-}
@@ -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.context;
-
-import javax.enterprise.context.spi.Context;
-
-public interface CustomContext extends Context {
-
-	void setActive(boolean active);
-
-}
@@ -0,0 +1,160 @@
+package br.gov.frameworkdemoiselle.internal.context;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Locale;
+
+import javax.annotation.PreDestroy;
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.inject.Produces;
+import javax.enterprise.inject.spi.InjectionPoint;
+
+import org.slf4j.Logger;
+
+import br.gov.frameworkdemoiselle.context.CustomContext;
+import br.gov.frameworkdemoiselle.context.RequestContext;
+import br.gov.frameworkdemoiselle.context.SessionContext;
+import br.gov.frameworkdemoiselle.context.StaticContext;
+import br.gov.frameworkdemoiselle.context.ViewContext;
+import br.gov.frameworkdemoiselle.internal.bootstrap.CustomContextBootstrap;
+import br.gov.frameworkdemoiselle.internal.implementation.StrategySelector;
+import br.gov.frameworkdemoiselle.internal.producer.LoggerProducer;
+import br.gov.frameworkdemoiselle.util.ResourceBundle;
+
+/**
+ * Produces instances of {@link CustomContext} to control contexts not active
+ * by the container
+ * 
+ * @author serpro
+ *
+ */
+@ApplicationScoped
+public class CustomContextProducer {
+	
+	private Logger logger;
+
+	private transient ResourceBundle bundle;
+	
+	private List<CustomContext> contexts = new ArrayList<CustomContext>();
+	
+	/**
+	 * Store a list of contexts into this producer. The contexts must have
+	 * been registered into CDI by a portable extension, this method will not do this.
+	 *  
+	 */
+	public void addRegisteredContexts(Collection<CustomContext> contexts){
+		for (CustomContext context : contexts){
+			addRegisteredContext(context);
+		}
+	}
+	
+	/**
+	 * Store a context into this producer. The context must have
+	 * been registered into CDI by a portable extension, this method will not do this.
+	 *  
+	 */
+	public void addRegisteredContext(CustomContext context){
+		Logger logger = getLogger();
+		ResourceBundle bundle = getBundle();
+		
+		if (!contexts.contains(context)){
+			contexts.add(context);
+			logger.debug( bundle.getString("bootstrap-context-added", context.getClass().getCanonicalName() , context.getScope().getSimpleName() ) );
+		}
+		else{
+			logger.debug( bundle.getString("bootstrap-context-already-managed", context.getClass().getCanonicalName() , context.getScope().getSimpleName() ) );
+		}
+	}
+	
+	/**
+	 * Deactivates all registered contexts and clear the context collection
+	 */
+	@PreDestroy
+	public void closeContexts(){
+		//Desativa todos os contextos registrados.
+		for (CustomContext context : contexts){
+			context.deactivate();
+		}
+		
+		contexts.clear();
+	}
+	
+	@Produces
+	public RequestContext getRequestContext(InjectionPoint ip , CustomContextBootstrap extension){
+		return getContext(ip, extension);
+	}
+	
+	@Produces
+	public SessionContext getSessionContext(InjectionPoint ip , CustomContextBootstrap extension){
+		return getContext(ip, extension);
+	}
+	
+	@Produces
+	public ViewContext getViewContext(InjectionPoint ip , CustomContextBootstrap extension){
+		return getContext(ip, extension);
+	}
+	
+	@Produces
+	public StaticContext getStaticContext(InjectionPoint ip , CustomContextBootstrap extension){
+		return getContext(ip, extension);
+	}
+	
+	
+	@SuppressWarnings("unchecked")
+	private <T extends CustomContext> T getContext(InjectionPoint ip , CustomContextBootstrap extension){
+		T producedContext = null;
+		
+		if (ip!=null){
+			Class<T> beanClass = (Class<T>) ip.getType();
+			producedContext = (T) getContext(beanClass);
+		}
+		
+		if (producedContext!=null){
+			getLogger().debug( getBundle().getString("custom-context-selected" , producedContext.getClass().getCanonicalName()) );
+		}
+		
+		return producedContext;
+	}
+	
+	private CustomContext getContext(Class<? extends CustomContext> contextClass){
+		CustomContext producedContext = null;
+		
+		ArrayList<CustomContext> selectableContexts = new ArrayList<CustomContext>();
+		
+		for (CustomContext context : contexts){
+			if ( contextClass.isAssignableFrom( context.getClass() ) ){
+				if (context.isActive()){
+					producedContext = context;
+					break;
+				}
+				else{
+					selectableContexts.add(context);
+				}
+			}
+		}
+		
+		if (producedContext==null && !selectableContexts.isEmpty()){
+			producedContext = StrategySelector.selectInstance(CustomContext.class, selectableContexts);
+		}
+		
+		return producedContext;
+	}
+	
+	private Logger getLogger() {
+		if (this.logger == null) {
+			this.logger = LoggerProducer.create(this.getClass());
+		}
+
+		return this.logger;
+	}
+
+	private ResourceBundle getBundle() {
+		if (bundle == null) {
+			bundle = new ResourceBundle("demoiselle-core-bundle", Locale.getDefault());
+		}
+
+		return bundle;
+	}
+
+}
@@ -1,58 +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.context;
-
-import javax.enterprise.context.RequestScoped;
-
-import br.gov.frameworkdemoiselle.stereotype.ManagementController;
-
-/**
- * Context that stores {@link RequestScoped} beans during client calls to {@link ManagementController} classes. This
- * context is only activated when no other context is active for {@link RequestScoped}.
- * 
- * @author SERPRO
- */
-public class ManagedContext extends ThreadLocalContext {
-
-	/**
-	 * Constructs a new context.
-	 */
-	public ManagedContext() {
-		super(RequestScoped.class);
-	}
-
-}
@@ -0,0 +1,71 @@
+/*
+ * 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 javax.enterprise.context.RequestScoped;
+import javax.enterprise.inject.Alternative;
+
+import br.gov.frameworkdemoiselle.annotation.Priority;
+import br.gov.frameworkdemoiselle.context.RequestContext;
+
+/**
+ * Custom request context that stores beans in a thread local store.
+ * 
+ * @author serpro
+ *
+ */
+@Priority(Priority.MIN_PRIORITY)
+@Alternative
+public class RequestContextImpl extends AbstractThreadLocalContext implements RequestContext {
+
+	public RequestContextImpl() {
+		super(RequestScoped.class);
+	}
+
+}
@@ -0,0 +1,71 @@
+/*
+ * 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 javax.enterprise.context.SessionScoped;
+import javax.enterprise.inject.Alternative;
+
+import br.gov.frameworkdemoiselle.annotation.Priority;
+import br.gov.frameworkdemoiselle.context.SessionContext;
+
+
+/**
+ * 
+ * @author serpro
+ *
+ */
+@Priority(Priority.MIN_PRIORITY)
+@Alternative
+public class SessionContextImpl extends AbstractStaticContext implements SessionContext {
+
+	public SessionContextImpl() {
+		super(SessionScoped.class);
+	}
+	
+}
@@ -1,58 +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.context;
-
-import br.gov.frameworkdemoiselle.annotation.StaticScoped;
-
-public class StaticContext extends AbstractCustomContext {
-
-	private final static Store store = createStore();
-
-	public StaticContext() {
-		super(StaticScoped.class);
-	}
-
-	@Override
-	protected Store getStore() {
-		return store;
-	}
-
-	@Override
-	protected boolean isStoreInitialized() {
-		return store!=null;
-	}
-}
@@ -0,0 +1,64 @@
+/*
+ * 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 javax.enterprise.inject.Alternative;
+
+import br.gov.frameworkdemoiselle.annotation.Priority;
+import br.gov.frameworkdemoiselle.annotation.StaticScoped;
+import br.gov.frameworkdemoiselle.context.StaticContext;
+
+@Priority(Priority.MIN_PRIORITY)
+@Alternative
+public class StaticContextImpl extends AbstractStaticContext implements StaticContext {
+
+	public StaticContextImpl() {
+		super(StaticScoped.class);
+	}
+}
@@ -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.
- */
-/*
- * 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();
-	}
-}
@@ -0,0 +1,65 @@
+/*
+ * 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 javax.enterprise.inject.Alternative;
+
+import br.gov.frameworkdemoiselle.annotation.Priority;
+import br.gov.frameworkdemoiselle.annotation.ViewScoped;
+import br.gov.frameworkdemoiselle.context.ViewContext;
+
+@Priority(Priority.MIN_PRIORITY)
+@Alternative
+public class ThreadLocalViewContextImpl extends AbstractThreadLocalContext implements ViewContext {
+
+	public ThreadLocalViewContextImpl() {
+		super(ViewScoped.class);
+	}
+
+}
@@ -44,7 +44,6 @@ import java.util.List;
 import java.util.Set;
 import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.context.RequestScoped;
 import javax.inject.Inject;
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
@@ -56,8 +55,10 @@ import org.slf4j.Logger;
 import br.gov.frameworkdemoiselle.annotation.ManagedProperty;
 import br.gov.frameworkdemoiselle.annotation.Name;
-import br.gov.frameworkdemoiselle.internal.context.ContextManager;
-import br.gov.frameworkdemoiselle.internal.context.ManagedContext;
+import br.gov.frameworkdemoiselle.context.RequestContext;
+import br.gov.frameworkdemoiselle.context.SessionContext;
+import br.gov.frameworkdemoiselle.context.ViewContext;
+import br.gov.frameworkdemoiselle.internal.implementation.ManagedType;
 import br.gov.frameworkdemoiselle.internal.implementation.ManagedType.MethodDetail;
 import br.gov.frameworkdemoiselle.management.AttributeChangeNotification;
 import br.gov.frameworkdemoiselle.management.ManagedAttributeNotFoundException;
@@ -301,36 +302,72 @@ public class Management implements Serializable {
 	}
 	private void activateContexts(Class<?> managedType) {
-		logger.debug(bundle.getString("management-debug-starting-custom-context",
-				ManagedContext.class.getCanonicalName(), managedType.getCanonicalName()));
+		
+		RequestContext requestContext = Beans.getReference(RequestContext.class);
+		ViewContext viewContext = Beans.getReference(ViewContext.class);
+		SessionContext sessionContext = Beans.getReference(SessionContext.class);
+		
+		if (!requestContext.isActive()){
+			logger.debug(bundle.getString("management-debug-starting-custom-context",
+					requestContext.getClass().getCanonicalName(), managedType.getCanonicalName()));
+			
+			requestContext.activate();
+		}
+		
+		if (!viewContext.isActive()){
+			logger.debug(bundle.getString("management-debug-starting-custom-context",
+					viewContext.getClass().getCanonicalName(), managedType.getCanonicalName()));
+			
+			viewContext.activate();
+		}
-		ContextManager.activate(ManagedContext.class, RequestScoped.class);
+		if (!sessionContext.isActive()){
+			logger.debug(bundle.getString("management-debug-starting-custom-context",
+					sessionContext.getClass().getCanonicalName(), managedType.getCanonicalName()));
+			
+			sessionContext.activate();
+		}
 	}
 	private void deactivateContexts(Class<?> managedType) {
-		logger.debug(bundle.getString("management-debug-stoping-custom-context",
-				ManagedContext.class.getCanonicalName(), managedType.getCanonicalName()));
+		RequestContext requestContext = Beans.getReference(RequestContext.class);
+		ViewContext viewContext = Beans.getReference(ViewContext.class);
+		SessionContext sessionContext = Beans.getReference(SessionContext.class);
+		
+		if (requestContext.isActive()){
+			logger.debug(bundle.getString("management-debug-stoping-custom-context",
+					requestContext.getClass().getCanonicalName(), managedType.getCanonicalName()));
+			
+			requestContext.deactivate();
+		}
+		
+		if (!viewContext.isActive()){
+			logger.debug(bundle.getString("management-debug-stoping-custom-context",
+					viewContext.getClass().getCanonicalName(), managedType.getCanonicalName()));
+			
+			viewContext.deactivate();
+		}
-		ContextManager.deactivate(ManagedContext.class, RequestScoped.class);
+		if (!sessionContext.isActive()){
+			logger.debug(bundle.getString("management-debug-stoping-custom-context",
+					sessionContext.getClass().getCanonicalName(), managedType.getCanonicalName()));
+			
+			sessionContext.deactivate();
+		}
 	}
 	public void shutdown(Collection<Class<? extends ManagementExtension>> monitoringExtensions) {
-
 		for (Class<? extends ManagementExtension> monitoringExtensionClass : monitoringExtensions) {
 			ManagementExtension monitoringExtension = Beans.getReference(monitoringExtensionClass);
-
 			monitoringExtension.shutdown(this.getManagedTypes());
-
 			logger.debug(bundle.getString("management-debug-removing-management-extension", monitoringExtension
 					.getClass().getCanonicalName()));
 		}
-
 	}
 	public void initialize(Collection<Class<? extends ManagementExtension>> monitoringExtensions) {
-
 		for (Class<? extends ManagementExtension> monitoringExtensionClass : monitoringExtensions) {
 			ManagementExtension monitoringExtension = Beans.getReference(monitoringExtensionClass);
@@ -339,7 +376,6 @@ public class Management implements Serializable {
 			monitoringExtension.initialize(this.getManagedTypes());
 		}
-
 	}
 	private Validator getDefaultValidator() {
 br.gov.frameworkdemoiselle.internal.bootstrap.CoreBootstrap
+br.gov.frameworkdemoiselle.internal.bootstrap.CustomContextBootstrap
 br.gov.frameworkdemoiselle.internal.bootstrap.ConfigurationBootstrap
 br.gov.frameworkdemoiselle.internal.bootstrap.ManagementBootstrap
 br.gov.frameworkdemoiselle.internal.bootstrap.StartupBootstrap
@@ -68,8 +68,7 @@ configuration-not-conversion=N\u00E3o \u00E9 poss\u00EDvel converter o valor {0}
 transaction-not-defined=Nenhuma transa\u00E7\u00E3o foi definida. Para utilizar @{0} \u00E9 preciso definir a propriedade frameworkdemoiselle.transaction.class com a estrat\u00E9gia de transa\u00E7\u00E3o desejada no arquivo demoiselle.properties
 executing-all=Executando todos os \: {0}
-custom-context-was-registered=O contexto {0} foi registrado
-custom-context-was-unregistered=O contexto {0} foi removido
+custom-context-selected=Produzindo inst\u00E2ncia do contexto {0}
 custom-context-was-activated=O contexto {0} foi ativado para o escopo {1}
 custom-context-was-deactivated=O contexto {0} foi desativado para o escopo {1}
 custom-context-already-activated=N\u00E3o foi poss\u00EDvel ativar o contexto {0}, o escopo {1} j\u00E1 est\u00E1 ativo no contexto {2}
 package management.validation;
+import javax.validation.ConstraintViolationException;
+
 import management.testclasses.DummyManagedClass;
 import management.testclasses.DummyManagementExtension;
 import management.testclasses.DummyValidator;
@@ -14,7 +16,6 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import test.Tests;
-import br.gov.frameworkdemoiselle.DemoiselleException;
 import br.gov.frameworkdemoiselle.util.Beans;
 @RunWith(Arquillian.class)
@@ -52,8 +53,8 @@ public class ValidationTest {
 			store.setProperty(DummyManagedClass.class, "id", (Integer) null);
 			Assert.fail();
-		} catch (DemoiselleException de) {
-			// Classes de gerenciamento disparam Demoiselle Exception quando uma validação falha
+		} catch (ConstraintViolationException ce) {
+			// Classes de gerenciamento disparam ConstraintViolationException quando uma validação falha
 		}
 	}
@@ -72,7 +73,7 @@ public class ValidationTest {
 			store.setProperty(DummyManagedClass.class, "gender", "J");
 			Assert.fail();
-		} catch (DemoiselleException e) {
+		} catch (ConstraintViolationException e) {
 			Assert.assertTrue(e.getMessage().contains("Test Message"));
 		}
@@ -39,7 +39,6 @@ package message;
 import static junit.framework.Assert.assertEquals;
 import static junit.framework.Assert.assertTrue;
-import javax.enterprise.context.RequestScoped;
 import javax.inject.Inject;
 import junit.framework.Assert;
@@ -51,8 +50,7 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import test.Tests;
-import br.gov.frameworkdemoiselle.internal.context.ContextManager;
-import br.gov.frameworkdemoiselle.internal.context.ManagedContext;
+import br.gov.frameworkdemoiselle.context.RequestContext;
 import br.gov.frameworkdemoiselle.message.DefaultMessage;
 import br.gov.frameworkdemoiselle.message.Message;
 import br.gov.frameworkdemoiselle.message.MessageContext;
@@ -80,78 +78,92 @@ public class MessageContextTest {
 	@Test
 	public void testAddMessageWithoutParams() {
-		ContextManager.activate(ManagedContext.class, RequestScoped.class);
+		RequestContext context = Beans.getReference(RequestContext.class);
+		
+		context.activate();
 		Message message = new DefaultMessage("Menssage without param");
 		DummyMessageAppender appender = Beans.getReference(DummyMessageAppender.class);
 		messageContext.add(message);
 		assertEquals(appender.getMessages().size(), 1);
-		ContextManager.deactivate(ManagedContext.class, RequestScoped.class);
+		context.deactivate();
 	}
 	@Test
 	public void testAddMessageWithoutParamsIfSeverityIsInfo() {
-		ContextManager.activate(ManagedContext.class, RequestScoped.class);
+		RequestContext context = Beans.getReference(RequestContext.class);
+		
+		context.activate();
 		Message message = new DefaultMessage("Menssage without param");
 		DummyMessageAppender appender = Beans.getReference(DummyMessageAppender.class);
 		messageContext.add(message);
 		assertEquals(appender.getMessages().get(0).getSeverity(), SeverityType.INFO);
-		ContextManager.deactivate(ManagedContext.class, RequestScoped.class);
+		context.deactivate();
 	}
 	@Test
 	public void testAddMessageWitSeverityInfo() {
-		ContextManager.activate(ManagedContext.class, RequestScoped.class);
+		RequestContext context = Beans.getReference(RequestContext.class);
+		
+		context.activate();
 		Message message = new DefaultMessage("Menssage without param", SeverityType.INFO);
 		DummyMessageAppender appender = Beans.getReference(DummyMessageAppender.class);
 		messageContext.add(message);
 		assertEquals(appender.getMessages().get(0).getSeverity(), SeverityType.INFO);
-		ContextManager.deactivate(ManagedContext.class, RequestScoped.class);
+		context.deactivate();
 	}
 	@Test
 	public void testAddMessageWitSeverityWarn() {
-		ContextManager.activate(ManagedContext.class, RequestScoped.class);
+		RequestContext context = Beans.getReference(RequestContext.class);
+		
+		context.activate();
 		Message message = new DefaultMessage("Menssage without param", SeverityType.WARN);
 		DummyMessageAppender appender = Beans.getReference(DummyMessageAppender.class);
 		messageContext.add(message);
 		assertEquals(appender.getMessages().get(0).getSeverity(), SeverityType.WARN);
-		ContextManager.deactivate(ManagedContext.class, RequestScoped.class);
+		context.deactivate();
 	}
 	@Test
 	public void testAddMessageWitSeverityErro() {
-		ContextManager.activate(ManagedContext.class, RequestScoped.class);
+		RequestContext context = Beans.getReference(RequestContext.class);
+		
+		context.activate();
 		Message message = new DefaultMessage("Menssage without param", SeverityType.ERROR);
 		DummyMessageAppender appender = Beans.getReference(DummyMessageAppender.class);
 		messageContext.add(message);
 		assertEquals(appender.getMessages().get(0).getSeverity(), SeverityType.ERROR);
-		ContextManager.deactivate(ManagedContext.class, RequestScoped.class);
+		context.deactivate();
 	}
 	@Test
 	public void testRecoverStringMessageWithParams() {
-		ContextManager.activate(ManagedContext.class, RequestScoped.class);
+		RequestContext context = Beans.getReference(RequestContext.class);
+		
+		context.activate();
 		DummyMessageAppender appender = Beans.getReference(DummyMessageAppender.class);
 		messageContext.add("Message with {0} param", 1);
 		assertTrue(appender.getMessages().get(0).getText().equals("Message with 1 param"));
-		ContextManager.deactivate(ManagedContext.class, RequestScoped.class);
+		context.deactivate();
 	}
 	@Test
 	public void testRecoverMessageWithParams() {
-		ContextManager.activate(ManagedContext.class, RequestScoped.class);
+		RequestContext context = Beans.getReference(RequestContext.class);
+		
+		context.activate();
 		Message message = new DefaultMessage("Message with {0} param");
 		DummyMessageAppender appender = Beans.getReference(DummyMessageAppender.class);
 		messageContext.add(message, 1);
 		assertTrue(appender.getMessages().get(0).getText().equals("Message with 1 param"));
-		ContextManager.deactivate(ManagedContext.class, RequestScoped.class);
+		context.deactivate();
 	}
 	@Test
@@ -164,21 +176,25 @@ public class MessageContextTest {
 	@Test
 	public void testMessageParsedText() {
-		ContextManager.activate(ManagedContext.class, RequestScoped.class);
+		RequestContext context = Beans.getReference(RequestContext.class);
+		
+		context.activate();
 		Message MESSAGE_PARSED = new DefaultMessage("{MESSAGE_PARSED}");
 		String expected = "Message parsed";
 		String value = MESSAGE_PARSED.getText();
 		Assert.assertEquals(expected, value);
-		ContextManager.deactivate(ManagedContext.class, RequestScoped.class);
+		context.deactivate();
 	}
 	@Test
 	public void testMessageIsNull() {
-		ContextManager.activate(ManagedContext.class, RequestScoped.class);
+		RequestContext context = Beans.getReference(RequestContext.class);
+		
+		context.activate();
 		Message NULL_MESSAGE = new DefaultMessage(null);
 		String expected = null;
 		String value = NULL_MESSAGE.getText();
 		Assert.assertEquals(expected, value);
-		ContextManager.deactivate(ManagedContext.class, RequestScoped.class);
+		context.deactivate();
 	}
 }
@@ -38,7 +38,6 @@ package pagination;
 import static junit.framework.Assert.assertEquals;
-import javax.enterprise.context.SessionScoped;
 import javax.inject.Inject;
 import org.jboss.arquillian.container.test.api.Deployment;
@@ -51,11 +50,11 @@ import org.junit.runner.RunWith;
 import test.Tests;
 import transaction.defaultstrategy.TransactionDefaultTest;
+import br.gov.frameworkdemoiselle.context.SessionContext;
 import br.gov.frameworkdemoiselle.internal.configuration.PaginationConfig;
-import br.gov.frameworkdemoiselle.internal.context.ContextManager;
-import br.gov.frameworkdemoiselle.internal.context.ThreadLocalContext;
 import br.gov.frameworkdemoiselle.pagination.Pagination;
 import br.gov.frameworkdemoiselle.pagination.PaginationContext;
+import br.gov.frameworkdemoiselle.util.Beans;
 @RunWith(Arquillian.class)
 public class PaginationContextBasicTest {
@@ -96,13 +95,15 @@ public class PaginationContextBasicTest {
 	@Before
 	public void activeContext() {
-		ContextManager.activate(ThreadLocalContext.class, SessionScoped.class);
+		SessionContext context = Beans.getReference(SessionContext.class);
+		context.activate();
 		pagination = paginationContext.getPagination(DummyEntity.class, true);
 	}
 	@After
 	public void deactiveContext() {
-		ContextManager.deactivate(ThreadLocalContext.class, SessionScoped.class);
+		SessionContext context = Beans.getReference(SessionContext.class);
+		context.deactivate();
 	}
 	@Test
@@ -38,7 +38,6 @@ package pagination;
 import static org.junit.Assert.assertEquals;
-import javax.enterprise.context.SessionScoped;
 import javax.inject.Inject;
 import org.jboss.arquillian.container.test.api.Deployment;
@@ -51,10 +50,10 @@ import org.junit.runner.RunWith;
 import test.Tests;
 import transaction.defaultstrategy.TransactionDefaultTest;
-import br.gov.frameworkdemoiselle.internal.context.ContextManager;
-import br.gov.frameworkdemoiselle.internal.context.ThreadLocalContext;
+import br.gov.frameworkdemoiselle.context.SessionContext;
 import br.gov.frameworkdemoiselle.pagination.Pagination;
 import br.gov.frameworkdemoiselle.pagination.PaginationContext;
+import br.gov.frameworkdemoiselle.util.Beans;
 @RunWith(Arquillian.class)
 public class PaginationContextCache {
@@ -74,12 +73,14 @@ public class PaginationContextCache {
 	@Before
 	public void activeContext() {
-		ContextManager.activate(ThreadLocalContext.class, SessionScoped.class);
+		SessionContext context = Beans.getReference(SessionContext.class);
+		context.activate();
 	}
 	@After
 	public void deactiveContext() {
-		ContextManager.deactivate(ThreadLocalContext.class, SessionScoped.class);
+		SessionContext context = Beans.getReference(SessionContext.class);
+		context.deactivate();
 	}
 	@Test
@@ -38,7 +38,6 @@ package pagination;
 import static org.junit.Assert.assertNull;
-import javax.enterprise.context.SessionScoped;
 import javax.inject.Inject;
 import org.jboss.arquillian.container.test.api.Deployment;
@@ -51,10 +50,10 @@ import org.junit.runner.RunWith;
 import test.Tests;
 import transaction.defaultstrategy.TransactionDefaultTest;
-import br.gov.frameworkdemoiselle.internal.context.ContextManager;
-import br.gov.frameworkdemoiselle.internal.context.ThreadLocalContext;
+import br.gov.frameworkdemoiselle.context.SessionContext;
 import br.gov.frameworkdemoiselle.pagination.Pagination;
 import br.gov.frameworkdemoiselle.pagination.PaginationContext;
+import br.gov.frameworkdemoiselle.util.Beans;
 @RunWith(Arquillian.class)
 public class PaginationContextNullTest {
@@ -72,12 +71,14 @@ public class PaginationContextNullTest {
 	@Before
 	public void activeContext() {
-		ContextManager.activate(ThreadLocalContext.class, SessionScoped.class);
+		SessionContext context = Beans.getReference(SessionContext.class);
+		context.activate();
 	}
 	@After
 	public void deactiveContext() {
-		ContextManager.deactivate(ThreadLocalContext.class, SessionScoped.class);
+		SessionContext context = Beans.getReference(SessionContext.class);
+		context.deactivate();
 	}
 	@Test
@@ -36,7 +36,6 @@
  */
 package security.athentication.credentials;
-import javax.enterprise.context.RequestScoped;
 import javax.inject.Inject;
 import junit.framework.Assert;
@@ -48,8 +47,7 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import test.Tests;
-import br.gov.frameworkdemoiselle.internal.context.ContextManager;
-import br.gov.frameworkdemoiselle.internal.context.ThreadLocalContext;
+import br.gov.frameworkdemoiselle.context.RequestContext;
 import br.gov.frameworkdemoiselle.security.AuthenticationException;
 import br.gov.frameworkdemoiselle.security.SecurityContext;
 import br.gov.frameworkdemoiselle.util.Beans;
@@ -71,7 +69,8 @@ public class AcceptOrDenyCredentialsTest {
 	@Test
 	public void denyWrongCredentials() {
-		ContextManager.activate(ThreadLocalContext.class, RequestScoped.class);
+		RequestContext ctx = Beans.getReference(RequestContext.class);
+		ctx.activate();
 		Credentials credentials = Beans.getReference(Credentials.class);
 		credentials.setLogin("wronglogin");
@@ -84,14 +83,15 @@ public class AcceptOrDenyCredentialsTest {
 			//Erro esperado
 		}
 		finally{
-			ContextManager.deactivate(ThreadLocalContext.class, RequestScoped.class);
+			ctx.deactivate();
 		}
 	}
 	@Test
 	public void acceptRightCredentials() {
-		ContextManager.activate(ThreadLocalContext.class, RequestScoped.class);
+		RequestContext ctx = Beans.getReference(RequestContext.class);
+		ctx.activate();
 		Credentials credentials = Beans.getReference(Credentials.class);
 		credentials.setLogin("demoiselle");
@@ -103,7 +103,7 @@ public class AcceptOrDenyCredentialsTest {
 			Assert.fail("Authenticator negou credenciais corretas");
 		}
 		finally{
-			ContextManager.deactivate(ThreadLocalContext.class, RequestScoped.class);
+			ctx.deactivate();
 		}
 	}
@@ -42,7 +42,6 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
-import javax.enterprise.context.RequestScoped;
 import javax.inject.Inject;
 import org.jboss.arquillian.container.test.api.Deployment;
@@ -52,9 +51,9 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import test.Tests;
-import br.gov.frameworkdemoiselle.internal.context.ContextManager;
-import br.gov.frameworkdemoiselle.internal.context.ThreadLocalContext;
+import br.gov.frameworkdemoiselle.context.RequestContext;
 import br.gov.frameworkdemoiselle.security.SecurityContext;
+import br.gov.frameworkdemoiselle.util.Beans;
 import configuration.resource.ConfigurationResourceTest;
 @RunWith(Arquillian.class)
@@ -82,25 +81,27 @@ public class CustomAuthenticatorTest {
 	@Test
 	public void loginProcess() {
-		ContextManager.activate(ThreadLocalContext.class, RequestScoped.class);
+		RequestContext ctx = Beans.getReference(RequestContext.class);
+		ctx.activate();
 		context.login();
 		assertTrue(context.isLoggedIn());
 		assertNotNull(observer.getEvent());
 		assertEquals("demoiselle", context.getUser().getId());
-		ContextManager.deactivate(ThreadLocalContext.class, RequestScoped.class);
+		ctx.deactivate();
 	}
 	@Test
 	public void logoutProcess() {
-		ContextManager.activate(ThreadLocalContext.class, RequestScoped.class);
+		RequestContext ctx = Beans.getReference(RequestContext.class);
+		ctx.activate();
 		context.login();
 		context.logout();
 		assertFalse(context.isLoggedIn());
 		assertNull(context.getUser());
-		ContextManager.deactivate(ThreadLocalContext.class, RequestScoped.class);
+		ctx.deactivate();
 	}
 }
@@ -43,7 +43,6 @@ import static junit.framework.Assert.assertNull;
 import java.util.List;
-import javax.enterprise.context.RequestScoped;
 import javax.inject.Inject;
 import org.jboss.arquillian.container.test.api.Deployment;
@@ -55,8 +54,8 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import test.Tests;
-import br.gov.frameworkdemoiselle.internal.context.ContextManager;
-import br.gov.frameworkdemoiselle.internal.context.ManagedContext;
+import br.gov.frameworkdemoiselle.context.RequestContext;
+import br.gov.frameworkdemoiselle.util.Beans;
 @RunWith(Arquillian.class)
 public class TemplateTest {
@@ -83,7 +82,8 @@ public class TemplateTest {
 	@Before
 	public void initialize() {
-		ContextManager.activate(ManagedContext.class, RequestScoped.class);
+		RequestContext ctx = Beans.getReference(RequestContext.class);
+		ctx.activate();
 		this.crudImpl.resetEntities();
@@ -91,9 +91,8 @@ public class TemplateTest {
 	@After
 	public void finalize() {
-
-		ContextManager.deactivate(ManagedContext.class, RequestScoped.class);
-		
+		RequestContext ctx = Beans.getReference(RequestContext.class);
+		ctx.deactivate();
 	}
 	@Test
@@ -40,7 +40,6 @@ import static junit.framework.Assert.assertFalse;
 import static junit.framework.Assert.assertTrue;
 import static org.junit.Assert.fail;
-import javax.enterprise.context.RequestScoped;
 import javax.inject.Inject;
 import org.jboss.arquillian.container.test.api.Deployment;
@@ -52,9 +51,8 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import test.Tests;
-
-import br.gov.frameworkdemoiselle.internal.context.ContextManager;
-import br.gov.frameworkdemoiselle.internal.context.ManagedContext;
+import br.gov.frameworkdemoiselle.context.RequestContext;
+import br.gov.frameworkdemoiselle.util.Beans;
 @RunWith(Arquillian.class)
 public class TransactionRollbackTest {
@@ -76,12 +74,14 @@ public class TransactionRollbackTest {
 	@Before
 	public void activeContext() {
-		ContextManager.activate(ManagedContext.class, RequestScoped.class);
+		RequestContext ctx = Beans.getReference(RequestContext.class);
+		ctx.activate();
 	}
 	@After
 	public void deactiveContext() {
-		ContextManager.deactivate(ManagedContext.class, RequestScoped.class);
+		RequestContext ctx = Beans.getReference(RequestContext.class);
+		ctx.deactivate();
 	}
 	@Test
-<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Demoiselle Framework
+ Copyright (C) 2010 SERPRO
+ ============================================================================
+ This file is part of Demoiselle Framework.
+ 
+ Demoiselle Framework is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public License version 3
+ as published by the Free Software Foundation.
+ 
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ 
+ You should have received a copy of the GNU Lesser General Public License version 3
+ along with this program; if not,  see <http://www.gnu.org/licenses/>
+ or write to the Free Software Foundation, Inc., 51 Franklin Street,
+ Fifth Floor, Boston, MA  02110-1301, USA.
+ ============================================================================
+ Este arquivo é parte do Framework Demoiselle.
+ 
+ O Framework Demoiselle é um software livre; você pode redistribuí-lo e/ou
+ modificá-lo dentro dos termos da GNU LGPL versão 3 como publicada pela Fundação
+ do Software Livre (FSF).
+ 
+ Este programa é distribuído na esperança que possa ser útil, mas SEM NENHUMA
+ GARANTIA; sem uma garantia implícita de ADEQUAÇÃO a qualquer MERCADO ou
+ APLICAÇÃO EM PARTICULAR. Veja a Licença Pública Geral GNU/LGPL em português
+ para maiores detalhes.
+ 
+ Você deve ter recebido uma cópia da GNU LGPL versão 3, sob o título
+ "LICENCA.txt", junto com esse programa. Se não, acesse <http://www.gnu.org/licenses/>
+ ou escreva para a Fundação do Software Livre (FSF) Inc.,
+ 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA.
+-->
 <beans xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
-</beans>
 \ No newline at end of file
+
+</beans>
@@ -0,0 +1,56 @@
+/*
+ * 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.annotation;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.enterprise.context.NormalScope;
+
+@Inherited
+@Target({ METHOD, TYPE, FIELD })
+@Retention(RUNTIME)
+@NormalScope
+public @interface PersistenceScoped {
+
+}
@@ -52,7 +52,7 @@ import br.gov.frameworkdemoiselle.util.Strings;
 public class EntityManagerConfig implements Serializable {
 	private static final long serialVersionUID = 1L;
-
+	
 	/**
 	 * @deprecated
 	 */
@@ -62,6 +62,9 @@ public class EntityManagerConfig implements Serializable {
 	@Name("default.unit.name")
 	private String defaultPersistenceUnitName;
+	
+	@Name("entitymanager.scope")
+	private String entityManagerScope = "request";
 	/**
 	 * Getter for persistence unit name.
@@ -92,4 +95,16 @@ public class EntityManagerConfig implements Serializable {
 		return defaultPersistenceUnitName;
 	}
+
+	
+	public String getEntityManagerScope() {
+		return entityManagerScope;
+	}
+
+	
+	public void setEntityManagerScope(String entityManagerScope) {
+		this.entityManagerScope = entityManagerScope;
+	}
+	
+	
 }
@@ -0,0 +1,12 @@
+package br.gov.frameworkdemoiselle.internal.context;
+
+import java.lang.annotation.Annotation;
+
+
+public class PersistenceContext extends AbstractThreadLocalContext {
+
+	public PersistenceContext(Class<? extends Annotation> scope) {
+		super(scope);
+	}
+
+}
@@ -41,30 +41,37 @@ import javax.enterprise.inject.spi.AfterBeanDiscovery;
 import javax.enterprise.inject.spi.AfterDeploymentValidation;
 import javax.enterprise.inject.spi.Extension;
-import br.gov.frameworkdemoiselle.annotation.ViewScoped;
-import br.gov.frameworkdemoiselle.internal.context.ContextManager;
-import br.gov.frameworkdemoiselle.internal.context.ViewContext;
+import br.gov.frameworkdemoiselle.context.ViewContext;
+import br.gov.frameworkdemoiselle.internal.context.CustomContextProducer;
+import br.gov.frameworkdemoiselle.internal.context.FacesViewContextImpl;
 import br.gov.frameworkdemoiselle.lifecycle.AfterShutdownProccess;
+import br.gov.frameworkdemoiselle.util.Beans;
 public class JsfBootstrap implements Extension {
 	//private List<CustomContext> customContexts = new ArrayList<CustomContext>();
 	//private AfterBeanDiscovery afterBeanDiscoveryEvent;
-
-	public void storeContexts(@Observes final AfterBeanDiscovery event) {
-		//Registra o ViewContext para controlar o escopo ViewScoped.
-		ContextManager.initialize(event);
-		ContextManager.add(new ViewContext(), event);
+	
+	private FacesViewContextImpl context;
+	
+	public void createCustomContext(@Observes AfterBeanDiscovery event){
+		context = new FacesViewContextImpl();
+		event.addContext(context);
 	}
 	public void addContexts(@Observes final AfterDeploymentValidation event) {
+		CustomContextProducer producer = Beans.getReference(CustomContextProducer.class);
+		producer.addRegisteredContext(context);
+		
 		//Ativa o ViewContext
-		ContextManager.activate(ViewContext.class, ViewScoped.class);
+		ViewContext ctx = Beans.getReference(FacesViewContextImpl.class);
+		ctx.activate();
 	}
 	public void removeContexts(@Observes AfterShutdownProccess event) {
 		//Desativa o ViewContext
-		ContextManager.deactivate(ViewContext.class, ViewScoped.class);
+		ViewContext ctx = Beans.getReference(FacesViewContextImpl.class);
+		ctx.deactivate();
 	}
 }
@@ -0,0 +1,81 @@
+/*
+ * 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 java.util.Map;
+
+import javax.faces.component.UIViewRoot;
+import javax.faces.context.FacesContext;
+
+import br.gov.frameworkdemoiselle.annotation.Priority;
+import br.gov.frameworkdemoiselle.annotation.ViewScoped;
+import br.gov.frameworkdemoiselle.context.ViewContext;
+import br.gov.frameworkdemoiselle.util.Faces;
+
+/**
+ * 
+ * This {@link ViewContext} implementation uses a map provided
+ * by {@link UIViewRoot#getViewMap()} as a store. Any beans stored on
+ * this store are kept as long as the view is still active.
+ * 
+ * @author serpro
+ *
+ */
+@Priority(Priority.L2_PRIORITY)
+public class FacesViewContextImpl extends AbstractCustomContext implements ViewContext {
+
+	public FacesViewContextImpl() {
+		super(ViewScoped.class);
+	}
+	
+	@Override
+	protected boolean isStoreInitialized() {
+		return FacesContext.getCurrentInstance()!=null;
+	}
+
+	@Override
+	protected Store getStore() {
+		Map<String, Object> viewMap = Faces.getViewMap();
+		String key = Store.class.getName();
+
+		if (!viewMap.containsKey(key)) {
+			viewMap.put(key, createStore());
+		}
+
+		return (Store) viewMap.get(key);
+	}
+}
@@ -1,68 +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.context;
-
-import java.util.Map;
-
-import javax.faces.context.FacesContext;
-
-import br.gov.frameworkdemoiselle.annotation.ViewScoped;
-import br.gov.frameworkdemoiselle.util.Faces;
-
-public class ViewContext extends AbstractCustomContext {
-
-	public ViewContext() {
-		super(ViewScoped.class);
-	}
-	
-	@Override
-	protected boolean isStoreInitialized() {
-		return FacesContext.getCurrentInstance()!=null;
-	}
-
-	@Override
-	protected Store getStore() {
-		Map<String, Object> viewMap = Faces.getViewMap();
-		String key = Store.class.getName();
-
-		if (!viewMap.containsKey(key)) {
-			viewMap.put(key, createStore());
-		}
-
-		return (Store) viewMap.get(key);
-	}
-}
@@ -50,7 +50,7 @@ import br.gov.frameworkdemoiselle.annotation.Redirect;
 import br.gov.frameworkdemoiselle.internal.bootstrap.JsfBootstrap;
 import br.gov.frameworkdemoiselle.internal.configuration.ExceptionHandlerConfig;
 import br.gov.frameworkdemoiselle.internal.configuration.JsfSecurityConfig;
-import br.gov.frameworkdemoiselle.internal.context.ViewContext;
+import br.gov.frameworkdemoiselle.internal.context.FacesViewContextImpl;
 import br.gov.frameworkdemoiselle.internal.implementation.AbstractExceptionHandler;
 import br.gov.frameworkdemoiselle.internal.implementation.ApplicationExceptionHandler;
 import br.gov.frameworkdemoiselle.internal.implementation.ApplicationExceptionHandlerFactory;
@@ -103,7 +103,7 @@ public final class Tests {
 				.addClass(FileRenderer.class)
 				.addClass(JsfSecurityConfig.class)
 				.addClass(ExceptionHandlerConfig.class)
-				.addClass(ViewContext.class)
+				.addClass(FacesViewContextImpl.class)
 				.addClass(AuthorizationExceptionHandlerFactory.class)
 				.addClass(ApplicationExceptionHandler.class)
 				.addClass(FileRendererImpl.class)
@@ -71,6 +71,12 @@
 			<groupId>javax.transaction</groupId>
 			<artifactId>jta</artifactId>
 		</dependency>
+		
+		<dependency>
+			<groupId>org.hibernate</groupId>
+			<artifactId>hibernate-entitymanager</artifactId>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 	<repositories>
@@ -6,7 +6,7 @@ import static junit.framework.Assert.assertNull;
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
-import javax.persistence.TransactionRequiredException;
+import javax.transaction.TransactionRequiredException;
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
@@ -36,41 +36,35 @@
  */
 package br.gov.frameworkdemoiselle.internal.bootstrap;
-import javax.enterprise.context.ConversationScoped;
-import javax.enterprise.context.RequestScoped;
-import javax.enterprise.context.SessionScoped;
 import javax.enterprise.event.Observes;
-import javax.enterprise.inject.spi.AfterBeanDiscovery;
 import javax.enterprise.inject.spi.AfterDeploymentValidation;
 import javax.enterprise.inject.spi.Extension;
-import br.gov.frameworkdemoiselle.annotation.ViewScoped;
-import br.gov.frameworkdemoiselle.internal.context.ContextManager;
-import br.gov.frameworkdemoiselle.internal.context.ThreadLocalContext;
+import br.gov.frameworkdemoiselle.context.RequestContext;
+import br.gov.frameworkdemoiselle.context.SessionContext;
+import br.gov.frameworkdemoiselle.context.ViewContext;
 import br.gov.frameworkdemoiselle.lifecycle.AfterShutdownProccess;
+import br.gov.frameworkdemoiselle.util.Beans;
 public class SeBootstrap implements Extension {
-	public void storeContexts(@Observes final AfterBeanDiscovery event) {
-		ContextManager.initialize(event);
-		
-		ContextManager.add(new ThreadLocalContext(ViewScoped.class), event);
-		ContextManager.add(new ThreadLocalContext(SessionScoped.class), event);
-		ContextManager.add(new ThreadLocalContext(ConversationScoped.class), event);
-		ContextManager.add(new ThreadLocalContext(RequestScoped.class), event);
-	}
-
 	public void addContexts(@Observes final AfterDeploymentValidation event) {
-		ContextManager.activate(ThreadLocalContext.class, ViewScoped.class);
-		ContextManager.activate(ThreadLocalContext.class, SessionScoped.class);
-		ContextManager.activate(ThreadLocalContext.class, ConversationScoped.class);
-		ContextManager.activate(ThreadLocalContext.class, RequestScoped.class);
+		RequestContext requestContext = Beans.getReference(RequestContext.class);
+		SessionContext sessionContext = Beans.getReference(SessionContext.class);
+		ViewContext viewContext = Beans.getReference(ViewContext.class);
+		
+		requestContext.activate();
+		sessionContext.activate();
+		viewContext.activate();
 	}
 	public void removeContexts(@Observes AfterShutdownProccess event) {
-		ContextManager.deactivate(ThreadLocalContext.class, ViewScoped.class);
-		ContextManager.deactivate(ThreadLocalContext.class, SessionScoped.class);
-		ContextManager.deactivate(ThreadLocalContext.class, ConversationScoped.class);
-		ContextManager.deactivate(ThreadLocalContext.class, RequestScoped.class);
+		RequestContext requestContext = Beans.getReference(RequestContext.class);
+		SessionContext sessionContext = Beans.getReference(SessionContext.class);
+		ViewContext viewContext = Beans.getReference(ViewContext.class);
+		
+		requestContext.deactivate();
+		sessionContext.deactivate();
+		viewContext.deactivate();
 	}
 }
@@ -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.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,5 @@		@@ -0,0 +1,5 @@
	1	+package br.gov.frameworkdemoiselle.context;
	2	+
	3	+
	4	+public interface RequestContext extends CustomContext {
	5	+}
	@@ -0,0 +1,6 @@		@@ -0,0 +1,6 @@
		1	+package br.gov.frameworkdemoiselle.context;
		2	+
		3	+
		4	+
		5	+public interface SessionContext extends CustomContext {
		6	+}
0	\ No newline at end of file	7	\ No newline at end of file
@@ -0,0 +1,90 @@		@@ -0,0 +1,90 @@
	1	+package br.gov.frameworkdemoiselle.internal.bootstrap;
	2	+
	3	+import java.util.ArrayList;
	4	+import java.util.List;
	5	+
	6	+import javax.enterprise.event.Observes;
	7	+import javax.enterprise.inject.spi.AfterBeanDiscovery;
	8	+import javax.enterprise.inject.spi.AfterDeploymentValidation;
	9	+import javax.enterprise.inject.spi.Extension;
	10	+
	11	+import br.gov.frameworkdemoiselle.context.CustomContext;
	12	+import br.gov.frameworkdemoiselle.context.StaticContext;
	13	+import br.gov.frameworkdemoiselle.internal.context.CustomContextProducer;
	14	+import br.gov.frameworkdemoiselle.internal.context.RequestContextImpl;
	15	+import br.gov.frameworkdemoiselle.internal.context.SessionContextImpl;
	16	+import br.gov.frameworkdemoiselle.internal.context.StaticContextImpl;
	17	+import br.gov.frameworkdemoiselle.internal.context.ThreadLocalViewContextImpl;
	18	+import br.gov.frameworkdemoiselle.util.Beans;
	19	+
	20	+/**
	21	+ * This portable extension registers and starts custom contexts used by
	22	+ * the framework.
	23	+ *
	24	+ * @author serpro
	25	+ *
	26	+ */
	27	+public class CustomContextBootstrap implements Extension{
	28	+
	29	+ private List<CustomContext> contexts;
	30	+
	31	+ /*private Logger logger;
	32	+
	33	+ private transient ResourceBundle bundle;
	34	+
	35	+ private Logger getLogger() {
	36	+ if (this.logger == null) {
	37	+ this.logger = LoggerProducer.create(CoreBootstrap.class);
	38	+ }
	39	+
	40	+ return this.logger;
	41	+ }
	42	+
	43	+ private ResourceBundle getBundle() {
	44	+ if (bundle == null) {
	45	+ bundle = new ResourceBundle("demoiselle-core-bundle", Locale.getDefault());
	46	+ }
	47	+
	48	+ return bundle;
	49	+ }*/
	50	+
	51	+ public void initializeContexts(@Observes AfterBeanDiscovery event){
	52	+ //Cadastra os contextos contidos no demoiselle-core
	53	+ if (contexts==null \|\| contexts.isEmpty()){
	54	+ CustomContext ctx;
	55	+
	56	+ contexts = new ArrayList<CustomContext>();
	57	+
	58	+ ctx = new RequestContextImpl();
	59	+ contexts.add(ctx);
	60	+
	61	+ ctx = new SessionContextImpl();
	62	+ contexts.add(ctx);
	63	+
	64	+ ctx = new StaticContextImpl();
	65	+ contexts.add(ctx);
	66	+
	67	+ ctx = new ThreadLocalViewContextImpl();
	68	+ contexts.add(ctx);
	69	+
	70	+ for (CustomContext c : contexts){
	71	+ event.addContext(c);
	72	+ }
	73	+ }
	74	+
	75	+ //Ativa um contexto para gerenciar o StaticScope, um escopo criado para gerenciar classes de configuração.
	76	+ for (CustomContext ctx : contexts){
	77	+ if (ctx instanceof StaticContext){
	78	+ StaticContext staticContext = (StaticContext)ctx;
	79	+ staticContext.activate();
	80	+ break;
	81	+ }
	82	+ }
	83	+ }
	84	+
	85	+ public void storeContexts(@Observes AfterDeploymentValidation event){
	86	+ CustomContextProducer producer = Beans.getReference(CustomContextProducer.class);
	87	+ producer.addRegisteredContexts(contexts);
	88	+ }
	89	+
	90	+}
	@@ -39,20 +39,34 @@ package br.gov.frameworkdemoiselle.internal.context;		@@ -39,20 +39,34 @@ package br.gov.frameworkdemoiselle.internal.context;
39	import java.lang.annotation.Annotation;	39	import java.lang.annotation.Annotation;
40	import java.util.Collections;	40	import java.util.Collections;
41	import java.util.HashMap;	41	import java.util.HashMap;
		42	+import java.util.Locale;
42	import java.util.Map;	43	import java.util.Map;
43		44
44	import javax.enterprise.context.ContextNotActiveException;	45	import javax.enterprise.context.ContextNotActiveException;
		46	+import javax.enterprise.context.spi.Context;
45	import javax.enterprise.context.spi.Contextual;	47	import javax.enterprise.context.spi.Contextual;
46	import javax.enterprise.context.spi.CreationalContext;	48	import javax.enterprise.context.spi.CreationalContext;
47	import javax.enterprise.inject.spi.Bean;	49	import javax.enterprise.inject.spi.Bean;
		50	+import javax.enterprise.inject.spi.BeanManager;
		51	+
		52	+import org.slf4j.Logger;
		53	+
		54	+import br.gov.frameworkdemoiselle.context.CustomContext;
		55	+import br.gov.frameworkdemoiselle.internal.producer.LoggerProducer;
		56	+import br.gov.frameworkdemoiselle.util.Beans;
		57	+import br.gov.frameworkdemoiselle.util.ResourceBundle;
48		58
49	public abstract class AbstractCustomContext implements CustomContext {	59	public abstract class AbstractCustomContext implements CustomContext {
50		60
51	private boolean active;	61	private boolean active;
52		62
53	private final Class<? extends Annotation> scope;	63	private final Class<? extends Annotation> scope;
		64	+
		65	+ private Logger logger;
		66	+
		67	+ private transient ResourceBundle bundle;
54		68
55	- public AbstractCustomContext(final Class<? extends Annotation> scope) {	69	+ AbstractCustomContext(final Class<? extends Annotation> scope) {
56	this.scope = scope;	70	this.scope = scope;
57	this.active = false;	71	this.active = false;
58	}	72	}
	@@ -97,14 +111,44 @@ public abstract class AbstractCustomContext implements CustomContext {		@@ -97,14 +111,44 @@ public abstract class AbstractCustomContext implements CustomContext {
97	return this.active;	111	return this.active;
98	}	112	}
99		113
100	- public void setActive(boolean active) {
101	- if (!active && this.active) {
102	- // Limpando contexto	114	+ @Override
		115	+ public boolean activate() {
		116	+ if (!this.active){
		117	+ BeanManager beanManager = Beans.getBeanManager();
		118	+ if (beanManager!=null){
		119	+ try{
		120	+ Context ctx = beanManager.getContext(this.getScope());
		121	+ if (ctx!=null){
		122	+ getLogger().debug( getBundle().getString("custom-context-already-activated" , this.getClass().getCanonicalName() , this.getScope().getSimpleName() , ctx.getClass().getCanonicalName() ) );
		123	+ }
		124	+ }
		125	+ catch(ContextNotActiveException ce){
		126	+ this.active = true;
		127	+ getLogger().debug( getBundle().getString("custom-context-was-activated" , this.getClass().getCanonicalName() , this.getScope().getSimpleName() ) );
		128	+ }
		129	+ }
		130	+ else{
		131	+ this.active = true;
		132	+ getLogger().debug( getBundle().getString("custom-context-was-activated" , this.getClass().getCanonicalName() , this.getScope().getSimpleName() ) );
		133	+ }
		134	+ }
		135	+
		136	+ return this.active;
		137	+ }
		138	+
		139	+ @Override
		140	+ public void deactivate(){
		141	+ if (this.active){
103	if (isStoreInitialized()){	142	if (isStoreInitialized()){
104	getStore().clear();	143	getStore().clear();
105	}	144	}
		145	+
		146	+ this.active = false;
		147	+
		148	+ Logger logger = getLogger();
		149	+ ResourceBundle bundle = getBundle();
		150	+ logger.debug( bundle.getString("custom-context-was-deactivated" , this.getClass().getCanonicalName() , this.getScope().getSimpleName() ) );
106	}	151	}
107	- this.active = active;
108	}	152	}
109		153
110	@Override	154	@Override
	@@ -115,6 +159,22 @@ public abstract class AbstractCustomContext implements CustomContext {		@@ -115,6 +159,22 @@ public abstract class AbstractCustomContext implements CustomContext {
115	protected static Store createStore() {	159	protected static Store createStore() {
116	return new Store();	160	return new Store();
117	}	161	}
		162	+
		163	+ private ResourceBundle getBundle(){
		164	+ if (bundle==null){
		165	+ bundle = new ResourceBundle("demoiselle-core-bundle", Locale.getDefault());
		166	+ }
		167	+
		168	+ return bundle;
		169	+ }
		170	+
		171	+ private Logger getLogger(){
		172	+ if (logger==null){
		173	+ logger = LoggerProducer.create(this.getClass());
		174	+ }
		175	+
		176	+ return logger;
		177	+ }
118		178
119	static class Store {	179	static class Store {
120		180
@@ -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	+package br.gov.frameworkdemoiselle.internal.context;
	38	+
	39	+import java.lang.annotation.Annotation;
	40	+
	41	+import br.gov.frameworkdemoiselle.annotation.Priority;
	42	+import br.gov.frameworkdemoiselle.annotation.StaticScoped;
	43	+import br.gov.frameworkdemoiselle.configuration.Configuration;
	44	+
	45	+/**
	46	+ *
	47	+ * <p>This context has a unified static store that keeps all scoped beans available
	48	+ * to all threads of an application. It is intended to keep beans avaliable to
	49	+ * long lasting scopes (like the Session scope and Application scope) on environments
	50	+ * that lack those scopes by default (like desktop Swing applications).</p>
	51	+ *
	52	+ * <p>This context also keeps beans of the custom {@link StaticScoped} scope, like the beans
	53	+ * annotated with {@link Configuration}.</p>
	54	+ *
	55	+ * @author serpro
	56	+ *
	57	+ */
	58	+@Priority(Priority.MIN_PRIORITY)
	59	+public abstract class AbstractStaticContext extends AbstractCustomContext {
	60	+
	61	+ private final static Store store = createStore();
	62	+
	63	+ /**
	64	+ * Constructs this context to control the provided scope
	65	+ */
	66	+ AbstractStaticContext(Class<? extends Annotation> scope) {
	67	+ super(scope);
	68	+ }
	69	+
	70	+ @Override
	71	+ protected Store getStore() {
	72	+ return store;
	73	+ }
	74	+
	75	+ @Override
	76	+ protected boolean isStoreInitialized() {
	77	+ return store!=null;
	78	+ }
	79	+}
@@ -0,0 +1,81 @@		@@ -0,0 +1,81 @@
	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	+ * This context keeps a separated store for beans for each running thread. It is intended
	55	+ * to keep beans of short lived scopes like the Request scope, on environments that lack
	56	+ * those scopes by default.
	57	+ *
	58	+ * @author serpro
	59	+ */
	60	+public abstract class AbstractThreadLocalContext extends AbstractCustomContext {
	61	+
	62	+ private final ThreadLocal<Store> threadLocal = new ThreadLocal<Store>();
	63	+
	64	+ AbstractThreadLocalContext(final Class<? extends Annotation> scope) {
	65	+ super(scope);
	66	+ }
	67	+
	68	+ @Override
	69	+ protected boolean isStoreInitialized() {
	70	+ return threadLocal.get()!=null;
	71	+ }
	72	+
	73	+ @Override
	74	+ protected Store getStore() {
	75	+ if (this.threadLocal.get() == null) {
	76	+ this.threadLocal.set(createStore());
	77	+ }
	78	+
	79	+ return this.threadLocal.get();
	80	+ }
	81	+}
	@@ -1,360 +0,0 @@	@@ -1,360 +0,0 @@
1	-/*
2	- * Demoiselle Framework
3	- * Copyright (C) 2010 SERPRO
4	- * ----------------------------------------------------------------------------
5	- * This file is part of Demoiselle Framework.
6	- *
7	- * Demoiselle Framework is free software; you can redistribute it and/or
8	- * modify it under the terms of the GNU Lesser General Public License version 3
9	- * as published by the Free Software Foundation.
10	- *
11	- * This program is distributed in the hope that it will be useful,
12	- * but WITHOUT ANY WARRANTY; without even the implied warranty of
13	- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14	- * GNU General Public License for more details.
15	- *
16	- * You should have received a copy of the GNU Lesser General Public License version 3
17	- * along with this program; if not, see <http://www.gnu.org/licenses/>
18	- * or write to the Free Software Foundation, Inc., 51 Franklin Street,
19	- * Fifth Floor, Boston, MA 02110-1301, USA.
20	- * ----------------------------------------------------------------------------
21	- * Este arquivo é parte do Framework Demoiselle.
22	- *
23	- * O Framework Demoiselle é um software livre; você pode redistribuí-lo e/ou
24	- * modificá-lo dentro dos termos da GNU LGPL versão 3 como publicada pela Fundação
25	- * do Software Livre (FSF).
26	- *
27	- * Este programa é distribuído na esperança que possa ser útil, mas SEM NENHUMA
28	- * GARANTIA; sem uma garantia implícita de ADEQUAÇÃO a qualquer MERCADO ou
29	- * APLICAÇÃO EM PARTICULAR. Veja a Licença Pública Geral GNU/LGPL em português
30	- * para maiores detalhes.
31	- *
32	- * Você deve ter recebido uma cópia da GNU LGPL versão 3, sob o título
33	- * "LICENCA.txt", junto com esse programa. Se não, acesse <http://www.gnu.org/licenses/>
34	- * ou escreva para a Fundação do Software Livre (FSF) Inc.,
35	- * 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA.
36	- */
37	-package br.gov.frameworkdemoiselle.internal.context;
38	-
39	-import java.lang.annotation.Annotation;
40	-import java.util.ArrayList;
41	-import java.util.Collections;
42	-import java.util.HashMap;
43	-import java.util.List;
44	-import java.util.Locale;
45	-import java.util.Map;
46	-
47	-import javax.enterprise.context.ContextNotActiveException;
48	-import javax.enterprise.context.spi.Context;
49	-import javax.enterprise.inject.spi.AfterBeanDiscovery;
50	-import javax.enterprise.inject.spi.BeanManager;
51	-
52	-import org.slf4j.Logger;
53	-
54	-import br.gov.frameworkdemoiselle.DemoiselleException;
55	-import br.gov.frameworkdemoiselle.annotation.StaticScoped;
56	-import br.gov.frameworkdemoiselle.internal.producer.LoggerProducer;
57	-import br.gov.frameworkdemoiselle.util.Beans;
58	-import br.gov.frameworkdemoiselle.util.ResourceBundle;
59	-
60	-/**
61	- * <p>
62	- * Manage custom contexts relevant to Demoiselle operations.
63	- * </p>
64	- * <p>
65	- * When starting, the ContextManager must be initialized by calling {@link #initialize(AfterBeanDiscovery event)} inside
66	- * any methods observing the {@link AfterBeanDiscovery} event. Upon initialization a {@link StaticContext} will be
67	- * created to handle {@link StaticScoped} beans (but not activated, you must call
68	- * {@link #activate(Class customContextClass, Class scope)} to activate this context).
69	- * </p>
70	- * <p>
71	- * If an extension wants to manage another custom context, it must first call
72	- * {@link #add(CustomContext context, AfterBeanDiscovery event)} to add it's context to the list of managed contexts and
73	- * then call {@link #activate(Class customContextClass, Class scope)} whenever it wants to activate this added context
74	- * (contexts added through the {@link #add(CustomContext context, AfterBeanDiscovery event)} method are also not
75	- * activated upon adding).
76	- * </p>
77	- *
78	- * @author SERPRO
79	- */
80	-public final class ContextManager {
81	-
82	- private static final Map<ClassLoader, List<CustomContextCounter>> contextsCache = Collections
83	- .synchronizedMap(new HashMap<ClassLoader, List<CustomContextCounter>>());
84	-
85	- private static final Map<ClassLoader, Boolean> initializedCache = Collections
86	- .synchronizedMap(new HashMap<ClassLoader, Boolean>());
87	-
88	- private ContextManager() {
89	- }
90	-
91	- private synchronized static List<CustomContextCounter> getContexts() {
92	- List<CustomContextCounter> contexts = contextsCache.get(getCurrentClassLoader());
93	-
94	- if (contexts == null) {
95	- contexts = Collections.synchronizedList(new ArrayList<CustomContextCounter>());
96	- contextsCache.put(getCurrentClassLoader(), contexts);
97	- }
98	-
99	- return contexts;
100	- }
101	-
102	- private synchronized static boolean isInitialized() {
103	- Boolean initialized = initializedCache.get(getCurrentClassLoader());
104	-
105	- if (initialized == null) {
106	- initialized = false;
107	- initializedCache.put(getCurrentClassLoader(), initialized);
108	- }
109	-
110	- return initialized;
111	- }
112	-
113	- private static void setInitialized(boolean initialized) {
114	- initializedCache.put(getCurrentClassLoader(), initialized);
115	- }
116	-
117	- private static ClassLoader getCurrentClassLoader() {
118	- return Thread.currentThread().getContextClassLoader();
119	- }
120	-
121	- /**
122	- * <p>
123	- * Initializes this manager and adds the {@link StaticContext} context to the list of managed contexts. Other
124	- * contexts must be added before they can be activated.
125	- * </p>
126	- * <p>
127	- * It's OK to call this method multiple times, it will be initialized only once.
128	- * </p>
129	- *
130	- * @param event
131	- * The CDI event indicating all beans have been discovered.
132	- */
133	- public static void initialize(AfterBeanDiscovery event) {
134	- if (isInitialized()) {
135	- return;
136	- }
137	-
138	- add(new StaticContext(), event);
139	- setInitialized(true);
140	- }
141	-
142	- /**
143	- * <p>
144	- * Adds a context to the list of managed contexts.
145	- * </p>
146	- * <p>
147	- * A context added through this method will be deactivated before management can start. Only after calling
148	- * {@link #activate(Class customContextClass, Class scope)} the context will be activated.
149	- * </p>
150	- * <p>
151	- * Trying to add a context already managed will result in this method call being ignored.
152	- * </p>
153	- *
154	- * @param context
155	- * The context to be added
156	- * @param event
157	- * The CDI event indicating all beans have been discovered.
158	- */
159	- public static void add(CustomContext context, AfterBeanDiscovery event) {
160	- for (CustomContextCounter contextCounter : getContexts()) {
161	- if (contextCounter.isSame(context.getClass(), context.getScope())) {
162	-
163	- ContextManager.getLogger().trace(
164	- ContextManager.getBundle().getString("bootstrap-context-already-managed",
165	- context.getClass().getCanonicalName(), context.getScope().getCanonicalName()));
166	-
167	- return;
168	- }
169	- }
170	-
171	- ContextManager.getLogger().trace(
172	- ContextManager.getBundle().getString("bootstrap-context-added", context.getClass().getCanonicalName(),
173	- context.getScope().getCanonicalName()));
174	-
175	- context.setActive(false);
176	- event.addContext(context);
177	- getContexts().add(new CustomContextCounter(context));
178	- }
179	-
180	- /**
181	- * <p>
182	- * Activates a managed context.
183	- * </p>
184	- * <p>
185	- * To be activated, a context must fulfill the following requisites:
186	- * <ul>
187	- * <li>Must be managed by this class (be of type {@link StaticScoped} or be added with
188	- * {@link #add(CustomContext context, AfterBeanDiscovery event)})</li>
189	- * <li>Must be of a scope not already attached to another active context</li>
190	- * </ul>
191	- * </p>
192	- *
193	- * @param customContextClass
194	- * Type of context to activate
195	- * @param scope
196	- * The scope to activate this context for
197	- * @return <code>true</code> if there is a managed context of the provided type and scope and no other context is
198	- * active for the provided scope, <code>false</code> if there is a managed context of the provided type and
199	- * scope but another context is active for the provided scope.
200	- * @throws DemoiselleException
201	- * if there is no managed context of the provided type and scope.
202	- */
203	- public static synchronized void activate(Class<? extends CustomContext> customContextClass,
204	- Class<? extends Annotation> scope) {
205	- if (!isInitialized()) {
206	- throw new DemoiselleException(getBundle().getString("custom-context-manager-not-initialized"));
207	- }
208	-
209	- for (CustomContextCounter context : getContexts()) {
210	- if (context.isSame(customContextClass, scope)) {
211	- context.activate();
212	- return;
213	- }
214	- }
215	-
216	- throw new DemoiselleException(getBundle().getString("custom-context-not-found",
217	- customContextClass.getCanonicalName(), scope.getSimpleName()));
218	- }
219	-
220	- /**
221	- * <p>
222	- * Deactivates a managed context.
223	- * </p>
224	- * <p>
225	- * To be deactivated, a context must fulfill the following requisites:
226	- * <ul>
227	- * <li>Must be managed by this class (be of type {@link StaticScoped} or be added with
228	- * {@link #add(CustomContext context, AfterBeanDiscovery event)})</li>
229	- * <li>Must have been activated by a previous call to {@link #activate(Class customContextClass, Class scope)}</li>
230	- * <li>This previous call must have returned <code>true</code>.
231	- * </ul>
232	- * </p>
233	- *
234	- * @param customContextClass
235	- * Type of context to deactivate
236	- * @param scope
237	- * The scope the context controled when it was active
238	- * @return <code>true</code> if there was an active context of this type and scope and it was activated by a
239	- * previous call to {@link #activate(Class customContextClass, Class scope)}
240	- * @throws DemoiselleException
241	- * if there is no managed context of the provided type and scope.
242	- */
243	- public static synchronized void deactivate(Class<? extends CustomContext> customContextClass,
244	- Class<? extends Annotation> scope) {
245	- if (!isInitialized()) {
246	- throw new DemoiselleException(getBundle().getString("custom-context-manager-not-initialized"));
247	- }
248	-
249	- for (CustomContextCounter context : getContexts()) {
250	- if (context.isSame(customContextClass, scope)) {
251	- context.deactivate();
252	- return;
253	- }
254	- }
255	-
256	- throw new DemoiselleException(getBundle().getString("custom-context-not-found",
257	- customContextClass.getCanonicalName(), scope.getSimpleName()));
258	- }
259	-
260	- /**
261	- * <p>
262	- * This method should be called when the application is shutting down.
263	- * </p>
264	- */
265	- public static synchronized void shutdown() {
266	- for (CustomContextCounter context : getContexts()) {
267	- context.shutdown();
268	- }
269	-
270	- getContexts().clear();
271	- setInitialized(false);
272	- }
273	-
274	- static Logger getLogger() {
275	- return LoggerProducer.create(ContextManager.class);
276	- }
277	-
278	- static ResourceBundle getBundle() {
279	- return new ResourceBundle("demoiselle-core-bundle", Locale.getDefault());
280	- }
281	-}
282	-
283	-/**
284	- * Class that counts how many attemps to activate and deactivate this context received, avoiding cases where one client
285	- * activates given context and another one deactivates it, leaving the first client with no active context before
286	- * completion.
287	- *
288	- * @author serpro
289	- */
290	-class CustomContextCounter {
291	-
292	- private CustomContext context;
293	-
294	- private int activationCounter = 0;
295	-
296	- public CustomContextCounter(CustomContext customContext) {
297	- this.context = customContext;
298	- }
299	-
300	- public boolean isSame(Class<? extends CustomContext> customContextClass, Class<? extends Annotation> scope) {
301	- if (context.getClass().getCanonicalName().equals(customContextClass.getCanonicalName())
302	- && context.getScope().equals(scope)) {
303	- return true;
304	- }
305	-
306	- return false;
307	- }
308	-
309	- public CustomContext getInternalContext() {
310	- return this.context;
311	- }
312	-
313	- public void setInternalContext(CustomContext context) {
314	- this.context = context;
315	- }
316	-
317	- public synchronized void activate() {
318	- try {
319	- BeanManager beanManager = Beans.getReference(BeanManager.class);
320	- Context c = beanManager.getContext(context.getScope());
321	-
322	- if (c == context) {
323	- activationCounter++;
324	- } else {
325	- ContextManager.getLogger().trace(
326	- ContextManager.getBundle().getString("custom-context-already-activated",
327	- context.getClass().getCanonicalName(), c.getScope().getCanonicalName(),
328	- c.getClass().getCanonicalName()));
329	- }
330	- } catch (ContextNotActiveException ce) {
331	- context.setActive(true);
332	- activationCounter++;
333	- ContextManager.getLogger().trace(
334	- ContextManager.getBundle().getString("custom-context-was-activated",
335	- context.getClass().getCanonicalName(), context.getScope().getCanonicalName()));
336	- }
337	- }
338	-
339	- public synchronized void deactivate() {
340	- try {
341	- Context c = Beans.getBeanManager().getContext(context.getScope());
342	- if (c == context) {
343	- activationCounter--;
344	- if (activationCounter == 0) {
345	- context.setActive(false);
346	- ContextManager.getLogger().trace(
347	- ContextManager.getBundle().getString("custom-context-was-deactivated",
348	- context.getClass().getCanonicalName(), context.getScope().getCanonicalName()));
349	- }
350	- }
351	- } catch (ContextNotActiveException ce) {
352	- }
353	- }
354	-
355	- public synchronized void shutdown() {
356	- context.setActive(false);
357	- context = null;
358	- activationCounter = 0;
359	- }
360	-}
	@@ -1,45 +0,0 @@	@@ -1,45 +0,0 @@
1	-/*
2	- * Demoiselle Framework
3	- * Copyright (C) 2010 SERPRO
4	- * ----------------------------------------------------------------------------
5	- * This file is part of Demoiselle Framework.
6	- *
7	- * Demoiselle Framework is free software; you can redistribute it and/or
8	- * modify it under the terms of the GNU Lesser General Public License version 3
9	- * as published by the Free Software Foundation.
10	- *
11	- * This program is distributed in the hope that it will be useful,
12	- * but WITHOUT ANY WARRANTY; without even the implied warranty of
13	- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14	- * GNU General Public License for more details.
15	- *
16	- * You should have received a copy of the GNU Lesser General Public License version 3
17	- * along with this program; if not, see <http://www.gnu.org/licenses/>
18	- * or write to the Free Software Foundation, Inc., 51 Franklin Street,
19	- * Fifth Floor, Boston, MA 02110-1301, USA.
20	- * ----------------------------------------------------------------------------
21	- * Este arquivo é parte do Framework Demoiselle.
22	- *
23	- * O Framework Demoiselle é um software livre; você pode redistribuí-lo e/ou
24	- * modificá-lo dentro dos termos da GNU LGPL versão 3 como publicada pela Fundação
25	- * do Software Livre (FSF).
26	- *
27	- * Este programa é distribuído na esperança que possa ser útil, mas SEM NENHUMA
28	- * GARANTIA; sem uma garantia implícita de ADEQUAÇÃO a qualquer MERCADO ou
29	- * APLICAÇÃO EM PARTICULAR. Veja a Licença Pública Geral GNU/LGPL em português
30	- * para maiores detalhes.
31	- *
32	- * Você deve ter recebido uma cópia da GNU LGPL versão 3, sob o título
33	- * "LICENCA.txt", junto com esse programa. Se não, acesse <http://www.gnu.org/licenses/>
34	- * ou escreva para a Fundação do Software Livre (FSF) Inc.,
35	- * 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA.
36	- */
37	-package br.gov.frameworkdemoiselle.internal.context;
38	-
39	-import javax.enterprise.context.spi.Context;
40	-
41	-public interface CustomContext extends Context {
42	-
43	- void setActive(boolean active);
44	-
45	-}
@@ -0,0 +1,160 @@		@@ -0,0 +1,160 @@
	1	+package br.gov.frameworkdemoiselle.internal.context;
	2	+
	3	+import java.util.ArrayList;
	4	+import java.util.Collection;
	5	+import java.util.List;
	6	+import java.util.Locale;
	7	+
	8	+import javax.annotation.PreDestroy;
	9	+import javax.enterprise.context.ApplicationScoped;
	10	+import javax.enterprise.inject.Produces;
	11	+import javax.enterprise.inject.spi.InjectionPoint;
	12	+
	13	+import org.slf4j.Logger;
	14	+
	15	+import br.gov.frameworkdemoiselle.context.CustomContext;
	16	+import br.gov.frameworkdemoiselle.context.RequestContext;
	17	+import br.gov.frameworkdemoiselle.context.SessionContext;
	18	+import br.gov.frameworkdemoiselle.context.StaticContext;
	19	+import br.gov.frameworkdemoiselle.context.ViewContext;
	20	+import br.gov.frameworkdemoiselle.internal.bootstrap.CustomContextBootstrap;
	21	+import br.gov.frameworkdemoiselle.internal.implementation.StrategySelector;
	22	+import br.gov.frameworkdemoiselle.internal.producer.LoggerProducer;
	23	+import br.gov.frameworkdemoiselle.util.ResourceBundle;
	24	+
	25	+/**
	26	+ * Produces instances of {@link CustomContext} to control contexts not active
	27	+ * by the container
	28	+ *
	29	+ * @author serpro
	30	+ *
	31	+ */
	32	+@ApplicationScoped
	33	+public class CustomContextProducer {
	34	+
	35	+ private Logger logger;
	36	+
	37	+ private transient ResourceBundle bundle;
	38	+
	39	+ private List<CustomContext> contexts = new ArrayList<CustomContext>();
	40	+
	41	+ /**
	42	+ * Store a list of contexts into this producer. The contexts must have
	43	+ * been registered into CDI by a portable extension, this method will not do this.
	44	+ *
	45	+ */
	46	+ public void addRegisteredContexts(Collection<CustomContext> contexts){
	47	+ for (CustomContext context : contexts){
	48	+ addRegisteredContext(context);
	49	+ }
	50	+ }
	51	+
	52	+ /**
	53	+ * Store a context into this producer. The context must have
	54	+ * been registered into CDI by a portable extension, this method will not do this.
	55	+ *
	56	+ */
	57	+ public void addRegisteredContext(CustomContext context){
	58	+ Logger logger = getLogger();
	59	+ ResourceBundle bundle = getBundle();
	60	+
	61	+ if (!contexts.contains(context)){
	62	+ contexts.add(context);
	63	+ logger.debug( bundle.getString("bootstrap-context-added", context.getClass().getCanonicalName() , context.getScope().getSimpleName() ) );
	64	+ }
	65	+ else{
	66	+ logger.debug( bundle.getString("bootstrap-context-already-managed", context.getClass().getCanonicalName() , context.getScope().getSimpleName() ) );
	67	+ }
	68	+ }
	69	+
	70	+ /**
	71	+ * Deactivates all registered contexts and clear the context collection
	72	+ */
	73	+ @PreDestroy
	74	+ public void closeContexts(){
	75	+ //Desativa todos os contextos registrados.
	76	+ for (CustomContext context : contexts){
	77	+ context.deactivate();
	78	+ }
	79	+
	80	+ contexts.clear();
	81	+ }
	82	+
	83	+ @Produces
	84	+ public RequestContext getRequestContext(InjectionPoint ip , CustomContextBootstrap extension){
	85	+ return getContext(ip, extension);
	86	+ }
	87	+
	88	+ @Produces
	89	+ public SessionContext getSessionContext(InjectionPoint ip , CustomContextBootstrap extension){
	90	+ return getContext(ip, extension);
	91	+ }
	92	+
	93	+ @Produces
	94	+ public ViewContext getViewContext(InjectionPoint ip , CustomContextBootstrap extension){
	95	+ return getContext(ip, extension);
	96	+ }
	97	+
	98	+ @Produces
	99	+ public StaticContext getStaticContext(InjectionPoint ip , CustomContextBootstrap extension){
	100	+ return getContext(ip, extension);
	101	+ }
	102	+
	103	+
	104	+ @SuppressWarnings("unchecked")
	105	+ private <T extends CustomContext> T getContext(InjectionPoint ip , CustomContextBootstrap extension){
	106	+ T producedContext = null;
	107	+
	108	+ if (ip!=null){
	109	+ Class<T> beanClass = (Class<T>) ip.getType();
	110	+ producedContext = (T) getContext(beanClass);
	111	+ }
	112	+
	113	+ if (producedContext!=null){
	114	+ getLogger().debug( getBundle().getString("custom-context-selected" , producedContext.getClass().getCanonicalName()) );
	115	+ }
	116	+
	117	+ return producedContext;
	118	+ }
	119	+
	120	+ private CustomContext getContext(Class<? extends CustomContext> contextClass){
	121	+ CustomContext producedContext = null;
	122	+
	123	+ ArrayList<CustomContext> selectableContexts = new ArrayList<CustomContext>();
	124	+
	125	+ for (CustomContext context : contexts){
	126	+ if ( contextClass.isAssignableFrom( context.getClass() ) ){
	127	+ if (context.isActive()){
	128	+ producedContext = context;
	129	+ break;
	130	+ }
	131	+ else{
	132	+ selectableContexts.add(context);
	133	+ }
	134	+ }
	135	+ }
	136	+
	137	+ if (producedContext==null && !selectableContexts.isEmpty()){
	138	+ producedContext = StrategySelector.selectInstance(CustomContext.class, selectableContexts);
	139	+ }
	140	+
	141	+ return producedContext;
	142	+ }
	143	+
	144	+ private Logger getLogger() {
	145	+ if (this.logger == null) {
	146	+ this.logger = LoggerProducer.create(this.getClass());
	147	+ }
	148	+
	149	+ return this.logger;
	150	+ }
	151	+
	152	+ private ResourceBundle getBundle() {
	153	+ if (bundle == null) {
	154	+ bundle = new ResourceBundle("demoiselle-core-bundle", Locale.getDefault());
	155	+ }
	156	+
	157	+ return bundle;
	158	+ }
	159	+
	160	+}