Merge development

Author: Arthur Gregorio

webBudget/pom.xml

@@ -23,10 +23,27 @@
 
     <groupId>br.com.webbudget</groupId>
     <artifactId>webBudget</artifactId>
-    <version>2.1.0</version>
+    <version>2.1.1</version>
     <packaging>war</packaging>
 
-    <name>webBudget</name>
+    <name>${project.groupId}:${project.artifactId}</name>
+    <url>http://c3faces.martinlinha.com/</url>
+    <description>Sistema web para controle financeiro pessoal ou de pequenas empresas</description>
+
+    <licenses>
+        <license>
+            <name>GNU Lesser General Public License v3</name>
+            <url>http://www.gnu.org/licenses/lgpl-3.0.txt</url>
+            <distribution>repo</distribution>
+        </license>
+    </licenses>
+    
+    <developers>
+        <developer>
+            <name>Arthur Gregorio</name>
+            <email>contato@arthurgregorio.eti.br</email> 
+        </developer>
+    </developers>
 
     <build>
         <finalName>${project.artifactId}-${project.version}</finalName>
@@ -91,10 +108,10 @@
             <properties>
                 <application.version>${project.version}</application.version>
                 <orm.show-sql>true</orm.show-sql>
-                <email.host>mail.somehost.com.br</email.host>
-                <email.port>587</email.port>
-                <email.user>someuser@somehost.com</email.user>
-                <email.password>mail-pass</email.password>
+                <email.host>${wb.email-host}</email.host>
+                <email.port>${wb.email-port}</email.port>
+                <email.user>${wb.email-user}</email.user>
+                <email.password>${wb.email-password}</email.password>
             </properties>
         </profile>
         <profile>
@@ -108,10 +125,10 @@
             <properties>
                 <application.version>${project.version}</application.version>
                 <orm.show-sql>false</orm.show-sql>
-                <email.host>mail.somehost.com.br</email.host>
-                <email.port>587</email.port>
-                <email.user>someuser@somehost.com</email.user>
-                <email.password>mail-pass</email.password>
+                <email.host>${wb.email-host}</email.host>
+                <email.port>${wb.email-port}</email.port>
+                <email.user>${wb.email-user}</email.user>
+                <email.password>${wb.email-password}</email.password>
             </properties>
         </profile>
     </profiles>
@@ -276,4 +293,4 @@
             <version>1.4</version>
         </dependency>
     </dependencies>
-</project>
+</project>

webBudget/src/main/java/br/com/webbudget/application/controller/AuthorizationBean.java

@@ -23,6 +23,7 @@
 import br.com.webbudget.domain.service.AccountService;
 import java.io.Serializable;
 import java.util.List;
+import javax.enterprise.context.RequestScoped;
 import javax.enterprise.context.SessionScoped;
 import javax.enterprise.event.Observes;
 import javax.enterprise.inject.Produces;
@@ -139,6 +140,7 @@ public String getAuthenticatedUserName() {
      * @return o usuario autenticado
      */
     @Produces
+    @RequestScoped
     @AuthenticatedUser
     private User getAuthenticatedUser() {
         return (User) this.identity.getAccount();

webBudget/src/main/java/br/com/webbudget/domain/repository/movement/MovementRepository.java

@@ -181,7 +181,7 @@ public Page<Movement> listByFilter(MovementFilter filter, PageRequest pageReques
 
         // limpamos a projection para que a criteria seja reusada
         criteria.setProjection(null);
-        criteria.setResultTransformer(Criteria.ROOT_ENTITY);
+        criteria.setResultTransformer(Criteria.DISTINCT_ROOT_ENTITY);
 
         // paginamos
         criteria.setFirstResult(pageRequest.getFirstResult());

webBudget/src/main/webapp/template/mainTemplate.xhtml

@@ -26,7 +26,7 @@
         <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
         <meta content="text/html; charset=UTF-8" http-equiv="Content-Type" />
         <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1"/>
-        <meta http-equiv="refresh" content="${request.session.maxInactiveInterval};url=/webBudget/logout"/>
+        <meta http-equiv="refresh" content="${request.session.maxInactiveInterval};url=/logout"/>
 
         <title>#{messages['application.title']}</title>