Download as
Browse Code »

Commit 352cdd5c3be1fea21d0575c9ef8ca24754d8bf32

Authored by Danilo Costa Viana
1 parent 8d9216eb

Removendo produtores que conflitam com aqueles encontrados no CDI 1.1

Showing 4 changed files with 22 additions and 11 deletions   Show diff stats
impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/bootstrap/AbstractLifecycleBootstrap.java
  Diff comments   View file @352cdd5
... ... @@ -109,7 +109,7 @@ public abstract class AbstractLifecycleBootstrap<A extends Annotation> implement
109 109 Collections.sort(processors);
110 110 Exception failure = null;
111 111  
112   - startContexts();
  112 + //startContexts();
113 113  
114 114 for (Iterator<AnnotatedMethodProcessor> iter = processors.iterator(); iter.hasNext();) {
115 115 AnnotatedMethodProcessor<?> processor = iter.next();
... ... @@ -128,7 +128,7 @@ public abstract class AbstractLifecycleBootstrap&lt;A extends Annotation&gt; implement
128 128 }
129 129 }
130 130  
131   - stopContexts();
  131 + //stopContexts();
132 132  
133 133 if (failure != null) {
134 134 throw new DemoiselleException(failure);
... ...
impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/producer/ResourceBundleProducer.java
  Diff comments   View file @352cdd5
... ... @@ -37,6 +37,7 @@
37 37 package br.gov.frameworkdemoiselle.internal.producer;
38 38  
39 39 import java.io.Serializable;
  40 +import java.lang.annotation.Annotation;
40 41 import java.util.Locale;
41 42  
42 43 import javax.enterprise.inject.Default;
... ... @@ -75,7 +76,14 @@ public class ResourceBundleProducer implements Serializable {
75 76 public ResourceBundle createNamed(InjectionPoint ip) {
76 77 String baseName = "";
77 78 if (ip != null) {
78   - baseName = ip.getAnnotated().getAnnotation(Name.class).value();
  79 + if (ip.getQualifiers() != null) {
  80 + for (Annotation qualifier : ip.getQualifiers()) {
  81 + if (Name.class.isInstance(qualifier)) {
  82 + baseName = ((Name)qualifier).value();
  83 + break;
  84 + }
  85 + }
  86 + }
79 87 }
80 88 return new ResourceBundle(baseName, Beans.getReference(Locale.class));
81 89 }
... ...
impl/extension/servlet/src/main/java/br/gov/frameworkdemoiselle/internal/producer/HttpServletResponseProducer.java
  Diff comments   View file @352cdd5
... ... @@ -45,14 +45,12 @@ import javax.enterprise.inject.Produces;
45 45 import javax.servlet.http.HttpServletResponse;
46 46  
47 47 @RequestScoped
48   -@Deprecated
49 48 public class HttpServletResponseProducer implements Serializable {
50 49  
51 50 private static final long serialVersionUID = 1L;
52 51  
53 52 private transient HttpServletResponse response;
54 53  
55   - @Alternative
56 54 @Produces
57 55 public HttpServletResponse create() {
58 56 return this.response;
... ...
impl/extension/servlet/src/main/java/br/gov/frameworkdemoiselle/internal/producer/ServletLocaleProducer.java
  Diff comments   View file @352cdd5
... ... @@ -39,8 +39,11 @@ package br.gov.frameworkdemoiselle.internal.producer;
39 39 import java.io.Serializable;
40 40 import java.util.Locale;
41 41  
  42 +import javax.enterprise.context.ContextNotActiveException;
  43 +import javax.enterprise.context.RequestScoped;
42 44 import javax.enterprise.inject.Default;
43 45 import javax.enterprise.inject.Produces;
  46 +import javax.enterprise.inject.spi.CDI;
44 47 import javax.servlet.http.HttpServletRequest;
45 48  
46 49 import br.gov.frameworkdemoiselle.util.Beans;
... ... @@ -56,15 +59,17 @@ public class ServletLocaleProducer implements Serializable {
56 59 HttpServletRequest request;
57 60  
58 61 try {
  62 + Beans.getBeanManager().getContext(RequestScoped.class);
59 63 request = Beans.getReference(HttpServletRequest.class);
60   - } catch (Exception cause) {
61   - request = null;
62   - }
63 64  
64   - if (request == null) {
  65 + if (request == null) {
  66 + result = Locale.getDefault();
  67 + } else {
  68 + result = request.getLocale();
  69 + }
  70 + }
  71 + catch (ContextNotActiveException ce) {
65 72 result = Locale.getDefault();
66   - } else {
67   - result = request.getLocale();
68 73 }
69 74  
70 75 return result;
... ...