diff --git a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/bootstrap/AbstractLifecycleBootstrap.java b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/bootstrap/AbstractLifecycleBootstrap.java index 62f6dc9..d0d0130 100644 --- a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/bootstrap/AbstractLifecycleBootstrap.java +++ b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/bootstrap/AbstractLifecycleBootstrap.java @@ -109,7 +109,7 @@ public abstract class AbstractLifecycleBootstrap implement Collections.sort(processors); Exception failure = null; - startContexts(); + //startContexts(); for (Iterator iter = processors.iterator(); iter.hasNext();) { AnnotatedMethodProcessor processor = iter.next(); @@ -128,7 +128,7 @@ public abstract class AbstractLifecycleBootstrap implement } } - stopContexts(); + //stopContexts(); if (failure != null) { throw new DemoiselleException(failure); diff --git a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/producer/ResourceBundleProducer.java b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/producer/ResourceBundleProducer.java index 44586b2..6e5d14b 100644 --- a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/producer/ResourceBundleProducer.java +++ b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/producer/ResourceBundleProducer.java @@ -37,6 +37,7 @@ package br.gov.frameworkdemoiselle.internal.producer; import java.io.Serializable; +import java.lang.annotation.Annotation; import java.util.Locale; import javax.enterprise.inject.Default; @@ -75,7 +76,14 @@ public class ResourceBundleProducer implements Serializable { public ResourceBundle createNamed(InjectionPoint ip) { String baseName = ""; if (ip != null) { - baseName = ip.getAnnotated().getAnnotation(Name.class).value(); + if (ip.getQualifiers() != null) { + for (Annotation qualifier : ip.getQualifiers()) { + if (Name.class.isInstance(qualifier)) { + baseName = ((Name)qualifier).value(); + break; + } + } + } } return new ResourceBundle(baseName, Beans.getReference(Locale.class)); } diff --git a/impl/extension/servlet/src/main/java/br/gov/frameworkdemoiselle/internal/producer/HttpServletResponseProducer.java b/impl/extension/servlet/src/main/java/br/gov/frameworkdemoiselle/internal/producer/HttpServletResponseProducer.java index 68e0d33..e242293 100644 --- a/impl/extension/servlet/src/main/java/br/gov/frameworkdemoiselle/internal/producer/HttpServletResponseProducer.java +++ b/impl/extension/servlet/src/main/java/br/gov/frameworkdemoiselle/internal/producer/HttpServletResponseProducer.java @@ -45,14 +45,12 @@ import javax.enterprise.inject.Produces; import javax.servlet.http.HttpServletResponse; @RequestScoped -@Deprecated public class HttpServletResponseProducer implements Serializable { private static final long serialVersionUID = 1L; private transient HttpServletResponse response; - @Alternative @Produces public HttpServletResponse create() { return this.response; diff --git a/impl/extension/servlet/src/main/java/br/gov/frameworkdemoiselle/internal/producer/ServletLocaleProducer.java b/impl/extension/servlet/src/main/java/br/gov/frameworkdemoiselle/internal/producer/ServletLocaleProducer.java index 785bfdf..7452d91 100644 --- a/impl/extension/servlet/src/main/java/br/gov/frameworkdemoiselle/internal/producer/ServletLocaleProducer.java +++ b/impl/extension/servlet/src/main/java/br/gov/frameworkdemoiselle/internal/producer/ServletLocaleProducer.java @@ -39,8 +39,11 @@ package br.gov.frameworkdemoiselle.internal.producer; import java.io.Serializable; import java.util.Locale; +import javax.enterprise.context.ContextNotActiveException; +import javax.enterprise.context.RequestScoped; import javax.enterprise.inject.Default; import javax.enterprise.inject.Produces; +import javax.enterprise.inject.spi.CDI; import javax.servlet.http.HttpServletRequest; import br.gov.frameworkdemoiselle.util.Beans; @@ -56,15 +59,17 @@ public class ServletLocaleProducer implements Serializable { HttpServletRequest request; try { + Beans.getBeanManager().getContext(RequestScoped.class); request = Beans.getReference(HttpServletRequest.class); - } catch (Exception cause) { - request = null; - } - if (request == null) { + if (request == null) { + result = Locale.getDefault(); + } else { + result = request.getLocale(); + } + } + catch (ContextNotActiveException ce) { result = Locale.getDefault(); - } else { - result = request.getLocale(); } return result; -- libgit2 0.21.2