Commit 91ac2acb42876ae66ccabd8c0f2e146b012d3774
1 parent
77d7a60d
Exists in
master
Ajustes para possibilitar o uso do @Scheduler do EJB 3.1
Showing
5 changed files
with
40 additions
and
14 deletions
Show diff stats
impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/DefaultTransaction.java
| ... | ... | @@ -36,7 +36,7 @@ |
| 36 | 36 | */ |
| 37 | 37 | package br.gov.frameworkdemoiselle.internal.implementation; |
| 38 | 38 | |
| 39 | -import javax.enterprise.context.SessionScoped; | |
| 39 | +import javax.enterprise.context.RequestScoped; | |
| 40 | 40 | |
| 41 | 41 | import br.gov.frameworkdemoiselle.DemoiselleException; |
| 42 | 42 | import br.gov.frameworkdemoiselle.transaction.Transaction; |
| ... | ... | @@ -48,7 +48,7 @@ import br.gov.frameworkdemoiselle.transaction.Transactional; |
| 48 | 48 | * @author SERPRO |
| 49 | 49 | * @see Transaction |
| 50 | 50 | */ |
| 51 | -@SessionScoped | |
| 51 | +@RequestScoped | |
| 52 | 52 | public class DefaultTransaction implements Transaction { |
| 53 | 53 | |
| 54 | 54 | private static final long serialVersionUID = 1L; | ... | ... |
impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/MessageContextImpl.java
| ... | ... | @@ -40,7 +40,7 @@ import java.io.Serializable; |
| 40 | 40 | import java.util.ArrayList; |
| 41 | 41 | import java.util.List; |
| 42 | 42 | |
| 43 | -import javax.enterprise.context.SessionScoped; | |
| 43 | +import javax.enterprise.context.RequestScoped; | |
| 44 | 44 | import javax.inject.Inject; |
| 45 | 45 | |
| 46 | 46 | import org.slf4j.Logger; |
| ... | ... | @@ -55,10 +55,7 @@ import br.gov.frameworkdemoiselle.message.SeverityType; |
| 55 | 55 | * |
| 56 | 56 | * @see MessageContext |
| 57 | 57 | */ |
| 58 | -@SessionScoped | |
| 59 | -//@ConversationScoped | |
| 60 | -// FIXME colocar o escopo de conversação, para não ter que limpar o contexto manualmente. Ou seria melhor colocar no | |
| 61 | -// escopo de request para não precisar se preocupar com isso? | |
| 58 | +@RequestScoped | |
| 62 | 59 | public class MessageContextImpl implements Serializable, MessageContext { |
| 63 | 60 | |
| 64 | 61 | private static final long serialVersionUID = 1L; | ... | ... |
impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/PaginationContextImpl.java
| ... | ... | @@ -40,7 +40,7 @@ import java.io.Serializable; |
| 40 | 40 | import java.util.HashMap; |
| 41 | 41 | import java.util.Map; |
| 42 | 42 | |
| 43 | -import javax.enterprise.context.SessionScoped; | |
| 43 | +import javax.enterprise.context.RequestScoped; | |
| 44 | 44 | import javax.inject.Inject; |
| 45 | 45 | |
| 46 | 46 | import br.gov.frameworkdemoiselle.internal.configuration.PaginationConfig; |
| ... | ... | @@ -54,7 +54,7 @@ import br.gov.frameworkdemoiselle.pagination.PaginationContext; |
| 54 | 54 | * @author SERPRO |
| 55 | 55 | * @see PaginationContext |
| 56 | 56 | */ |
| 57 | -@SessionScoped | |
| 57 | +@RequestScoped | |
| 58 | 58 | public class PaginationContextImpl implements Serializable, PaginationContext { |
| 59 | 59 | |
| 60 | 60 | private static final long serialVersionUID = 1L; | ... | ... |
impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/internal/producer/JsfLocaleProducer.java
| ... | ... | @@ -22,7 +22,7 @@ import java.io.Serializable; |
| 22 | 22 | import java.util.Locale; |
| 23 | 23 | |
| 24 | 24 | import javax.enterprise.context.ContextNotActiveException; |
| 25 | -import javax.enterprise.context.SessionScoped; | |
| 25 | +import javax.enterprise.context.RequestScoped; | |
| 26 | 26 | import javax.enterprise.inject.Alternative; |
| 27 | 27 | import javax.enterprise.inject.Default; |
| 28 | 28 | import javax.enterprise.inject.Produces; |
| ... | ... | @@ -32,7 +32,7 @@ import javax.servlet.http.HttpServletRequest; |
| 32 | 32 | |
| 33 | 33 | import br.gov.frameworkdemoiselle.util.Beans; |
| 34 | 34 | |
| 35 | -@SessionScoped | |
| 35 | +@RequestScoped | |
| 36 | 36 | @Alternative |
| 37 | 37 | public class JsfLocaleProducer implements Serializable { |
| 38 | 38 | ... | ... |
parent/framework/pom.xml
| 1 | -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | |
| 2 | - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> | |
| 1 | +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> | |
| 3 | 2 | |
| 4 | 3 | <modelVersion>4.0.0</modelVersion> |
| 5 | 4 | |
| ... | ... | @@ -10,7 +9,7 @@ |
| 10 | 9 | <parent> |
| 11 | 10 | <groupId>br.gov.frameworkdemoiselle</groupId> |
| 12 | 11 | <artifactId>demoiselle-parent</artifactId> |
| 13 | - <version>1</version> | |
| 12 | + <version>2</version> | |
| 14 | 13 | <relativePath>../../../internal/parent/demoiselle/pom.xml</relativePath> |
| 15 | 14 | </parent> |
| 16 | 15 | |
| ... | ... | @@ -20,6 +19,36 @@ |
| 20 | 19 | Se você é usuário do framework, certamente este POM não servirá para você. |
| 21 | 20 | </description> |
| 22 | 21 | |
| 22 | + <dependencyManagement> | |
| 23 | + <dependencies> | |
| 24 | + <dependency> | |
| 25 | + <groupId>br.gov.frameworkdemoiselle</groupId> | |
| 26 | + <artifactId>demoiselle-core</artifactId> | |
| 27 | + <version>2.2.1-SNAPSHOT</version> | |
| 28 | + </dependency> | |
| 29 | + <dependency> | |
| 30 | + <groupId>br.gov.frameworkdemoiselle</groupId> | |
| 31 | + <artifactId>demoiselle-jta</artifactId> | |
| 32 | + <version>2.2.1-SNAPSHOT</version> | |
| 33 | + </dependency> | |
| 34 | + <dependency> | |
| 35 | + <groupId>br.gov.frameworkdemoiselle</groupId> | |
| 36 | + <artifactId>demoiselle-jpa</artifactId> | |
| 37 | + <version>2.2.1-SNAPSHOT</version> | |
| 38 | + </dependency> | |
| 39 | + <dependency> | |
| 40 | + <groupId>br.gov.frameworkdemoiselle</groupId> | |
| 41 | + <artifactId>demoiselle-jsf</artifactId> | |
| 42 | + <version>2.2.1-SNAPSHOT</version> | |
| 43 | + </dependency> | |
| 44 | + <dependency> | |
| 45 | + <groupId>br.gov.frameworkdemoiselle</groupId> | |
| 46 | + <artifactId>demoiselle-se</artifactId> | |
| 47 | + <version>2.2.1-SNAPSHOT</version> | |
| 48 | + </dependency> | |
| 49 | + </dependencies> | |
| 50 | + </dependencyManagement> | |
| 51 | + | |
| 23 | 52 | <repositories> |
| 24 | 53 | <repository> |
| 25 | 54 | <id>demoiselle.sourceforge.net</id> | ... | ... |