Download as
Browse Code »

Commit c417ac14c2db651439c799d977603db63c820e63

Authored by Dancovich
1 parent 37d8ff21
Exists in master

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.
Showing 7 changed files with 8 additions and 14 deletions   Show diff stats
impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/bootstrap/CustomContextBootstrap.java
  Diff comments   View file @c417ac1
... ... @@ -6,6 +6,7 @@ import java.util.List;
6 6 import javax.enterprise.event.Observes;
7 7 import javax.enterprise.inject.spi.AfterBeanDiscovery;
8 8 import javax.enterprise.inject.spi.Extension;
  9 +import javax.enterprise.inject.spi.ProcessAnnotatedType;
9 10  
10 11 import br.gov.frameworkdemoiselle.context.CustomContext;
11 12 import br.gov.frameworkdemoiselle.context.StaticContext;
... ... @@ -26,6 +27,13 @@ public class CustomContextBootstrap implements Extension{
26 27  
27 28 private List<CustomContext> contexts;
28 29  
  30 + public <T extends CustomContext> void vetoCustomContexts(@Observes ProcessAnnotatedType<T> event){
  31 + //Veta os subtipos de CustomContext, para que não conflitem com o produtor de contextos personalizados.
  32 + if( CustomContext.class.isAssignableFrom( event.getAnnotatedType().getJavaClass() )){
  33 + event.veto();
  34 + }
  35 + }
  36 +
29 37 public void initializeContexts(@Observes AfterBeanDiscovery event){
30 38 //Cadastra os contextos contidos no demoiselle-core
31 39 if (contexts==null || contexts.isEmpty()){
... ...
impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/context/StaticContextImpl.java
  Diff comments   View file @c417ac1
... ... @@ -48,8 +48,6 @@
48 48 */
49 49 package br.gov.frameworkdemoiselle.internal.context;
50 50  
51   -import javax.enterprise.inject.Alternative;
52   -
53 51 import br.gov.frameworkdemoiselle.annotation.Priority;
54 52 import br.gov.frameworkdemoiselle.annotation.StaticScoped;
55 53 import br.gov.frameworkdemoiselle.context.StaticContext;
... ... @@ -63,7 +61,6 @@ import br.gov.frameworkdemoiselle.context.StaticContext;
63 61 *
64 62 */
65 63 @Priority(Priority.MIN_PRIORITY)
66   -@Alternative
67 64 public class StaticContextImpl extends AbstractStaticContext implements StaticContext {
68 65  
69 66 public StaticContextImpl() {
... ...
impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/context/TemporaryConversationContextImpl.java
  Diff comments   View file @c417ac1
... ... @@ -49,7 +49,6 @@
49 49 package br.gov.frameworkdemoiselle.internal.context;
50 50  
51 51 import javax.enterprise.context.ConversationScoped;
52   -import javax.enterprise.inject.Alternative;
53 52  
54 53 import br.gov.frameworkdemoiselle.annotation.Priority;
55 54 import br.gov.frameworkdemoiselle.context.ConversationContext;
... ... @@ -65,7 +64,6 @@ import br.gov.frameworkdemoiselle.context.ConversationContext;
65 64 *
66 65 */
67 66 @Priority(Priority.MIN_PRIORITY)
68   -@Alternative
69 67 public class TemporaryConversationContextImpl extends AbstractStaticContext implements ConversationContext {
70 68  
71 69 public TemporaryConversationContextImpl() {
... ...
impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/context/TemporaryRequestContextImpl.java
  Diff comments   View file @c417ac1
... ... @@ -49,7 +49,6 @@
49 49 package br.gov.frameworkdemoiselle.internal.context;
50 50  
51 51 import javax.enterprise.context.RequestScoped;
52   -import javax.enterprise.inject.Alternative;
53 52  
54 53 import br.gov.frameworkdemoiselle.annotation.Priority;
55 54 import br.gov.frameworkdemoiselle.context.RequestContext;
... ... @@ -65,7 +64,6 @@ import br.gov.frameworkdemoiselle.context.RequestContext;
65 64 *
66 65 */
67 66 @Priority(Priority.MIN_PRIORITY)
68   -@Alternative
69 67 public class TemporaryRequestContextImpl extends AbstractThreadLocalContext implements RequestContext {
70 68  
71 69 public TemporaryRequestContextImpl() {
... ...
impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/context/TemporarySessionContextImpl.java
  Diff comments   View file @c417ac1
... ... @@ -49,7 +49,6 @@
49 49 package br.gov.frameworkdemoiselle.internal.context;
50 50  
51 51 import javax.enterprise.context.SessionScoped;
52   -import javax.enterprise.inject.Alternative;
53 52  
54 53 import br.gov.frameworkdemoiselle.annotation.Priority;
55 54 import br.gov.frameworkdemoiselle.context.SessionContext;
... ... @@ -66,7 +65,6 @@ import br.gov.frameworkdemoiselle.context.SessionContext;
66 65 *
67 66 */
68 67 @Priority(Priority.MIN_PRIORITY)
69   -@Alternative
70 68 public class TemporarySessionContextImpl extends AbstractStaticContext implements SessionContext {
71 69  
72 70 public TemporarySessionContextImpl() {
... ...
impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/context/TemporaryViewContextImpl.java
  Diff comments   View file @c417ac1
... ... @@ -48,8 +48,6 @@
48 48 */
49 49 package br.gov.frameworkdemoiselle.internal.context;
50 50  
51   -import javax.enterprise.inject.Alternative;
52   -
53 51 import br.gov.frameworkdemoiselle.annotation.Priority;
54 52 import br.gov.frameworkdemoiselle.annotation.ViewScoped;
55 53 import br.gov.frameworkdemoiselle.context.ViewContext;
... ... @@ -65,7 +63,6 @@ import br.gov.frameworkdemoiselle.context.ViewContext;
65 63 *
66 64 */
67 65 @Priority(Priority.MIN_PRIORITY)
68   -@Alternative
69 66 public class TemporaryViewContextImpl extends AbstractThreadLocalContext implements ViewContext {
70 67  
71 68 public TemporaryViewContextImpl() {
... ...
impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/internal/context/FacesViewContextImpl.java
  Diff comments   View file @c417ac1
... ... @@ -38,7 +38,6 @@ package br.gov.frameworkdemoiselle.internal.context;
38 38  
39 39 import java.util.Map;
40 40  
41   -import javax.enterprise.inject.Alternative;
42 41 import javax.faces.component.UIViewRoot;
43 42 import javax.faces.context.FacesContext;
44 43  
... ... @@ -57,7 +56,6 @@ import br.gov.frameworkdemoiselle.util.Faces;
57 56 *
58 57 */
59 58 @Priority(Priority.L2_PRIORITY)
60   -@Alternative
61 59 public class FacesViewContextImpl extends AbstractCustomContext implements ViewContext {
62 60  
63 61 public FacesViewContextImpl() {
... ...