Merge branch 'master' of git:./participatorio/cadastroweb

.settings/org.eclipse.core.resources.prefs

-#Tue Feb 05 12:04:22 BRST 2013
+#Wed Feb 06 10:54:03 BRST 2013
 eclipse.preferences.version=1
 encoding//src/main/java=UTF-8
 encoding//src/main/resources=UTF-8
+encoding//src/main/webapp/WEB-INF/i18n/application.properties=UTF-8
 encoding//src/main/webapp/WEB-INF/i18n/messages.properties=UTF-8
 encoding/<project>=UTF-8

src/main/java/br/ufpr/c3sl/participatorio/Projeto.java

@@ -15,6 +15,7 @@ import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.tostring.RooToString;
+import org.springframework.security.core.context.SecurityContextHolder;
 
 import br.ufpr.c3sl.participatorio.enums.TipoAcao;
 import br.ufpr.c3sl.participatorio.enums.TipoDemanda;
@@ -130,6 +131,8 @@ public class Projeto {
 	@Enumerated(EnumType.STRING)
 	private TipoStatus estado;
 	
+	@OneToOne
+	private Usuario usuario;
 	
     public static List<Projeto> findAllProjetosCandidatos() {
         return entityManager().createNativeQuery("SELECT * FROM Projeto WHERE estado = 'Candidato'", Projeto.class).getResultList();
@@ -142,4 +145,10 @@ public class Projeto {
 	public static List<Projeto>  findAllProjetosRejeitados() {
 		return entityManager().createNativeQuery("SELECT * FROM Projeto WHERE estado = 'Rejeitado'", Projeto.class).getResultList();
 	}
+	
+	public static List<Projeto>  findMeusProjetos() {
+		String login = SecurityContextHolder.getContext().getAuthentication().getName();
+		
+		return entityManager().createNativeQuery("SELECT * FROM Projeto p, Usuario u WHERE p.usuario = u.id and p.estado = 'Candidato' and u.login = '"+login+"'", Projeto.class).getResultList();
+	}
 }

src/main/java/br/ufpr/c3sl/participatorio/Projeto_Roo_JavaBean.aj

@@ -5,6 +5,7 @@ package br.ufpr.c3sl.participatorio;
 
 import br.ufpr.c3sl.participatorio.Ministerio;
 import br.ufpr.c3sl.participatorio.Projeto;
+import br.ufpr.c3sl.participatorio.Usuario;
 import br.ufpr.c3sl.participatorio.enums.TipoAcao;
 import br.ufpr.c3sl.participatorio.enums.TipoDemanda;
 import br.ufpr.c3sl.participatorio.enums.TipoDiasSemana;
@@ -335,4 +336,12 @@ privileged aspect Projeto_Roo_JavaBean {
         this.estado = estado;
     }
     
+    public Usuario Projeto.getUsuario() {
+        return this.usuario;
+    }
+    
+    public void Projeto.setUsuario(Usuario usuario) {
+        this.usuario = usuario;
+    }
+    
 }

src/main/java/br/ufpr/c3sl/participatorio/Usuario.java

 package br.ufpr.c3sl.participatorio;
 
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
+import javax.validation.constraints.NotNull;
+
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.tostring.RooToString;
@@ -13,8 +17,10 @@ public class Usuario {
 	
 	private String login;
 	
+	@NotNull
 	private String senha;
 	
+	@Enumerated(EnumType.STRING)
 	private TipoUsuario permissao;
 
 }

src/main/java/br/ufpr/c3sl/participatorio/web/ProjetoController.java

 package br.ufpr.c3sl.participatorio.web;
 
-import br.ufpr.c3sl.participatorio.Projeto;
-import br.ufpr.c3sl.participatorio.enums.TipoStatus;
 import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
+
 import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
+import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.validation.BindingResult;
@@ -13,6 +13,10 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 
+import br.ufpr.c3sl.participatorio.Projeto;
+import br.ufpr.c3sl.participatorio.Usuario;
+import br.ufpr.c3sl.participatorio.enums.TipoStatus;
+
 @RequestMapping("/projetoes")
 @Controller
 @RooWebScaffold(path = "projetoes", formBackingObject = Projeto.class)
@@ -24,12 +28,32 @@ public class ProjetoController {
             populateEditForm(uiModel, projeto);
             return "projetoes/create";
         }
-        uiModel.asMap().clear();
+        
         projeto.setEstado(TipoStatus.Candidato);
+        
+        Usuario u = (Usuario) Usuario.entityManager().createNativeQuery("select * from usuario where login='"+SecurityContextHolder.getContext().getAuthentication().getName()+"'", Usuario.class).getSingleResult();
+        projeto.setUsuario(u);
+        
+        uiModel.asMap().clear();
         projeto.persist();
         return "redirect:/projetoes/" + encodeUrlPathSegment(projeto.getId().toString(), httpServletRequest);
     }
     
+    @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
+    public String update(@Valid Projeto projeto, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
+        if (bindingResult.hasErrors()) {
+            populateEditForm(uiModel, projeto);
+            return "projetoes/update";
+        }
+        
+        Projeto p = (Projeto) Projeto.entityManager().createNativeQuery("select * from projeto where id = "+projeto.getId(), Projeto.class).getSingleResult();
+        projeto.setUsuario(p.getUsuario());
+        
+        uiModel.asMap().clear();
+        projeto.merge();
+        return "redirect:/projetoes/" + encodeUrlPathSegment(projeto.getId().toString(), httpServletRequest);
+    }
+
     @RequestMapping(value = "/{id}", produces = "text/html")
     public String show(@PathVariable("id") Long id, Model uiModel) {
         Projeto projeto = Projeto.findProjeto(id);
@@ -85,6 +109,21 @@ public class ProjetoController {
         return "projetoes/list";
     }
     
+    @RequestMapping(value = "meusprojetos", produces = "text/html")
+    public String listMeusProjetos(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
+        if (page != null || size != null) {
+            int sizeNo = size == null ? 10 : size.intValue();
+            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
+            uiModel.addAttribute("projetoes", Projeto.findProjetoEntries(firstResult, sizeNo));
+            float nrOfPages = (float) Projeto.countProjetoes() / sizeNo;
+            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
+        } else {
+            uiModel.addAttribute("projetoes", Projeto.findMeusProjetos());
+        }
+        addDateTimeFormatPatterns(uiModel);
+        return "projetoes/list";
+    }
+
     @RequestMapping(value = "/{id}", params = "status", method = RequestMethod.POST, produces = "text/html")
     public String updateStatus(@PathVariable("id") Long id, @RequestParam(value = "status", required = true) String status, HttpServletRequest httpServletRequest) {
         Projeto projeto = Projeto.findProjeto(id);

src/main/java/br/ufpr/c3sl/participatorio/web/ProjetoController_Roo_Controller.aj

@@ -5,6 +5,7 @@ package br.ufpr.c3sl.participatorio.web;
 
 import br.ufpr.c3sl.participatorio.Ministerio;
 import br.ufpr.c3sl.participatorio.Projeto;
+import br.ufpr.c3sl.participatorio.Usuario;
 import br.ufpr.c3sl.participatorio.enums.TipoAcao;
 import br.ufpr.c3sl.participatorio.enums.TipoDemanda;
 import br.ufpr.c3sl.participatorio.enums.TipoDiasSemana;
@@ -14,11 +15,9 @@ import br.ufpr.c3sl.participatorio.web.ProjetoController;
 import java.io.UnsupportedEncodingException;
 import java.util.Arrays;
 import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
 import org.joda.time.format.DateTimeFormat;
 import org.springframework.context.i18n.LocaleContextHolder;
 import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -49,17 +48,6 @@ privileged aspect ProjetoController_Roo_Controller {
         return "projetoes/list";
     }
     
-    @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
-    public String ProjetoController.update(@Valid Projeto projeto, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, projeto);
-            return "projetoes/update";
-        }
-        uiModel.asMap().clear();
-        projeto.merge();
-        return "redirect:/projetoes/" + encodeUrlPathSegment(projeto.getId().toString(), httpServletRequest);
-    }
-    
     @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
     public String ProjetoController.updateForm(@PathVariable("id") Long id, Model uiModel) {
         populateEditForm(uiModel, Projeto.findProjeto(id));
@@ -85,6 +73,7 @@ privileged aspect ProjetoController_Roo_Controller {
         addDateTimeFormatPatterns(uiModel);
         uiModel.addAttribute("ministerios", Ministerio.findAllMinisterios());
         uiModel.addAttribute("projetoes", Projeto.findAllProjetoes());
+        uiModel.addAttribute("usuarios", Usuario.findAllUsuarios());
         uiModel.addAttribute("tipoacaos", Arrays.asList(TipoAcao.values()));
         uiModel.addAttribute("tipodemandas", Arrays.asList(TipoDemanda.values()));
         uiModel.addAttribute("tipodiassemanas", Arrays.asList(TipoDiasSemana.values()));

src/main/java/br/ufpr/c3sl/participatorio/web/UsuarioController.java

 package br.ufpr.c3sl.participatorio.web;
 
-import br.ufpr.c3sl.participatorio.Usuario;
+import javax.servlet.http.HttpServletRequest;
+import javax.validation.Valid;
+
 import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
+import org.springframework.security.authentication.encoding.ShaPasswordEncoder;
 import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+import br.ufpr.c3sl.participatorio.Usuario;
 
 @RequestMapping("/usuarios")
 @Controller
 @RooWebScaffold(path = "usuarios", formBackingObject = Usuario.class)
 public class UsuarioController {
+	
+	@RequestMapping(method = RequestMethod.POST, produces = "text/html")
+    public String create(@Valid Usuario usuario, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
+        if (bindingResult.hasErrors()) {
+            populateEditForm(uiModel, usuario);
+            return "usuarios/create";
+        }
+        
+        ShaPasswordEncoder encoder = new ShaPasswordEncoder(256);
+	   	
+        usuario.setSenha(encoder.encodePassword(usuario.getSenha(), ""));
+        
+        uiModel.asMap().clear();
+        usuario.persist();
+        return "redirect:/usuarios/" + encodeUrlPathSegment(usuario.getId().toString(), httpServletRequest);
+    }
+	
 }

src/main/java/br/ufpr/c3sl/participatorio/web/UsuarioController_Roo_Controller.aj

@@ -21,17 +21,6 @@ import org.springframework.web.util.WebUtils;
 
 privileged aspect UsuarioController_Roo_Controller {
     
-    @RequestMapping(method = RequestMethod.POST, produces = "text/html")
-    public String UsuarioController.create(@Valid Usuario usuario, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, usuario);
-            return "usuarios/create";
-        }
-        uiModel.asMap().clear();
-        usuario.persist();
-        return "redirect:/usuarios/" + encodeUrlPathSegment(usuario.getId().toString(), httpServletRequest);
-    }
-    
     @RequestMapping(params = "form", produces = "text/html")
     public String UsuarioController.createForm(Model uiModel) {
         populateEditForm(uiModel, new Usuario());

src/main/resources/META-INF/spring/applicationContext-security.xml

@@ -9,16 +9,16 @@
         <form-login login-processing-url="/resources/j_spring_security_check" login-page="/login" authentication-failure-url="/login?login_error=t" />
         <logout logout-url="/resources/j_spring_security_logout" />
         <!-- Configure these elements to secure URIs in your application -->
-        <intercept-url pattern="/choices/**" access="hasRole('ROLE_ADMIN')" />
+        <intercept-url pattern="/choices/**" access="hasRole('Administrador')" />
         <intercept-url pattern="/member/**" access="isAuthenticated()" />
         <intercept-url pattern="/resources/**" access="permitAll" />
         <intercept-url pattern="/login" access="permitAll" />
         
-        <intercept-url pattern="/ministerios**" access="hasRole('ROLE_ADMIN')" />
-        <intercept-url pattern="/ministerios**" access="hasRole('ROLE_ADMIN')" method="POST" />
+        <intercept-url pattern="/ministerios**" access="hasRole('Administrador')" />
+        <intercept-url pattern="/ministerios**" access="hasRole('Administrador')" method="POST" />
         
-        <!-- <intercept-url pattern="/usuarios**" access="hasRole('ROLE_ADMIN')" />
-        <intercept-url pattern="/usuarios**" access="hasRole('ROLE_ADMIN')" method="POST" /> -->
+        <intercept-url pattern="/usuarios**" access="hasRole('Administrador')" />
+        <intercept-url pattern="/usuarios**" access="hasRole('Administrador')" method="POST" />
         
         <intercept-url pattern="/**" access="isAuthenticated()" />
     </http>
@@ -26,11 +26,19 @@
     <authentication-manager alias="authenticationManager">
         <!-- SHA-256 values can be produced using 'echo -n your_desired_password | sha256sum' (using normal *nix environments) -->
         <authentication-provider>
+        
 	    	<password-encoder hash="sha-256"/>
-            <user-service>
-                <user name="admin" password="8c6976e5b5410415bde908bd4dee15dfb167a9c873fc4bb8a81f6f2ab448a918" authorities="ROLE_ADMIN" />
-                <user name="user" password="04f8996da763b7a969b1028ee3007569eaf3a635486ddab211d512c85b9df8fb" authorities="ROLE_USER" />
-            </user-service>
+	    	
+            <jdbc-user-service
+    			data-source-ref="dataSource"
+				users-by-username-query="SELECT login, senha, 't' FROM usuario WHERE login=?"
+				authorities-by-username-query="SELECT login, permissao FROM usuario WHERE login=? " />
+            
+            <!-- <user-service>
+                <user name="admin" password="8c6976e5b5410415bde908bd4dee15dfb167a9c873fc4bb8a81f6f2ab448a918" authorities="Administrador" />
+                <user name="user" password="04f8996da763b7a969b1028ee3007569eaf3a635486ddab211d512c85b9df8fb" authorities="Usuario" />
+            </user-service> -->
+            
         </authentication-provider>
     </authentication-manager>
 </beans:beans>
\ No newline at end of file

src/main/webapp/WEB-INF/i18n/application.properties

-#Updated at Tue Feb 05 11:19:38 BRST 2013
-#Tue Feb 05 11:19:38 BRST 2013
-
+#Updated at Wed Feb 06 10:50:26 BRST 2013
+#Wed Feb 06 10:50:26 BRST 2013
 application_name=Participatório
+
 label_br_ufpr_c3sl_participatorio_ministerio=Ministério
 label_br_ufpr_c3sl_participatorio_ministerio_id=Id
 label_br_ufpr_c3sl_participatorio_ministerio_nome=Nome do Ministério
@@ -19,7 +19,7 @@ label_br_ufpr_c3sl_participatorio_projeto_datainicio=Data de Inicio
 # demanda -> Qual é a vinculação - Categorias: Educação,Trabalho,Lazer,Esporte,Turismo,Ecologia_e_Meio_Ambiente,Cultura,Saúde,Participação_e_Voluntariado,Justiça,Onde_Ir,Seus_Direitos;
 label_br_ufpr_c3sl_participatorio_projeto_demanda=*Demanda
 
-label_br_ufpr_c3sl_participatorio_projeto_desclegislacao=Discriminação da Legilsação
+label_br_ufpr_c3sl_participatorio_projeto_desclegislacao=Discriminaçãoo da Legislação
 label_br_ufpr_c3sl_participatorio_projeto_diasfuncionamento=Dias de Funcionamento
 label_br_ufpr_c3sl_participatorio_projeto_email=Email para Contato
 label_br_ufpr_c3sl_participatorio_projeto_estado=Estado
@@ -45,15 +45,21 @@ label_br_ufpr_c3sl_participatorio_projeto_pai=Projeto Pai
 label_br_ufpr_c3sl_participatorio_projeto_parcerias=Parcerias
 label_br_ufpr_c3sl_participatorio_projeto_plural=Projetos
 label_br_ufpr_c3sl_participatorio_projeto_possuimonitoramento=Possui Monitoramento?
-label_br_ufpr_c3sl_participatorio_projeto_publicoalvo=Publico Alvo
+label_br_ufpr_c3sl_participatorio_projeto_publicoalvo=Público Alvo
 label_br_ufpr_c3sl_participatorio_projeto_publicoprioritario=Público Prioritário
-label_br_ufpr_c3sl_participatorio_projeto_responsavel=Responsável
 label_br_ufpr_c3sl_participatorio_projeto_responsaveis=Responsáveis
+label_br_ufpr_c3sl_participatorio_projeto_responsavel=Responsável
 label_br_ufpr_c3sl_participatorio_projeto_rua=Rua
 label_br_ufpr_c3sl_participatorio_projeto_site=Site
 label_br_ufpr_c3sl_participatorio_projeto_telefoneministerio=Telefone para Contato no Ministério
 label_br_ufpr_c3sl_participatorio_projeto_telefones=Telefones
 
+# Temporalidade - ( ) Temporário ( ) Permanente
+label_br_ufpr_c3sl_participatorio_projeto_temporalidade=*Temporalidade
+
+label_br_ufpr_c3sl_participatorio_projeto_usuario=Usuário
+label_br_ufpr_c3sl_participatorio_projeto_version=Versão
+
 label_br_ufpr_c3sl_participatorio_usuario=Usuário
 label_br_ufpr_c3sl_participatorio_usuario_id=Id
 label_br_ufpr_c3sl_participatorio_usuario_login=Login
@@ -62,19 +68,12 @@ label_br_ufpr_c3sl_participatorio_usuario_plural=Usuários
 label_br_ufpr_c3sl_participatorio_usuario_senha=Senha
 label_br_ufpr_c3sl_participatorio_usuario_version=Versão
 
-# Temporalidade - ( ) Temporário ( ) Permanente
-label_br_ufpr_c3sl_participatorio_projeto_temporalidade=*Temporalidade
-
-label_br_ufpr_c3sl_participatorio_projeto_version=Versão
-
 menu_category_ministerio_label=Ministério
 menu_category_projeto_label=Projeto
 menu_category_usuario_label=Usuário
-
 menu_item_ministerio_list_label=Ministérios
 menu_item_ministerio_new_label=Ministério
 menu_item_projeto_list_label=Projetos
 menu_item_projeto_new_label=Projeto
-
 menu_item_usuario_list_label=Usuários
 menu_item_usuario_new_label=Usuário

src/main/webapp/WEB-INF/i18n/messages.properties

@@ -13,6 +13,8 @@ global_theme_alt=Alt
 global_theme_standard=Padrão
 global_generic={0}
 
+my_projects=Meus Projetos
+
 #welcome page
 welcome_titlepane=Bem vindo ao {0}
 welcome_h3=Bem vindo ao {0}

src/main/webapp/WEB-INF/views/menu.jspx

@@ -9,9 +9,11 @@
             <menu:item id="i_projeto_list" messageCode="global_menu_list_candidato" url="/projetoes/listCandidatos" z="user-managed"/>
             <menu:item id="i_projeto_list" messageCode="global_menu_list_efetivo" url="/projetoes/listEfetivos" z="x1vvsZFRYLoITzX2jIKG93Z4DWM="/>
             <menu:item id="i_projeto_list" messageCode="global_menu_list_rejeitado" url="/projetoes/listRejeitados" z="x1vvsZFRYLoITzX2jIKG93Z4DWM="/>
+            
+            <menu:item id="i_projeto_list" messageCode="my_projects" url="/projetoes/meusprojetos" z="x1vvsZFRYLoITzX2jIKG93Z4DWM="/>
         </menu:category>
         
-        <sec:authorize ifAnyGranted="ROLE_ADMIN">
+        <sec:authorize ifAnyGranted="Administrador">
             <menu:category id="c_ministerio" z="bdCebF8Z2eynkkyAMp/B5OZGV9A=">
                 <menu:item id="i_ministerio_new" messageCode="global_menu_new" url="/ministerios?form" z="6OpG3M2+Gvw8amn9aYg7/7zwAds="/>
                 <menu:item id="i_ministerio_list" messageCode="global_menu_list" url="/ministerios?page=1&amp;size=${empty param.size ? 10 : param.size}" z="3dj4WmtVHkR+jV7Vbj/veXWsVQ8="/>

src/main/webapp/WEB-INF/views/projetoes/create.jspx

@@ -43,6 +43,7 @@
         <field:input field="descLegislacao" id="c_br_ufpr_c3sl_participatorio_Projeto_descLegislacao" z="Y9X3/A7OHfh+T5M4c7uRjtx2Uak="/>
         <field:input field="obs" id="c_br_ufpr_c3sl_participatorio_Projeto_obs" z="5b+Wjz0npE5n2wk2R6g1fJZD0VA="/>
         <field:select field="estado" id="c_br_ufpr_c3sl_participatorio_Projeto_estado" items="${tipostatuses}" path="tipostatuses" render="false" z="user-managed"/>
+        <field:select field="usuario" id="c_br_ufpr_c3sl_participatorio_Projeto_usuario" itemValue="id" items="${usuarios}" path="/usuarios" render="false" z="user-managed"/>
     </form:create>
     <form:dependency dependencies="${dependencies}" id="d_br_ufpr_c3sl_participatorio_Projeto" render="${not empty dependencies}" z="nyMkb0MYQtlthVlj4JcyqCQYyRg="/>
 </div>

src/main/webapp/WEB-INF/views/projetoes/list.jspx

@@ -2,7 +2,7 @@
 <div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:sec="http://www.springframework.org/security/tags" version="2.0">
     <jsp:directive.page contentType="text/html;charset=UTF-8"/>
     <jsp:output omit-xml-declaration="yes"/>
-    <sec:authorize ifAnyGranted="ROLE_ADMIN">
+    <sec:authorize ifAnyGranted="Administrador">
     	<page:list id="pl_br_ufpr_c3sl_participatorio_Projeto" items="${projetoes}" z="xI7fvnW1b0tKUMMJrSKIiv3ycH0=">
 	            <table:table data="${projetoes}" id="l_br_ufpr_c3sl_participatorio_Projeto" path="/projetoes" z="kamtALNOBI9qFO/YY+1GYa1OhVw=">
 	            <table:column id="c_br_ufpr_c3sl_participatorio_Projeto_pai" property="pai" z="JnX374OPNV+3oLlfOcMYu3wG024="/>
@@ -15,7 +15,7 @@
 	    </page:list>
     </sec:authorize>
     
-    <sec:authorize ifAnyGranted="ROLE_USER">
+    <sec:authorize ifAnyGranted="Usuario">
 	    <page:list id="pl_br_ufpr_c3sl_participatorio_Projeto" items="${projetoes}" z="xI7fvnW1b0tKUMMJrSKIiv3ycH0=">
 	        <table:table update="false" delete="false" data="${projetoes}" id="l_br_ufpr_c3sl_participatorio_Projeto" path="/projetoes" z="kamtALNOBI9qFO/YY+1GYa1OhVw=">
 	            <table:column id="c_br_ufpr_c3sl_participatorio_Projeto_pai" property="pai" z="JnX374OPNV+3oLlfOcMYu3wG024="/>

src/main/webapp/WEB-INF/views/projetoes/show.jspx

@@ -43,5 +43,6 @@
         <field:display field="descLegislacao" id="s_br_ufpr_c3sl_participatorio_Projeto_descLegislacao" object="${projeto}" z="JL3fGOirqjzo/jfvrpOEsWfdtuE="/>
         <field:display field="obs" id="s_br_ufpr_c3sl_participatorio_Projeto_obs" object="${projeto}" z="+RB342ExVwf7Jpb2LEAVsNVT3tY="/>
         <field:display field="estado" id="s_br_ufpr_c3sl_participatorio_Projeto_estado" object="${projeto}" z="QQqAirebJjfsfFvZ2yTuji9gMYY="/>
+        <field:display field="usuario" id="s_br_ufpr_c3sl_participatorio_Projeto_usuario" object="${projeto}" z="zYLKtpIbUdPWnBZ97hES9bx740A="/>
     </page:show>
 </div>

src/main/webapp/WEB-INF/views/projetoes/update.jspx

@@ -43,5 +43,6 @@
         <field:input field="descLegislacao" id="c_br_ufpr_c3sl_participatorio_Projeto_descLegislacao" z="Y9X3/A7OHfh+T5M4c7uRjtx2Uak="/>
         <field:input field="obs" id="c_br_ufpr_c3sl_participatorio_Projeto_obs" z="5b+Wjz0npE5n2wk2R6g1fJZD0VA="/>
         <field:select field="estado" id="c_br_ufpr_c3sl_participatorio_Projeto_estado" items="${tipostatuses}" path="tipostatuses" z="K+kNv0Ov3Ulu6LiKPBQ71hczlOA="/>
+        <field:select field="usuario" id="c_br_ufpr_c3sl_participatorio_Projeto_usuario" itemValue="id" items="${usuarios}" path="/usuarios" render="false" z="user-managed"/>
     </form:update>
 </div>

src/main/webapp/WEB-INF/views/usuarios/create.jspx

@@ -4,7 +4,7 @@
     <jsp:output omit-xml-declaration="yes"/>
     <form:create id="fc_br_ufpr_c3sl_participatorio_Usuario" modelAttribute="usuario" path="/usuarios" render="${empty dependencies}" z="sBi0BIbhxfFtvS44zYHnLMODwjM=">
         <field:input field="login" id="c_br_ufpr_c3sl_participatorio_Usuario_login" z="6OvGa7M/0sPSzNSclLE7Y4sb/oU="/>
-        <field:input field="senha" id="c_br_ufpr_c3sl_participatorio_Usuario_senha" z="Fzw/QULORJ8+FIOQOF8H5WEf7o4="/>
+        <field:input field="senha" id="c_br_ufpr_c3sl_participatorio_Usuario_senha" type="password" required="true" z="Fzw/QULORJ8+FIOQOF8H5WEf7o4="/>
         <field:select field="permissao" id="c_br_ufpr_c3sl_participatorio_Usuario_permissao" items="${tipousuarios}" path="tipousuarios" z="Kpb8JBzpJ7PYZ9+dbrK6o6SJM18="/>
     </form:create>
     <form:dependency dependencies="${dependencies}" id="d_br_ufpr_c3sl_participatorio_Usuario" render="${not empty dependencies}" z="2S2Khlt8Zs3QW0bxgIewXxuzBz4="/>

src/main/webapp/WEB-INF/views/usuarios/update.jspx

@@ -4,7 +4,7 @@
     <jsp:output omit-xml-declaration="yes"/>
     <form:update id="fu_br_ufpr_c3sl_participatorio_Usuario" modelAttribute="usuario" path="/usuarios" versionField="Version" z="SwzSibl5xLBOtbcLMDq7FqYkcuI=">
         <field:input field="login" id="c_br_ufpr_c3sl_participatorio_Usuario_login" z="6OvGa7M/0sPSzNSclLE7Y4sb/oU="/>
-        <field:input field="senha" id="c_br_ufpr_c3sl_participatorio_Usuario_senha" z="Fzw/QULORJ8+FIOQOF8H5WEf7o4="/>
+        <field:input field="senha" id="c_br_ufpr_c3sl_participatorio_Usuario_senha" type="password" required="true" z="Fzw/QULORJ8+FIOQOF8H5WEf7o4="/>
         <field:select field="permissao" id="c_br_ufpr_c3sl_participatorio_Usuario_permissao" items="${tipousuarios}" path="tipousuarios" z="Kpb8JBzpJ7PYZ9+dbrK6o6SJM18="/>
     </form:update>
 </div>