diff --git a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/producer/LocaleProducer.java b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/producer/LocaleProducer.java deleted file mode 100644 index 3a3adb7..0000000 --- a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/producer/LocaleProducer.java +++ /dev/null @@ -1,16 +0,0 @@ -package br.gov.frameworkdemoiselle.internal.producer; - -import java.util.Locale; - -import javax.enterprise.inject.Default; -import javax.enterprise.inject.Produces; - -public class LocaleProducer { - - @Produces - @Default - public Locale create() { - return Locale.getDefault(); - } - -} diff --git a/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/producer/LocaleProducerTest.java b/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/producer/LocaleProducerTest.java deleted file mode 100644 index d854106..0000000 --- a/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/producer/LocaleProducerTest.java +++ /dev/null @@ -1,20 +0,0 @@ -package br.gov.frameworkdemoiselle.internal.producer; - -import java.util.Locale; - -import junit.framework.Assert; - -import org.junit.Test; - -public class LocaleProducerTest { - - @Test - public void testCreate() { - - Locale locale = (new LocaleProducer()).create(); - - Assert.assertNotNull(locale); - - } - -} diff --git a/impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/internal/producer/JsfLocaleProducer.java b/impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/internal/producer/JsfLocaleProducer.java index 1ffb03f..a8621de 100644 --- a/impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/internal/producer/JsfLocaleProducer.java +++ b/impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/internal/producer/JsfLocaleProducer.java @@ -22,7 +22,6 @@ import java.io.Serializable; import java.util.Locale; import javax.enterprise.context.RequestScoped; -import javax.enterprise.inject.Alternative; import javax.enterprise.inject.Default; import javax.enterprise.inject.Produces; import javax.faces.context.FacesContext; @@ -32,7 +31,6 @@ import javax.servlet.http.HttpServletRequest; import br.gov.frameworkdemoiselle.util.Beans; @RequestScoped -@Alternative public class JsfLocaleProducer implements Serializable { private static final long serialVersionUID = 1L; @@ -44,7 +42,7 @@ public class JsfLocaleProducer implements Serializable { @Named("currentLocale") public Locale create() { Locale locale; - + try { FacesContext facesContext = Beans.getReference(FacesContext.class); diff --git a/impl/extension/jsf/src/main/resources/META-INF/beans.xml b/impl/extension/jsf/src/main/resources/META-INF/beans.xml index 56ff469..527e828 100644 --- a/impl/extension/jsf/src/main/resources/META-INF/beans.xml +++ b/impl/extension/jsf/src/main/resources/META-INF/beans.xml @@ -37,8 +37,4 @@ - - br.gov.frameworkdemoiselle.internal.producer.JsfLocaleProducer - - \ No newline at end of file diff --git a/impl/extension/se/src/main/java/br/gov/frameworkdemoiselle/internal/producer/SeLocaleProducer.java b/impl/extension/se/src/main/java/br/gov/frameworkdemoiselle/internal/producer/SeLocaleProducer.java new file mode 100644 index 0000000..061aa80 --- /dev/null +++ b/impl/extension/se/src/main/java/br/gov/frameworkdemoiselle/internal/producer/SeLocaleProducer.java @@ -0,0 +1,16 @@ +package br.gov.frameworkdemoiselle.internal.producer; + +import java.util.Locale; + +import javax.enterprise.inject.Default; +import javax.enterprise.inject.Produces; + +public class SeLocaleProducer { + + @Produces + @Default + public Locale create() { + return Locale.getDefault(); + } + +} diff --git a/impl/extension/se/src/test/java/br/gov/frameworkdemoiselle/internal/producer/SeLocaleProducerTest.java b/impl/extension/se/src/test/java/br/gov/frameworkdemoiselle/internal/producer/SeLocaleProducerTest.java new file mode 100644 index 0000000..975349c --- /dev/null +++ b/impl/extension/se/src/test/java/br/gov/frameworkdemoiselle/internal/producer/SeLocaleProducerTest.java @@ -0,0 +1,20 @@ +package br.gov.frameworkdemoiselle.internal.producer; + +import java.util.Locale; + +import junit.framework.Assert; + +import org.junit.Test; + +public class SeLocaleProducerTest { + + @Test + public void testCreate() { + + Locale locale = (new SeLocaleProducer()).create(); + + Assert.assertNotNull(locale); + + } + +} diff --git a/parent/framework/pom.xml b/parent/framework/pom.xml index 996e33f..d24da3e 100755 --- a/parent/framework/pom.xml +++ b/parent/framework/pom.xml @@ -9,7 +9,7 @@ br.gov.frameworkdemoiselle demoiselle-parent - 3 + 4-SNAPSHOT ../../../internal/parent/demoiselle/pom.xml -- libgit2 0.21.2