From c417ac14c2db651439c799d977603db63c820e63 Mon Sep 17 00:00:00 2001
From: Dancovich <danilo.viana@serpro.gov.br>
Date: Tue, 17 Sep 2013 10:55:03 -0300
Subject: [PATCH] Removida a anotação @Alternative dos contextos personalizados, ao invés disso eles são vetados na portable extension para não conflitar com o produtor.

---
 impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/bootstrap/CustomContextBootstrap.java         | 8 ++++++++
 impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/context/StaticContextImpl.java                | 3 ---
 impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/context/TemporaryConversationContextImpl.java | 2 --
 impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/context/TemporaryRequestContextImpl.java      | 2 --
 impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/context/TemporarySessionContextImpl.java      | 2 --
 impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/context/TemporaryViewContextImpl.java         | 3 ---
 impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/internal/context/FacesViewContextImpl.java    | 2 --
 7 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/bootstrap/CustomContextBootstrap.java b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/bootstrap/CustomContextBootstrap.java
index 464699c..eddc6ff 100644
--- a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/bootstrap/CustomContextBootstrap.java
+++ b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/bootstrap/CustomContextBootstrap.java
@@ -6,6 +6,7 @@ import java.util.List;
 import javax.enterprise.event.Observes;
 import javax.enterprise.inject.spi.AfterBeanDiscovery;
 import javax.enterprise.inject.spi.Extension;
+import javax.enterprise.inject.spi.ProcessAnnotatedType;
 
 import br.gov.frameworkdemoiselle.context.CustomContext;
 import br.gov.frameworkdemoiselle.context.StaticContext;
@@ -26,6 +27,13 @@ public class CustomContextBootstrap implements Extension{
 	
 	private List<CustomContext> contexts;
 	
+	public <T extends CustomContext> void vetoCustomContexts(@Observes ProcessAnnotatedType<T> event){
+		//Veta os subtipos de CustomContext, para que não conflitem com o produtor de contextos personalizados. 
+		if( CustomContext.class.isAssignableFrom( event.getAnnotatedType().getJavaClass() )){
+			event.veto();
+		}
+	}
+	
 	public void initializeContexts(@Observes AfterBeanDiscovery event){
 		//Cadastra os contextos contidos no demoiselle-core
 		if (contexts==null || contexts.isEmpty()){
diff --git a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/context/StaticContextImpl.java b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/context/StaticContextImpl.java
index a45e647..dc05db9 100644
--- a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/context/StaticContextImpl.java
+++ b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/context/StaticContextImpl.java
@@ -48,8 +48,6 @@
  */
 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;
@@ -63,7 +61,6 @@ import br.gov.frameworkdemoiselle.context.StaticContext;
  *
  */
 @Priority(Priority.MIN_PRIORITY)
-@Alternative
 public class StaticContextImpl extends AbstractStaticContext implements StaticContext {
 
 	public StaticContextImpl() {
diff --git a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/context/TemporaryConversationContextImpl.java b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/context/TemporaryConversationContextImpl.java
index 13501e9..d5041de 100644
--- a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/context/TemporaryConversationContextImpl.java
+++ b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/context/TemporaryConversationContextImpl.java
@@ -49,7 +49,6 @@
 package br.gov.frameworkdemoiselle.internal.context;
 
 import javax.enterprise.context.ConversationScoped;
-import javax.enterprise.inject.Alternative;
 
 import br.gov.frameworkdemoiselle.annotation.Priority;
 import br.gov.frameworkdemoiselle.context.ConversationContext;
@@ -65,7 +64,6 @@ import br.gov.frameworkdemoiselle.context.ConversationContext;
  *
  */
 @Priority(Priority.MIN_PRIORITY)
-@Alternative
 public class TemporaryConversationContextImpl extends AbstractStaticContext implements ConversationContext {
 
 	public TemporaryConversationContextImpl() {
diff --git a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/context/TemporaryRequestContextImpl.java b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/context/TemporaryRequestContextImpl.java
index 48d2d6c..857bf64 100644
--- a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/context/TemporaryRequestContextImpl.java
+++ b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/context/TemporaryRequestContextImpl.java
@@ -49,7 +49,6 @@
 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;
@@ -65,7 +64,6 @@ import br.gov.frameworkdemoiselle.context.RequestContext;
  *
  */
 @Priority(Priority.MIN_PRIORITY)
-@Alternative
 public class TemporaryRequestContextImpl extends AbstractThreadLocalContext implements RequestContext {
 
 	public TemporaryRequestContextImpl() {
diff --git a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/context/TemporarySessionContextImpl.java b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/context/TemporarySessionContextImpl.java
index f141960..990ac91 100644
--- a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/context/TemporarySessionContextImpl.java
+++ b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/context/TemporarySessionContextImpl.java
@@ -49,7 +49,6 @@
 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;
@@ -66,7 +65,6 @@ import br.gov.frameworkdemoiselle.context.SessionContext;
  *
  */
 @Priority(Priority.MIN_PRIORITY)
-@Alternative
 public class TemporarySessionContextImpl extends AbstractStaticContext implements SessionContext {
 
 	public TemporarySessionContextImpl() {
diff --git a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/context/TemporaryViewContextImpl.java b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/context/TemporaryViewContextImpl.java
index b8166d2..7465798 100644
--- a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/context/TemporaryViewContextImpl.java
+++ b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/context/TemporaryViewContextImpl.java
@@ -48,8 +48,6 @@
  */
 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;
@@ -65,7 +63,6 @@ import br.gov.frameworkdemoiselle.context.ViewContext;
  *
  */
 @Priority(Priority.MIN_PRIORITY)
-@Alternative
 public class TemporaryViewContextImpl extends AbstractThreadLocalContext implements ViewContext {
 
 	public TemporaryViewContextImpl() {
diff --git a/impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/internal/context/FacesViewContextImpl.java b/impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/internal/context/FacesViewContextImpl.java
index 3910557..fb3d992 100644
--- a/impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/internal/context/FacesViewContextImpl.java
+++ b/impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/internal/context/FacesViewContextImpl.java
@@ -38,7 +38,6 @@ package br.gov.frameworkdemoiselle.internal.context;
 
 import java.util.Map;
 
-import javax.enterprise.inject.Alternative;
 import javax.faces.component.UIViewRoot;
 import javax.faces.context.FacesContext;
 
@@ -57,7 +56,6 @@ import br.gov.frameworkdemoiselle.util.Faces;
  *
  */
 @Priority(Priority.L2_PRIORITY)
-@Alternative
 public class FacesViewContextImpl extends AbstractCustomContext implements ViewContext {
 
 	public FacesViewContextImpl() {
--
libgit2 0.21.2