From 050fea269b755955932ff3dda3f111d560aed7f8 Mon Sep 17 00:00:00 2001
From: estevandias <36716292+estevandias@users.noreply.github.com>
Date: Sun, 4 Nov 2018 21:51:45 -0200
Subject: [PATCH] Aula 04

Aula 04
---
 HoraDaPipocaUpSource/.classpath               |   2 +-
 HoraDaPipocaUpSource/.project                 |   2 +-
 .../WebContent/WEB-INF/spring-context.xml     |  26 +--
 .../WEB-INF/views/AlterarCliente.jsp          |  57 ++++++
 .../WebContent/WEB-INF/views/CriarFilme.jsp   |   8 +-
 .../WebContent/WEB-INF/views/ListarFilmes.jsp |  12 +-
 .../WebContent/WEB-INF/views/Menu.jsp         |   9 +-
 .../WebContent/WEB-INF/views/TelaLogin.jsp    |  39 +++++
 .../WEB-INF/views/VisualizarFilme.jsp         |   6 +-
 .../WebContent/WEB-INF/web.xml                |   2 +-
 HoraDaPipocaUpSource/WebContent/css/style.css |   6 +-
 .../controller/ManterFilmesController.class   | Bin 7595 -> 3791 bytes
 .../OldManterFilmesController.class           | Bin 0 -> 5513 bytes
 .../ads/arqdes/interceptor/Interceptor.class  | Bin 0 -> 1515 bytes
 .../arqdes/model/dao/ConnectionFactory.class  | Bin 1209 -> 1183 bytes
 .../usjt/ads/arqdes/model/dao/FilmeDAO.class  | Bin 9301 -> 6338 bytes
 .../usjt/ads/arqdes/model/dao/GeneroDAO.class | Bin 3903 -> 3230 bytes
 .../ads/arqdes/model/dao/UsuarioDAO.class     | Bin 0 -> 2425 bytes
 .../usjt/ads/arqdes/model/entity/Filme.class  | Bin 3291 -> 2754 bytes
 .../ads/arqdes/model/entity/Usuario.class     | Bin 0 -> 1196 bytes
 .../arqdes/model/service/FilmeService.class   | Bin 4640 -> 1645 bytes
 .../arqdes/model/service/GeneroService.class  | Bin 1126 -> 1012 bytes
 .../arqdes/model/service/UsuarioService.class | Bin 0 -> 894 bytes
 .../controller/ManterFilmesController.java    | 163 +++---------------
 .../controller/OldManterFilmesController.java | 123 +++++++++++++
 .../ads/arqdes/interceptor/Interceptor.java   |  25 +++
 .../arqdes/model/dao/ConnectionFactory.java   |   4 +-
 .../usjt/ads/arqdes/model/dao/FilmeDAO.java   | 123 +------------
 .../usjt/ads/arqdes/model/dao/GeneroDAO.java  |  28 +--
 .../usjt/ads/arqdes/model/dao/UsuarioDAO.java |  54 ++++++
 .../usjt/ads/arqdes/model/entity/Filme.java   |  14 --
 .../usjt/ads/arqdes/model/entity/Usuario.java |  34 ++++
 .../arqdes/model/service/FilmeService.java    |  79 ---------
 .../arqdes/model/service/GeneroService.java   |   5 -
 .../arqdes/model/service/UsuarioService.java  |  20 +++
 35 files changed, 428 insertions(+), 413 deletions(-)
 create mode 100644 HoraDaPipocaUpSource/WebContent/WEB-INF/views/AlterarCliente.jsp
 create mode 100644 HoraDaPipocaUpSource/WebContent/WEB-INF/views/TelaLogin.jsp
 create mode 100644 HoraDaPipocaUpSource/build/classes/br/usjt/ads/arqdes/controller/OldManterFilmesController.class
 create mode 100644 HoraDaPipocaUpSource/build/classes/br/usjt/ads/arqdes/interceptor/Interceptor.class
 create mode 100644 HoraDaPipocaUpSource/build/classes/br/usjt/ads/arqdes/model/dao/UsuarioDAO.class
 create mode 100644 HoraDaPipocaUpSource/build/classes/br/usjt/ads/arqdes/model/entity/Usuario.class
 create mode 100644 HoraDaPipocaUpSource/build/classes/br/usjt/ads/arqdes/model/service/UsuarioService.class
 create mode 100644 HoraDaPipocaUpSource/src/br/usjt/ads/arqdes/controller/OldManterFilmesController.java
 create mode 100644 HoraDaPipocaUpSource/src/br/usjt/ads/arqdes/interceptor/Interceptor.java
 create mode 100644 HoraDaPipocaUpSource/src/br/usjt/ads/arqdes/model/dao/UsuarioDAO.java
 create mode 100644 HoraDaPipocaUpSource/src/br/usjt/ads/arqdes/model/entity/Usuario.java
 create mode 100644 HoraDaPipocaUpSource/src/br/usjt/ads/arqdes/model/service/UsuarioService.java

diff --git a/HoraDaPipocaUpSource/.classpath b/HoraDaPipocaUpSource/.classpath
index c3de060..5dbdb07 100644
--- a/HoraDaPipocaUpSource/.classpath
+++ b/HoraDaPipocaUpSource/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jre1.8.0_181">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jre1.8.0_191">
 		<attributes>
 			<attribute name="owner.project.facets" value="java"/>
 		</attributes>
diff --git a/HoraDaPipocaUpSource/.project b/HoraDaPipocaUpSource/.project
index 30ed399..8a2dac3 100644
--- a/HoraDaPipocaUpSource/.project
+++ b/HoraDaPipocaUpSource/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>pipoca_aula03</name>
+	<name>pipoca_aula04</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/HoraDaPipocaUpSource/WebContent/WEB-INF/spring-context.xml b/HoraDaPipocaUpSource/WebContent/WEB-INF/spring-context.xml
index bd43367..6dee86b 100644
--- a/HoraDaPipocaUpSource/WebContent/WEB-INF/spring-context.xml
+++ b/HoraDaPipocaUpSource/WebContent/WEB-INF/spring-context.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+	xmlns:context="http://www.springframework.org/schema/context"
 	xmlns:mvc="http://www.springframework.org/schema/mvc"
 	xsi:schemaLocation="http://www.springframework.org/schema/mvc
-	http://www.springframework.org/schema/mvc/spring-mvc-3.0.xsd
-	http://www.springframework.org/schema/beans
-	http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
-	http://www.springframework.org/schema/context
+	http://www.springframework.org/schema/mvc/spring-mvc-3.0.xsd 
+	http://www.springframework.org/schema/beans 
+	http://www.springframework.org/schema/beans/spring-beans-3.0.xsd 
+	http://www.springframework.org/schema/context 
 	http://www.springframework.org/schema/context/spring-context-3.0.xsd">
 	<context:component-scan base-package="br.usjt.ads.arqdes" />
 	<mvc:annotation-driven />
@@ -18,11 +19,16 @@
 		<property name="suffix" value=".jsp" />
 	</bean>
 	
-	<bean id="mysqlDataSource" class="org.apache.commons.dbcp.BasicDataSource">
-		<property name="driverClassName" value="com.mysql.jdbc.Driver"></property>
+	<mvc:interceptors>
+		<bean class="br.usjt.ads.arqdes.interceptor.Interceptor" />
+	</mvc:interceptors>
+	
+	<bean id="mysqlDataSource"
+		class="org.apache.commons.dbcp.BasicDataSource">
+		<property name="driverClassName"
+			value="com.mysql.jdbc.Driver"></property>
 		<property name="url" value="jdbc:mysql://localhost/pipocadb"></property>
-		<property name="username" value="morone"></property>
-		<property name="password" value="morone123"></property>
+		<property name="username" value="Alunos"></property>
+		<property name="password" value="alunos"></property>
 	</bean>
-	
 </beans>
\ No newline at end of file
diff --git a/HoraDaPipocaUpSource/WebContent/WEB-INF/views/AlterarCliente.jsp b/HoraDaPipocaUpSource/WebContent/WEB-INF/views/AlterarCliente.jsp
new file mode 100644
index 0000000..d3f3cc7
--- /dev/null
+++ b/HoraDaPipocaUpSource/WebContent/WEB-INF/views/AlterarCliente.jsp
@@ -0,0 +1,57 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+
+        <!DOCTYPE html>
+        <html lang="pt-br">
+
+        <head>
+            <meta charset="utf-8">
+            <meta http-equiv="X-UA-Compatible" content="IE=edge">
+            <meta name="viewport" content="width=device-width, initial-scale=1">
+            <title>cerveja.biz - Alterar Cliente</title>
+
+            <link href="css/bootstrap.min.css" rel="stylesheet">
+            <link href="css/style.css" rel="stylesheet">
+        </head>
+
+        <body>
+                <!-- Barra superior com os menus de navegação -->
+				<c:import url="Menu.jsp"/>
+                <!-- Container Principal -->
+                <div id="main" class="container">
+                    <h3 class="page-header">Alterar Cliente #${cliente.id }</h3>
+                    <!-- Formulario para alteração de clientes -->
+                    <form action="ManterCliente.do" method="post">
+                        <!-- area de campos do form -->
+                        <input type="hidden" name="id" value="${cliente.id }" />
+                        <div class="row">
+                            <div class="form-group col-md-12">
+                                <label for="nome">Nome</label>
+                                <input type="text" class="form-control" name="nome" id="nome" required maxlength="100" placeholder="nome completo" value="${cliente.nome }">
+                            </div>
+                        </div>
+                        <div class="row">
+                            <div class="form-group col-md-6">
+                                <label for="fone">Celular</label>
+                                <input type="tel" class="form-control" name="fone" id="fone" maxlength="15" pattern="(?:\(\d{2}\)|\d{2})[- ]?\d{5}[- ]?\d{4}" placeholder="opcional; celular com ddd no formato (99) 99999-9999" value="${cliente.fone }">
+                            </div>
+
+                            <div class="form-group col-md-6">
+                                <label for="email">E-Mail</label>
+                                <input type="email" class="form-control" name="email" id="email" required maxlength="60" placeholder="email obrigatório" value="${cliente.email }">
+                            </div>
+                        </div>
+                        <hr />
+                        <div id="actions" class="row">
+                            <div class="col-md-12">
+                                <button type="submit" class="btn btn-primary" name="acao" value="Alterar">Salvar</button>
+                                <a href="ListarClientes.jsp" class="btn btn-default">Cancelar</a>
+                            </div>
+                        </div>
+                    </form>
+                </div>
+                <script src="js/jquery.min.js"></script>
+                <script src="js/bootstrap.min.js"></script>
+        </body>
+
+        </html>
\ No newline at end of file
diff --git a/HoraDaPipocaUpSource/WebContent/WEB-INF/views/CriarFilme.jsp b/HoraDaPipocaUpSource/WebContent/WEB-INF/views/CriarFilme.jsp
index f64e837..45fd5c0 100644
--- a/HoraDaPipocaUpSource/WebContent/WEB-INF/views/CriarFilme.jsp
+++ b/HoraDaPipocaUpSource/WebContent/WEB-INF/views/CriarFilme.jsp
@@ -1,6 +1,5 @@
 <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://www.springframework.org/tags/form" prefix="f" %>
 <!DOCTYPE html>
 <html lang="pt-br">
 
@@ -34,34 +33,29 @@
                 </div>
                 <div class="form-group col-md-8">
                     <label for="titulo">Título</label>
-                    <f:errors path="filme.titulo" cssStyle="color:red" />
                     <input type="text" class="form-control" name="titulo" id="titulo" required maxlength="100" placeholder="nome do filme">
                 </div>
             </div>
             <div class="row">
                 <div class="form-group col-md-12">
                     <label for="descricao">Descrição</label>
-                    <f:errors path="filme.descricao" cssStyle="color:red" />
-   				    <textarea class="form-control rounded-0" id="descricao" name ="descricao" maxlength="4000" rows="10"></textarea>
+    				    <textarea class="form-control rounded-0" id="descricao" name ="descricao" maxlength="4000" rows="10"></textarea>
                 </div>
             </div>
             <div class="row">
                 <div class="form-group col-md-8">
                     <label for="diretor">Direção</label>
-                    <f:errors path="filme.diretor" cssStyle="color:red" />
                     <input type="text" class="form-control" name="diretor" id="diretor" maxlength="60" placeholder="nome do(s) diretor(es)">
                 </div>
 
                 <div class="form-group col-md-4">
                     <label for="dataLancamento">Lançamento</label>
-                    <f:errors path="filme.dataLancamento" cssStyle="color:red" />
                     <input type="text" class="form-control" name="dataLancamento" id="dataLancamento" placeholder="formato dd/mm/yyyy">
                 </div>
             </div>
             <div class="row">
             	    <div class="form-group col-md-8">
                     <label for="posterpath">Poster</label>
-                    <f:errors path="filme.posterPath" cssStyle="color:red" />
                     <input type="text" class="form-control" name="posterPath" id="posterpath" maxlength="200" placeholder="caminho da imagem do poster">
                 </div>
                 <div class="form-group col-md-4">
diff --git a/HoraDaPipocaUpSource/WebContent/WEB-INF/views/ListarFilmes.jsp b/HoraDaPipocaUpSource/WebContent/WEB-INF/views/ListarFilmes.jsp
index de96037..ee3140b 100644
--- a/HoraDaPipocaUpSource/WebContent/WEB-INF/views/ListarFilmes.jsp
+++ b/HoraDaPipocaUpSource/WebContent/WEB-INF/views/ListarFilmes.jsp
@@ -29,7 +29,7 @@
                             Deseja realmente excluir este filme?
                         </div>
                         <div class="modal-footer">
-                            <form action="excluir_filme" method="post">
+                            <form action="excluir" method="post">
                                 <input type="hidden" name="id" id="id_excluir" />
                                 <button type="submit" class="btn btn-primary" name="acao" value="Excluir">Sim</button>
                                 <button type="button" class="btn btn-default" data-dismiss="modal">N&atilde;o</button>
@@ -51,7 +51,7 @@
 
                         <div class="col-md-6">
                             <div class="input-group h2">
-                                <input name="chave" class="form-control" id="search" type="text" placeholder="Pesquisar Filmes (deixe vazio para trazer todos)">
+                                <input name="data[search]" class="form-control" id="search" type="text" placeholder="Pesquisar Filmes (deixe vazio para trazer todos)">
                                 <span class="input-group-btn">
                 <button class="btn btn-primary" type="submit" name="acao" value="listar">
                     <span class="glyphicon glyphicon-search"></span>
@@ -71,7 +71,7 @@
                 <div id="list" class="row">
 
                     <div class="table-responsive col-md-12">
-                        <table class="table table-striped">
+                        <table class="table table-striped" cellspacing="0" cellpadding="0">
                             <thead>
                                 <tr>
                                     <th>ID</th>
@@ -101,9 +101,9 @@
                                                 ${filme.genero.nome}
                                             </td>
                                             <td class="actions">
-                                           		<a class="btn btn-success btn-xs" href="visualizar_filme?id=${filme.id}">Visualizar</a>
-                                                <a class="btn btn-warning btn-xs" href="editar_filme?id=${filme.id}">Editar</a>
-                                                <button id="btn${filme.id }%>" type="button" class="btn btn-danger btn-xs" data-toggle="modal" data-target="#delete-modal" data-filme="${filme.id}">Excluir</button>
+                                                <a class="btn btn-success btn-xs" href="manterfilmes.do?acao=visualizar&id=${filme.id}">Visualizar</a>
+                                                <a class="btn btn-warning btn-xs" href="manterfilmes.do?acao=editar&id=${filme.id}">Editar</a>
+                                                <button id="btn${filme.id }%>" type="button" class="btn btn-danger btn-xs" data-toggle="modal" data-target="#delete-modal" data-filme="${filme.id }">Excluir</button>
                                             </td>
                                         </tr>
                             </c:forEach>
diff --git a/HoraDaPipocaUpSource/WebContent/WEB-INF/views/Menu.jsp b/HoraDaPipocaUpSource/WebContent/WEB-INF/views/Menu.jsp
index 2da5b2c..54b64fe 100644
--- a/HoraDaPipocaUpSource/WebContent/WEB-INF/views/Menu.jsp
+++ b/HoraDaPipocaUpSource/WebContent/WEB-INF/views/Menu.jsp
@@ -9,17 +9,18 @@
                     <span class="icon-bar"></span>
                     <span class="icon-bar"></span>
                 </button>
-                <a class="navbar-brand" href="inicio">Hora da Pipoca</a>
+                <a class="navbar-brand" href="/">Hora da Pipoca</a>
             </div>
             <div id="navbar" class="navbar-collapse collapse">
                 <ul class="nav navbar-nav">
                     <li><a href="listar_filmes">Filmes</a></li>
+                    <li><a href="tela_login">Login</a></li>
                     <li class="nav-item dropdown">
                     <a class="nav-link dropdown-toggle" href="#" id="navbarDropdownMenuLink" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Catálogo</a>
                     		<ul class="dropdown-menu">
-  						  <li><a class="dropdown-item" href="listar_genero">por Gênero</a></li>
-  						   <li><a class="dropdown-item" href="listar_popularidade">por Popularidade</a></li>
-  						   <li><a class="dropdown-item" href="listar_lancamento">Lançamentos</a></li>
+  						  <li><a class="dropdown-item" href="#">por Gênero</a></li>
+  						   <li><a class="dropdown-item" href="#">por Popularidade</a></li>
+  						   <li><a class="dropdown-item" href="#">Lançamentos</a></li>
 						</ul>
                     </li>
                 </ul>
diff --git a/HoraDaPipocaUpSource/WebContent/WEB-INF/views/TelaLogin.jsp b/HoraDaPipocaUpSource/WebContent/WEB-INF/views/TelaLogin.jsp
new file mode 100644
index 0000000..b55a762
--- /dev/null
+++ b/HoraDaPipocaUpSource/WebContent/WEB-INF/views/TelaLogin.jsp
@@ -0,0 +1,39 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<!DOCTYPE html>
+<html lang="pt-br">
+
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <title>Criar Filme</title>
+
+    <link href="css/bootstrap.min.css" rel="stylesheet">
+    <link href="css/style.css" rel="stylesheet">
+</head>
+
+<body>
+    <!-- Barra superior com os menus de navegação -->
+	<c:import url="Menu.jsp"/>
+    <!-- Container Principal -->
+    <div id="main" class="container">
+        <h3 class="page-header">Fazer login</h3>
+        <!-- Formulario de login -->
+        <form action="fazer_login" method="post">
+        	<div class="form-group">
+        		<label for="usuario">Nome de Usuário</label>
+        		<input type="text" name="usuario" id="usuario" />
+        	</div>
+        	<div class="form-group">
+        		<label for="senha">Senha</label>
+        		<input type="password" name="senha" id="senha" />
+        	</div>
+        	<button type="submit">Fazer login</button>
+        </form>
+    </div>
+    <script src="js/jquery.min.js"></script>
+    <script src="js/bootstrap.min.js"></script>
+</body>
+
+</html>
\ No newline at end of file
diff --git a/HoraDaPipocaUpSource/WebContent/WEB-INF/views/VisualizarFilme.jsp b/HoraDaPipocaUpSource/WebContent/WEB-INF/views/VisualizarFilme.jsp
index 772efb7..7c1976c 100644
--- a/HoraDaPipocaUpSource/WebContent/WEB-INF/views/VisualizarFilme.jsp
+++ b/HoraDaPipocaUpSource/WebContent/WEB-INF/views/VisualizarFilme.jsp
@@ -28,7 +28,7 @@
                                 Deseja realmente excluir este filme?
                             </div>
                             <div class="modal-footer">
-                                <form action="excluir_filme" method="post">
+                                <form action="manterfilmes.do" method="post">
                                     <input type="hidden" name="id" value="${filme.id}" />
                                     <button type="submit" class="btn btn-primary" name="acao" value="Excluir">Sim</button>
                                     <button type="button" class="btn btn-default" data-dismiss="modal">N&atilde;o</button>
@@ -79,9 +79,9 @@
 		<hr />
 		<div id="actions" class="row">
 			<div class="col-md-12">
-				<a href="editar_filme?id=${filme.id}" class="btn btn-primary">Editar</a> 
+				<a href="manterfilmes.do?acao=editar&id=${filme.id}" class="btn btn-primary">Editar</a> 
 				<a href="#" class="btn btn-danger" data-toggle="modal" data-target="#delete-modal">Excluir</a> 
-				<a href="listar_filmes" class="btn btn-default">Voltar</a>
+				<a href="ListarFilmes.jsp" class="btn btn-default">Voltar</a>
 			</div>
 		</div>
 	</div>
diff --git a/HoraDaPipocaUpSource/WebContent/WEB-INF/web.xml b/HoraDaPipocaUpSource/WebContent/WEB-INF/web.xml
index 36bf523..f5d635c 100644
--- a/HoraDaPipocaUpSource/WebContent/WEB-INF/web.xml
+++ b/HoraDaPipocaUpSource/WebContent/WEB-INF/web.xml
@@ -3,7 +3,7 @@
 	xmlns="http://xmlns.jcp.org/xml/ns/javaee"
 	xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
 	id="WebApp_ID" version="3.1">
-	<display-name>pipoca_aula03</display-name>
+	<display-name>pipocad2</display-name>
 	<welcome-file-list>
 		<welcome-file>index.html</welcome-file>
 		<welcome-file>index.htm</welcome-file>
diff --git a/HoraDaPipocaUpSource/WebContent/css/style.css b/HoraDaPipocaUpSource/WebContent/css/style.css
index 400233e..5adc568 100644
--- a/HoraDaPipocaUpSource/WebContent/css/style.css
+++ b/HoraDaPipocaUpSource/WebContent/css/style.css
@@ -1,3 +1,7 @@
+@CHARSET "UTF-8";
+/*
+ * style.css
+ */
 body {
-	padding-top: 50px;
+  padding-top: 50px;
 }
\ No newline at end of file
diff --git a/HoraDaPipocaUpSource/build/classes/br/usjt/ads/arqdes/controller/ManterFilmesController.class b/HoraDaPipocaUpSource/build/classes/br/usjt/ads/arqdes/controller/ManterFilmesController.class
index 9ad168899990def4ecb4e4f70f836f1e94c3314a..e4b253a7164978dc9939d2922de59b62f82cc828 100644
GIT binary patch
literal 3791
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

literal 7595
zcmb7J349dQ8UIgq!!DcQT5d!PikOhVfS^@2qJ%?NlMo340jo}ShcK|&jkB|XsMUIl
zt+rb2p_SUpTZ&c#h}zo2`{-@&!`9lnwU<4t_W$0So!y05gYaW_-<vn@ec%84fB)~B
z;n}wyc^tqZZDa&B8W#09Mj^k&HOzG0FrD+$R^CYEvaXZMWGu&MH?ywgth6(IR(_d3
z9YI*b*e&LOX=Kc7ud%9Ui<NRUL^pL=&VZe=G#G6G8~5eXR>sJyHHO^PyCI=r>gqz)
zwfn5KcHZvESWC0noNKyvE}PeILR-%1HS+zAo$cM^n0?l^oU_&FvCM4V*kq>MoHJ;c
z{td>`f}7iBJ64+8Mtgmm<_~YvsaDo<awVfiwAfkOU7{h>(70AZco{v2A%rnH>Y!^F
z(`IL_jzV9L<*YGjwT5_GE@fucnvN~T-elO_Y}1Y7gA5oJZ8{MXR<zpLwB-=mhCnp7
zSv^J%ml*4;p5>-%s^tk`_M&&bp$xgCe@-HTDH^89AiLIf*XXkQ`ZE@HwpQkxKGTh2
z8VyUQjrMk9kbh#BjOhZF!!=B7Xe+U!%N1dxA!5Z5I_fc#H|8z3&C1$Vmb?i!Y-n5?
z!BHAU%i9XBoiW5o5ge^yarM~uJGp+#aR;rmO%CLZWre((>l1gbkTWsN!ZE_82D;+e
zB%LX_k>JrW%t3PmO&aC|ofV9%j=7kpVS;1z+Ic34I$ND9gH%FbS;oxg6ABVV+D^}K
zwOj^igb1F9Z}U4xt1`SI1b#>~Ojm~l28=u!K^~>-9Ib9>JUBwt^33<Yj3}$E^9xqq
zZ8!V-MQ}CL4w#t&`L7vKoXDYYX1j)nI&lGi8O6i(3;{DeRUtc7V75zP$XKqi*>(Gk
z)A-S4<?|GPM4+vs4Ykd=o1{8LaSBhBQ*~&?@(7k`m?2_NePbOfuu_9gE-rP+(w>4#
z4~_{SZy8uh>=?2rPUF386~09B%47}o@|Nmn6S9%n+(1sMpoTg_43sY;p`k;^NW^03
z#Oesn)G%*YIjxW`9bH(XVU&VMU7`R@E{0uZ*iy$a2ZjBKD5w&VUMYV0DAtoz%P3$f
zL@{i@*%55iFkVvH&Kb#7E4HVsexc4f-YbPrXtUepnyIa898*+)i3+m=P9i}{*D7}+
zB9kh`bFjZCpeF}y))FMAs>V=OY<JL5jwhCI>rv7+^3{`M-OjQQ*~&!?S2qm1nT%8-
zFgeM6n`uZm3?aMBh}BlUka2@o7i^<lRKjY!_AFCm&~RjBVeB+T0i@tmRLChF-O4Ok
zD~w9iVGA-5Y^AOQX<OO)3d?o$Axk~pZ01+mRwli|aVW5|4sM8{A5H}4YdE?pE4=_n
z%yi^Il^@w_xhf#kSrT!$d%fVrFo5k5Y|}9N(C*MNhzqC%JT94*7AHj>U8LiExR@E+
zQ^==Gr)Wu2L-Jji(vSD+xD=Ps8;VA0k3)4vsKynvO=?yhuEI4DTus>y3QdtFI(Fb%
z+HI!OWh%A&&{QgruEm`bLTNszqZT7#xE>#l;6obbRz;clBAUC3#!W{WH)!ZQ)btr1
zYn5hEe1zQ<d%*%(e1WG#)aGG<R=2a%IWhyOoPiKj<2{w4R!RtqN8pV<c08h23Z{nP
zo%guxvrk&dbXqxV?Nh=h+w5W^b?_7u)ljtds-fsLgE;jLrCjPtB8J=XnFu~z(ci0s
zb$nLj)rgFh?R7T`!hBvw3+~X+7{EoZW*;E`;;y^IU2CGahmD_*6(XM6Y!0w2#DhFr
zq9!Xh8eaMp50<cv{X(&DRc=9g4ID_XaYkuMAsNFL@o)qWX&6`P=aPIV>a`plL)gP7
zjDFL}Tb!%X_fmbX$37j8U_a};3X`->$lxJ}Pm$3zHq|UT;609!O4jyNrr=kw<-v~y
zK3@;Uwn|&&ZCmvJdVEF4<M^s*)00BK?v3I}4T$1t7HmFb@j)x)E<S*Mb(}Bucr3n#
z8mc{`c%DFr*4NMLy1bbg@JFKzHB`$-;v4u@1mCQr<RE+QJ{{l2cPR0>f&gE6$flxG
z^&*aC_L0!v!}lY2xk!S_%Q}95AF}n4-AjfAuj0wYZ}mh3f2`vtLh5ug!{Y1P>NT^)
zQgG}rQK*8s>eJ3uf+DKbD>{BDI=J!W)rzH9Jcvi}st_M}PZY25_a^W6Z$%E3HKawW
z;%fiSTz?_MC)2c<X0}ZzHqiZL(-HhpL(Rry6n`cx4tttxZ(g|nx{kl%Z)^-%R#&TO
z)-5mbD>EyxabvPkZ1E48=I{l9F!>D)Q_4-Nv_)4Zt(J=!Q0~BRE34bgY>FLE)}>O!
zi#Agby~!AMVT`cwEgf&Oy~Jo*Sh|NI+Z=3VutG&Oz7-iEPtHfRu;@w404?pS;jCa`
zk}^>V$f2v1=u~4}xq_3j7;6UUu;4c^^Ta6{ngT^$JdIj8m))~bdS{csOkxw_tDhSF
zWyR+x!jbrn%2_^d956SAW4`9#=P0f)_|3dW?VLRr{eZk>EI-8tz+o82PqCB>5XX3a
zlVX_2!-~gD;+)vX<~_oYBlcr*cYNv|I@uf=!i=W)k^3>LyE(iEvxm@FIwFoRmmfv@
zW?>AD#th7s$JMKCyyLhbZJf_zV?1^Nj^)uB7GjZS!f1|;<G<rKLd)Yl(v-Oz3zI|f
z6L#~f1|^T?lz9~LJz894yTowY8G+li;G{t7mdNdv)4v*;r8mV-*7jj3%{aAWW=vjN
z#OK80<ld9iS|1G^Nt`bIJEO`eZSs_zJVk_K`kaT*K7>{6P4Tmu)oJT?w>J-=TYw`_
z8pnWcU@Qbk(-=e`LGHA0{v=*mLex*jR4kR&%#ksh?prh6vnEQCti?IBbs|@si}U!)
z<W7P*>RJzHQk)^N)<k%o#un3}g@Q(vG2Db+&eesuWHWz=KZ0K`b8#)dTj_<Z;T9Oe
zv!)^BhEN#7g^R;YQ^P~JWN!TOrhT|Fgmt|B0bajuUHrz~@pZcwhsAZ@?PGBQ%?L@i
z=a5{$sRaErx|$^APDdloAlcd&h7PXm#A2LDAi5+BOC(IKJ`An60yjx8TX8c!Dnr(a
zkKyCoe=4Tq6Eru>9cm>sVF?6Z)E?KWkhm3}3`F8KiNr`j77aW3DR6k5OGV-=Y<?1x
z7{^cT#2Dcze}1mxPSlCtL%6ep?3!C-SI1o8_}wbr4QTS?eWX;0jnsp)`5NyWI({A+
z7`Z0&pqXaQXOx5lD2EsN4lnfLPBU;X?xVvKXx1s*A;dj&?^iRUE4UDnTo6oFtM2z#
ziC=;h(-E5dCL$5+dYiU{BG4irIJb*$!Ij-r5PBd8p<B4AK&W2AvKJ2yVK3ph+=JuB
z-3ksSouL0jO!0Z3=)aW?WH{f)D_O=bhr{7W7#2we*84Ej`!LkwQ3-?2dmkegMBG&(
zC<jUV^~#mU@g-h8nD$=|a^(ikm6;`1o@k1HE&g@I@c2`nFJ5RT@zf%xl`q=~=O8BG
z0$#b0>3tDp_L8zxp6UBCQ}R_HGSl;A+JPQ)D-WKj;=!{)9z4NKL@*Z61EE6<#90i4
z$WMl(<knu#qvt9;n$0{ciqi~<+Lfg2RkZqQmWyk6bq8PbUW<9St}H?ee6JSxUM=vv
ziqbzJRUzJ2j8I9c#I+t?^Q6jF9=}jUs$P^HA0$<;a04M#$p`Tg1?ao)R<V9073;Z5
z#fsoW>Q6Dc^B7m)Mj~<(73^lzQ*~z3*ZI_(6R9^XxRtAKqipZQO6E~1iIYAyNnf>+
zzG@{s)vEVZYw3Zi)#9nvPw_Km^ua{_xs<6FJmyN39>Oo$MW~f7{fc;~`2X5tLi{&g
zN%DBi_xpa-l|<dasNYFX?;?lqX2Wm~SKLdfx{orot1R+{@15aAK1xA)RhFi)l(^Sq
z<Qu%mt0E<YNv#q^O06mi6Z5uLao~4V-2J_9S38P82%7JRK88PZhiV^<b%(~DxvD!n
zHodB=JFLbhiE$^#wQAfb#w{F=P~(YW+`w@}jKgCmtm-O*tq4|A{7(YQxfJ}r6oLG^
z2WkADl|Ww1*ILE&na%PBJj_xyg!R}%n(u{+eYlv<u$N*#E@OgR#ncv5Q9`%F2Xlu9
zW+ywaf8pPRX+2X<>HTFDV2X;bt`#ASLVE+3DiHru1;qbK&b;VxX1>Rj_Wjt^y$5f0
zNSPSI|2mq+YnsQI@mi?T*IA@P(N{&9CmGhK7|^FFe$S9J&vM0cwEKDfC(lb|e$My(
zobQvSUV10!Fh#48q-m`1Q;|ljx?hrptF&6$?+M3d;cty5x~Ur0Fp(vslE$9=|Fl_h
AK>z>%

diff --git a/HoraDaPipocaUpSource/build/classes/br/usjt/ads/arqdes/controller/OldManterFilmesController.class b/HoraDaPipocaUpSource/build/classes/br/usjt/ads/arqdes/controller/OldManterFilmesController.class
new file mode 100644
index 0000000000000000000000000000000000000000..51d142ab78210eb31bcfa288566bd87c4e2c8af7
GIT binary patch
literal 5513
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

literal 0
HcmV?d00001

diff --git a/HoraDaPipocaUpSource/build/classes/br/usjt/ads/arqdes/interceptor/Interceptor.class b/HoraDaPipocaUpSource/build/classes/br/usjt/ads/arqdes/interceptor/Interceptor.class
new file mode 100644
index 0000000000000000000000000000000000000000..873620509a8195c29424d769ea788d2494c7dd71
GIT binary patch
literal 1515
zcma)6U2_yg6g|D!FvIS|goF?IFd8(FO(FvlKv@K11QT7Nl?ANgMSFLe%`B6drMnj>
z|B3ttUVOod4?g<f5Aj!6mZxV%vs9T1FWska-@f<Uum0ojUw;Fzf=v$<fyIsvho)~s
z8JSS(Cy_E?oLZ&3YG5-RZtP(XRe{w^_d+w!aoT&N<&Jum>Br$S)d`K#PZMRsZJ9=i
z(&2iskGx-v<bZ|+4&8{;*xnQvTWCBGsIFy^s$mR=1B~O4z+@{<)#h-gqx3!5NtD2J
zE9=VSfz+`(m%^&uj*Y-_>&-)G3LGA2Rd5rC7FvDzR6gG$Z|xvl=h7~s*-}r2%Gl<C
zYG#n7MiqKtBGX>@O{cHAw%K?nP`mxyWizIVhiQQs=d{rJ@1~BUIPT$?!2BCg3UC5%
z3rzHsElJ+r+7LLp(8#$K*4x(Asp;dCfCy_igIN#n2u$q}C{zNxi}wV4l}6^f*lr6P
zD^l~CoyJ2SXIVa0uN!ARJ`kusl0Pc_eUkO!)W<o-YE>ftJuk4tU1OZ%#Q;lKri*Tt
zS{bJ--04vlYui${UAEJ%V$ytE5UBKxkBhVs@AO=LJ_>LdEA+vj+sYUwRN!nG@&6Vv
z*J1ou1-zjdvVXEVKE`zqp9swEo9O&mfF^DT1a!7)naIx2vJ=mZk}mT*n)0&jb=<^f
z9&Yi$zFzWq*-}O81X#uA^k!IsEfvL@&9hGxI5M6t8dKo>fvs6|Ff*@9R{{sOec8{<
zwX2uT5{|SR!@b5S17&rFI)44CObffSZDsfIT{$Qxw${#u{8;Y9Zl<S3zJ?3VF6KaM
z{F{IZ5x)Yi9#0{6!F_!37x+Kt*EO#08t_r)8WalLCwLNg3zIZ5MO@|SNN(m&O2#Qk
zmUb~CaJ_o6I(_mLPQSn{qPZMhA$mVYOGNWInj<>@3XK;yLG)pcCWu0!pD<p1Nqd)=
zfh)VXR>AL1vOGP%i%%;Udr5y|aBOFD4in@%iA^&57Bl#PP2It9^f}Bfij{(283mbQ
r4PWGuCAf_{<nLr(Vx2a9MA*PrjPGko`F;N7e)Kcq2=!Z(RB-nnWiF9u

literal 0
HcmV?d00001

diff --git a/HoraDaPipocaUpSource/build/classes/br/usjt/ads/arqdes/model/dao/ConnectionFactory.class b/HoraDaPipocaUpSource/build/classes/br/usjt/ads/arqdes/model/dao/ConnectionFactory.class
index 8205a6b7bf09fabbd3928496cb54896ffeb7c280..0fb981a705640099a20ffa7bd16de440fc64347f 100644
GIT binary patch
delta 81
zcmdnVIiGVwA`_#><Rm6lrNo@ly!>Ldg2dwD^8BI{TPVM@I5jxf$2Ki7r+D*WCQ(LK
g0S0jfp~-idm-C7-urWw5uro+9a5G3vp2(sB06{hv0{{R3

delta 107
zcmbQwxs!84A`@fM<Rm6lo80`O{Jd1Pg2dwD^8BI{TL|CK$XKnkI5jxf$2Ki7r#MwD
zF()U#+_yBRBr~uywJ0;S*tVpobn{9kQASoi25|;~$%mPj^NKLAF^Dm+1Nqzx5|hhW
FGyue}AesOG

diff --git a/HoraDaPipocaUpSource/build/classes/br/usjt/ads/arqdes/model/dao/FilmeDAO.class b/HoraDaPipocaUpSource/build/classes/br/usjt/ads/arqdes/model/dao/FilmeDAO.class
index d86ee9a5953e56c2fdffb1e983fef554a61080e3..cadf174908270a0abf6755dba8d40fe1d11e075c 100644
GIT binary patch
delta 1851
zcmZvc3s6*57{`BSdF<uxMR5~xMJi24RD^H{M|_Rx6dIOg`N~HtEVx80E=#2)nAT|H
zl;tg_w6O=6MrxV~BBh3vX-_N5%F5oErM)dP={uKIoT=TNd-wak|MxiO|3BwIeoMBw
z@AUQ^K#q#tZ1!=*#TNM^{w+DKLvePUXLZjy#d)RvoBdf;kziTY$Z*&{w;)&<F{vfV
zV69@Oy&!3gZ6tQjcuJAtK+F8)C0P?9;b3{mrB%VQqCnW-X@%--vW^WFZZ_K4W=hsX
zlT~c8*i4?n6A4{cQ4t7_@>d2lZi~fpY*obj#amva7+}wd>1IEan4GbWMvHAa$%us7
z`k3VEd72fm#hJk(57oS2aVI-;qk&^|c$dYCv?$^#1CcROFE)Kl--!k<NtNQvNH9`W
z7Sd_2SnT0dJ3V1=%|46Q*r-U5jB6c$!5cDZab{7VvM?Mh^oMlew=CY)FiT*g&jbwK
zkwifT!+}UBta0yI9MCvZ<J#N?A4pztW<{tn5(roLBeON|LyM0D=p|8*<DJlW2^k!+
zLuS|bPc1&<uzio26aR(9mwaXKF|&t%>kJkwnpqMk4}@i~Qg#`9FB@2rSsuDc_Oz5A
zEPm7zxTWrujxU$v7C-T`o$JXnHL1T^{KoJ0zQlYx?8&jc9U5a%)CtLT_UKMCRGeMg
zsW3T(SbTJ#8(vcBLU%6U{4J^8fv)L2aM6=EdXqvQE+U;Q`Z9!mTuy%`kik?2Fo#Sc
z5~(Jedl|?IE@7oCeFKANU@*JLV=qJ1r3_Px7_OEuLM>-xZGC4|DljEYz@;|nr?i83
z@xf)%5Shn`(o2TW9~bwtT;hsHd5jnm#HUwf^0*UyLRNz7m<(-!n%7M2lt$K!^FC=;
zd%M&$vu=vFzLE9)8+fLHXTA0EXrQ5qAu*^tx5_ho@lDKC<Rz@dZYEc<oAOMb=}Yi#
zZ{m5EtZ1iW?QY^_ZS8fe*Q3^(j<r8(z3W)-N3DatvAWF1O?;vgKX0Z~s(+p5@p;7k
zO|<%Vj&&rOb5tsL8aS5WGaLA2k}si&`HGdTLA%tqqUH#H%A!Z91f{njO{J?r^6sSa
zRldAEszj9trLoSY&Z4XM#$s><9<Cyds~IL77BESy$?}~-vG5t;dKNN``<TvZX0V=_
zY~==a<7Yp!I7p#Lb`nPj)TnfdRge-@&TMrnH#&?>)10VzXBd-zfAD}XWT-GFWMG#J
z7Qz-^j2@W>MKJL)#&#YS*(Asyi&-Y^O=;VYzc?xQARR?~ePt<s%Ob33wbT=wl5+jT
zHG__=vJBIWa<j@!t(}(Yb1j=}ck9|~WSd8xI+&W|Xy>2*(avc{JB!;QYD82!1>RPB
zb!uA8Sv9zQZeRR4YS31@8no4}25q&gL0j!=(AIy%VE9CV=ZHaDju^U&WR6N_L)6gU
z=XTT}QjMyiy61wL-n0lq$N@ggad{`HWR)y$kIGV6XLT@DjueDM2Nj}&h@h+FXw8-F
zohRq_Hb!te<Crfhs3u4ax3GY_xI<3%LLOle^>Pz$7SA@xX<@Otm?bKQyVbB7mOA`j
zBc)LzqWl{oNzJ<4Xadu$yQJj_hjo3iG&!utOY1h)-O{Lybwf%gI;_W>!@90^N~&qn
y3+T`)0JlSWZD)t(rEcUm)GgCX)-wBKT8|5B&rqKz*NnbeT*{@d2Yu0~82A@dK&|co

delta 3876
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
H9>4zvAD(zV

diff --git a/HoraDaPipocaUpSource/build/classes/br/usjt/ads/arqdes/model/dao/GeneroDAO.class b/HoraDaPipocaUpSource/build/classes/br/usjt/ads/arqdes/model/dao/GeneroDAO.class
index 8299064438bc49d225773d6ae5e3f40a98006649..c91bbdce232fc5214d42780eff6080d705a680a9 100644
GIT binary patch
delta 70
zcmdllH&2rH)W2Q(7#J8#7+TmFm?pntmf5Ju#l*^zl30?s*^G&kb@FNUSVrc}njEiK
YM41>Gfl8SenizP1G#djWLo)*d0Lj}B4*&oF

delta 298
zcmbOyxnGX=)W2Q(7#J8#7`oXRm?nQ<mf5Ju#l*~%QoPxMiIcTnIH|NaIkCt+H7~U&
zzt}A^CpWd2gQ1y`A*whvCpEc5Atkf8Br^}lNY~3u(E*Zq`MIe&3TZ%Id^%W{LRwLN
zt^$;u4wM2JqL8Lgo{?IV3f87zi>%(7gQ1m?fdyn92RB1IBLf@6(8>1f@r*2+=d-_J
zVP<4#oLtJK%h)t|F_#X1%T9(;CWdVc9+K>mY(j05?{OV9^<v;)@Mhp<@MVx;@MBPA
z2w>1)2xKs12x72j2nLFV0AT<_977nx8HR9%3k(qqHyNTP-{9UX+yM*@CWcN19w5!e
Kz{t?WzyJUhlu<<h

diff --git a/HoraDaPipocaUpSource/build/classes/br/usjt/ads/arqdes/model/dao/UsuarioDAO.class b/HoraDaPipocaUpSource/build/classes/br/usjt/ads/arqdes/model/dao/UsuarioDAO.class
new file mode 100644
index 0000000000000000000000000000000000000000..0c83f7296b329e748bf87814d8258d7e076a2b17
GIT binary patch
literal 2425
zcma)8U2{`a6kR7@H%$`@X(<gK5)h<c;R0gCgbxb^DW)wnr3xzbHaTrCr1yq<Z*1!e
z|3RO8aeV3Yl@1D1nXxlI$c%6P4t?-Z!LhD$lcp^~$C>7yv(G+zpLO<H`%HiN=Z7Bw
zoI*)MK;Y=4qgUNKo^F&}-Ei)eq^r-`C0W)>hOOUltA=CR1N|c!LIOMP7@r$@*|4Vd
zk;yx<=m~_1wq*(I%KI+&URl4$1-eYz$_Yfyn3n0C6G(OXJLYw@Wx()^f?airGS@XO
z5W6&Alob`>YG@W{^>dlFJ~-0wFvDoo^2}K|Zo1}VS@v6&?HPWM!0Ej0OzUpNF|Fw-
z$C#CKwsTjXl!oQ%Q%2FVodw-!1nB)$&z>_KSt7#FMcy`sAa=x|VW&W_vunH=t=OfZ
zO`uI-c@cFS?bt1ln3mqgZ3T9BcD=L=O(6O>!idDM7yC8rW5F8rDqPPuZW+hx3POvz
zh*$88;@vUFC=y-_X$9|~Ku4{RH5SHZ9DB}SHT*iZ<V{NsS7#@sGo}^=l6kvml*h@T
zvg?Z>Z^m>5y7K>%dR3$n853xKIfnv*XYJm&`{pY#I^o}B$f(o-#HNfdq?5O&O)6)s
z^VK*c3HKJ(RhZib@e4bnI3|#DWtl=uSJP9DJ)5r9v`lkuMmjQGJ+{7bHhn&ASS7Bw
z(wZ^Sw3~4pCpDZ{7vol8$MF_Uu^lRotQd~u^*lLC2m;49vs3Vt9tpd_^|e|+sS%Nj
zp%14uyt7>=ZoOO_?;^{lq4?_UNtLcE&+pCpxy?9(a~jSH?0GeSIL_lefhJc{ZwfA1
z?i{Qk-khv!Tp_&>$3=B`l!q5ot<)Kp;<$|W1>$mE7OS4TUX{**O0((WqtdOG8RF%d
zF^CT|T%|Z0s2bil@))ArEIH3&vJ-Eq?IUqqQ*9A0mTgz6BS&H=;D&~=b$)!Pjc$lz
zT(wHVD3uD;3R!YpSrX9dgm0_;t;ME#gXCUyl8<(CN$9G$gt>1!egy&!o2_kQPvf#V
z4WDg!Q`ZTI)!xR-rfT7qI>~&4k0}TOJuiLiT#ur*y@iU@M`gu!P4(#IaFB0Lkng?V
zj}H*P0nRl<x!Oc4L@S0kXA#a49AD$_D|%H_y8AI&x_efT6!;z;OV~No`v`lUAa=9&
zF%GOQGbY4{oqX4VIK+rO{u%9D?cjO}Nv^chdjR|KhRRsWi^DiVOWAMYD6=Gab|<=s
zuA8f^2&^$_K!ea|@Uu6;O+D!4h7H(+8u*e4)ynf^W=IT+Y^eJ?bo8!34<H*(g+o1$
z@b(IFL8QWA&innj$VNm~ONCc3AdrowqAR!}@HO`Lq@q6~rtD$9*<m&3rt1O^lw-8+
zSi+TTWXsOTD$_-ta=Vs|uuQ2)N?WAG;Ss~=j-(>2+~$<xfwBhb2P`2wyxE&s&4w~h
z(Ub}eFQFxq3N50EUuMg!4rl5lWE2VF0c)3I4_Yk4NsQt?#|eJb*h~8x)_;OuHMY_I
z$@ee%V-&aXt8Xv+<3oOx9pw6Ne%!J@KIB)~HI}cEuNs$!nDH=KJi?QX5=AF2k;TiT
zYLrjtZO$h+|CZiG+RMn`A;;fw0)G(eU;IBrsp1M1NeUaPc#aS85eX0CPu#>UlHP_V
z_!ys1!#VWhQ)Z4bYpbuB2=mp{6ZF+{AIUWy-{h;OPs4<Ug8z4BeKM#d)yHS355ru0
xhQtL9iNqRDiu^as7vSGWQijhUY7y~%Ml?6CDU^+fx>5r$c%1+y8;w;2{slUDOF94m

literal 0
HcmV?d00001

diff --git a/HoraDaPipocaUpSource/build/classes/br/usjt/ads/arqdes/model/entity/Filme.class b/HoraDaPipocaUpSource/build/classes/br/usjt/ads/arqdes/model/entity/Filme.class
index 8486a261612f2b1226f31dfb6e36ab2e02c9b1b5..a2b3f12ad33b77373dbac4137223da6167cd33bb 100644
GIT binary patch
literal 2754
zcma);eN!7%6vm$$0ts<x=|ZV(!KNS(Ue^}1SY9d+sc39bu(sB!OR~aZUU0K<#?Rxw
z&Zsj$XLQC7;D>U2&fX1?WkdVV-m{zY^1Jsu=T83l_s_op%%hS*LSb~*vl{gS-?B?}
z%l3XOId!X2D>-G$srs(}v$f%tD^3bYh28`EC)+C9)jjL+?txSE6%uYqL2W8@(YH~q
zDVT+p*S7Du)xAZ9Ze}fdZqcTLaacQSlx@!~*(Ha;d4)?Q+qVmLwP;sZls>&WNyB%`
zR^Ij<rpO%D>b~P`+5Wyls^of(U-MXZ&#5{dLvn>zZRBC#$y8lSZq@Zy6gqMfPZW~t
z+-?RP7%*U>PvLUGtvZhym0ic%v3JXaGz+z&U4BAnc@IA({e8EtF#gKI!3nZ%=bqzl
z^1N7fvl|L;8R$e8zt{EmWNuS<y6LtPo@Re;;{16^?Ar!XNYk0IP3Nn*^S+YMV8VQ}
z0TMi6pj(0s2A}@GebaC2Omj$@mw;IV8N5Lc2AuUs=JHbFij;^n(QLA}+9<i^4H)QQ
zh!l^6^o2WUMM(0VfUDVk$??8{OR|BUfT#HjMIsnl8sfHW;Ig=7q*PNea=cm!3X?>9
zP1#7kH3Pl4q7S{9V(PVpCtFGTH9Zt5JXE+A9hJ3)TP`_X8l0$1Ae-!Sx3rwW20jsS
zj*0cDfk${u8QX`4PL+BZq;Af2K1{Wk#%Bbc&g%ILQf*6u9fg@Vy<Ct;q%@s99p&XT
zo>CIi+5Zo8P~a;m@La(17lFN?2$=7T27>r+CH}hzpuTbzFG{#eMF>t)5G3UBWLQHt
zpYPuXhoLVGzV7n^dLf5;VBkXx(|Nnr@QM!4o@1|DFe_ccZT7!|_huRinOa&2nZRJ>
zFa;}TBv`5MV5LTbl_CsQiifMoOuT3K?B|=sRdMZ{e2J@n1a8;(?9w0cCT%0Muj2;a
z6mDXW&$Gct82U95+#4Hw3)wJug*!+{smYti7;2Ty1Yi5O%l;t4fcAneFKDuVp}vjb
z7?6?QBOn8@Afp&N2QqbxktoP@mb=jgL>eF<<FO#QD9B(e$YeZ7E(&ssAlWt`q5uJz
z!Ze?{H3?eM*CWjQ7CDjOSP%>EguyG6nux7ya{L%GQIJuBjI{v~2@1#^+zoTJ1a^eE
z=!xWFLEgoCryxy@ur+g0kST&pw*iqE5RiMZtyzeI%*KM;k8jOF6yy#;?zRDuArz3s
zSdgVC$b2lwN<7F?6yzR37TSQwEg&Ed@ByFE@m-CA+>ZrWM?MU0jW1iX8U<M<$VwX!
zxrPLU7hag_7phIfTKNkb&&-cr;$y0I=mZ6G>ja<E9^qnsq3xX5Uut{i1kcQ`wLN!&
zZ%kX;3*uAM_LA6+wpYbxkM;@N)`m?aS$viMN!Rcc>u_neF1|{5^C<ifj8XYNxTMtQ

literal 3291
zcma)+TT>KA6vt0<SuPm_SBxPV9j`1GokfuZK}B8B4Fph-#2Aw_yDbixoxzz|qvm2h
zN>V=LC8;D;f>lXXUU*66L#6UR)4MDTv*^q2>7H}>^*R6UfB*aQZz39|A6lqE(8(p=
zDhDf}C5wS2{YOO=SS7Eh980;O9X_=tZKtGKs7X-QihL|BN4m?_?9z%Vgn}CEq9BnM
zl!9;B@dTx(YhLrAZ@bH5f_iS3k*uT^?Z94g)D_qDLK)hg8wffT1w64HOUEuon^plI
zLSNc$7+5o2I8$~UBxxzBAdt&S(B6fOU%8s8O6HO;-2&<!-#yK|{Y)W8W65?Kae5rQ
zu_T|ci36Ot6DU(3ATV)kUzul3X%1zxW<mP05Gr4Rv<<x}_;x{h94GM8`6C*bi*`4D
z-gp6^D0m3L!`WE0vFfds9qHqcMVvw81nt3j<uv$Z34u67mu_A;v>huaLneOBx#naL
z!mAtJ(o{jX@ssI#=7Vxr_K~lB)e8VWC&Pz~{Ewg`bJ5Ng(6celmZI&e(DON99057K
z+!8Uey)CI_<tnb0nSPy?ZbY8oO^w^G9bUo|GJT7Jnyx`{?bJwp2A!l+f;y*dSIv}5
zOUhr6Pz>wJD@bP%{o{3IvnhONV=%q1EgXp$b(@z}n8(CXHs3~qh74+^6!rtX-;~KS
zPaE78DuV9L^zD>1$G&e+3$?--u~p~&nVr6z&_F`16R3xS#|_%Y!3KgiKj7T(o7<)n
zkmfkxia`hH9e5yMyGK(d$0hc1iI|?!RrZ>qIM)q>dgxt*aPe5kzRC$|5uCgu;;L$i
zb4(lb9v`41;;DXt<QPLshTY~2GTE)2OX+RhUM&Sd{Xl#}*>Ju)1|6ppy6M#v18*!m
zK1yro>36AxJ{5Ez{#sov+fGsWt@Ih7BiWeu?Bd0Cx=Ww4I7iv~(jZAokg;4{RW9^&
z2)fxZ`AVv>R(@mJ1}iU2l<EN|SQd0TNiVx3vZ0tkbMqa#*h*hP5`*T}w<Ri2;sP#%
z<#q#Gg$R&un+BqIpW|`0wgKu_e{8peWhjDis)7LF*Jvba=;34iG-`%^G_d>zZ{dAz
z>URcxLg(Q;@0I<6Lho_y^$5=Jl;|kt&#zJ|HSn#4)xb9pyKS%!W7Q7(t$+;bfa9J#
zby8QJ_VQL5Uvc3ozCDpIRo%MTZ9lucjSskHQEFU~ihF0p{h&^N2uo;xmt2QA*Aciu
z`@6UuWw&E+gQQV14OhH=`0d5Y!oR?ObN?&K{1FlL<2My;w$T7=Lp#tQoyJPgnJ8#`
z@Jq`65(_?@7<`t_Aq59t0#O70Q~d|mC|fJt9_=1Q?~g?pxLFLO%d^E(Vd`NzU&&QF
z#Y-CbJqB_j5#$3J-2pPNMk8^MUX;t!0nxG$bRiLBEDqA22y!tQWGoJH8X#xtfN0GL
z^z`y(M;c)9Twl_}Z?TSK6G5)hwatz+Mpq!!-@8T=agcKW8Lk7us^-z;=z1mB*3nGH
zJ2H|8a+C6#AXSZEG?Q_VQGi^i1EQ~$pbryAGZhCJPXzfWc{EdTkjns>r~{&}u%MYl
zkl8rM)kKh6$sn_Fkm~@MtOKGS2|>4MK4CNqagdvdAdB>I(r6aqAX5ODt^>l)5Nia_
za3$9ZsEx&1`it(~P2YP(_o3SCI(?BYtdoL0g1_`bZI7|NqV0)wa?+l*C)epwI@I<Q
u`#je6EZa}Cy}&-tV6W4+wF9TA3B_k2>N!B&A{%z?;VW%EeBVdc==uNd&1~cV

diff --git a/HoraDaPipocaUpSource/build/classes/br/usjt/ads/arqdes/model/entity/Usuario.class b/HoraDaPipocaUpSource/build/classes/br/usjt/ads/arqdes/model/entity/Usuario.class
new file mode 100644
index 0000000000000000000000000000000000000000..dd97684b54b0484f5466140cf20532914c6620de
GIT binary patch
literal 1196
zcma)4YflqF6g^W~y42N{3I(bnsD-vX#@9E5M2&tTkXUVEj31`$q)fA&t-G^C|CJ^R
zi6;I4f0Xggb`!8&6SK+Pxvx3ro;$yOfBy;KF&^cSVc6^hJPHSfi(be@@S!I|KJ<Ii
z<5C-CKJhnUBm(8<k!2_i#Hrw((0zW~8OW|-$VcNmL;3I`+cJUD{XK@2R}oz^lx-EN
zjwhdL?Hgf~uS157xZxu|6`tzFLEfc=353!n<VU_aiad`l$%Rs%2!`1wN-J}~FjH@|
z8M4obX8|*~=AwWr48=pG<xw>3$l$dgG|S2F3a?EASU(A7&50uT#^HaCP7DftX%ZnA
z7V3@ZQRl!=agoC;Rfm_V7wgl-mc2t)w(MNC^M;E#+v!ke9HgW1$13J=n_+2E+h>vT
zdNOdZ&M==)TYHx*W50k^+_kDK+f&WO1~y4QF&atTW7tXKG(|Ik*mKYzI@@dU7WN%%
zF|hac-W?aWut4*+{3z(km&!`+CS-OkV}@$7<dF<Q6&k6#lD~*wmVF&5$#_YW%W5%{
zSSN92=(%R-BW=mclV|@<93|BzV%DeEK-Q%SPJc%KT=N`Pzr-y?vbG2$d5Nq$F2Fp>
z<S|^w0@=Ttzhdz-B{R5aE~PdvVL53&h&dBfbL$%xFQ5w)2Z7`W#==)(e>Q=))W&m?
zI;ljelSC@1L~f=NsZJ7EA-L*4h>XQ$cFD<5$FvNqT<r%|-<H?Tai>YroZ()%PKM4^
kdv20B!}cW6)k{Qc$-Eit#=7!&uSL@0KKTy_<Y9>1AO9`m9{>OV

literal 0
HcmV?d00001

diff --git a/HoraDaPipocaUpSource/build/classes/br/usjt/ads/arqdes/model/service/FilmeService.class b/HoraDaPipocaUpSource/build/classes/br/usjt/ads/arqdes/model/service/FilmeService.class
index 796dda6aca7ecd9141c642a2beaacf7dc757d4a7..6c2e9db0616093e884f7577abdc27649b4403e38 100644
GIT binary patch
delta 121
zcmZ3W@|H*7)W2Q(7#J8#7_8YDm>3y!CtqZd+^8waGFg)=laY1uWG*d6-pTv8ycmTh
z*Yn6v*5J0`6l36I5NF_HkeHmyoyI5w6c?ZTn%hNFfq@@r5)T6-kmO(xU=Re-Obixa
P(vpE4NV5UutQZ&oq%#!!

literal 4640
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

diff --git a/HoraDaPipocaUpSource/build/classes/br/usjt/ads/arqdes/model/service/GeneroService.class b/HoraDaPipocaUpSource/build/classes/br/usjt/ads/arqdes/model/service/GeneroService.class
index 597c2837e75d4cb3aba2a8bf33fd0d2fd79ba978..4deeba85fd8e0a526a3353e2be0577eb27063ae3 100644
GIT binary patch
delta 77
zcmaFH@r9l1)W2Q(7#J8#7&JC=wK7d!&y>Z;JXwmllu>B%1m<W>F$R91EDr-CkmO(x
XU=Re-Obn`EQjLKfNV5Uu)EO86*Jcbw

delta 151
zcmeyu{)~g`)W2Q(7#J8#7_>KXwKB;FCzTc_Cl<M<=A{<p7rSNV<fayLF-S3}^DwAR
z?q<qkWSRVnsgzN8ashL+xHtnpP%94uBaq}^5MU4l(u_cL6PUHE)HVP)ObmQLk`1gt
U8jE5k1`V((O$K(TIxPkU0DtEgJOBUy

diff --git a/HoraDaPipocaUpSource/build/classes/br/usjt/ads/arqdes/model/service/UsuarioService.class b/HoraDaPipocaUpSource/build/classes/br/usjt/ads/arqdes/model/service/UsuarioService.class
new file mode 100644
index 0000000000000000000000000000000000000000..6a4eb640991d46a787ec6be9ce57aa38b8ab173f
GIT binary patch
literal 894
zcma)4+invv5Ix?cU9v2+Bv2^#^3t?OSV%k|1&|^x5>iAYTJrAQb%N8x4z{-?d=*Ft
zBp&zxJ_<3rNrQl<;$>#f`0Vk_9RK+F?K^-6xDz5^;ECnA8+tA>$Ax{DNyo<~lOyh=
zJyfaWZ(J^{GJ7)^qROy76o-P3gdXs2GL)%ji1HcjS-Z=y(^;yT33IGS)E2|$>s)&^
zmObTEGLmhrjTc@S?HC?*j2&<{u}Tm6R*dD5u?IYnLOb3UsW*1Y#o`Cv&b>KOR%Rr-
z`bcTzpD<LKJ3WT#Q<^D41?OVa5HYNEl$NjZaU$)$pnDnW9g~Vtk7h0Kyjb;b6*Y2y
z`9LSHi8_e-;)ApuGf<jgzqwpN()@mUyp`4|%lnH-cRYWe%1ODc5E~4Q(imm<%kJW&
z28Js!R<Ii3Dz1mP#<2aL{=}%G!4S^PJ=NKNo7*$FP2~$!Y`5{}GrCta%FsN~VCSWk
z#!n}b&tF{&TQo(5-Yr8=j6yjiROB<11IlD8#j}JsWkz{r_bcL0<?(rn1sRC3R>qQm
zbzC4s=A%I(7wNl7=u#>3m?{BPYP+9t`R*5Nek2g!w^Y59+L)2%QbflM+$50zw@Uu)
IMW<W9FQyRc6951J

literal 0
HcmV?d00001

diff --git a/HoraDaPipocaUpSource/src/br/usjt/ads/arqdes/controller/ManterFilmesController.java b/HoraDaPipocaUpSource/src/br/usjt/ads/arqdes/controller/ManterFilmesController.java
index 6dbd96d..2f97644 100644
--- a/HoraDaPipocaUpSource/src/br/usjt/ads/arqdes/controller/ManterFilmesController.java
+++ b/HoraDaPipocaUpSource/src/br/usjt/ads/arqdes/controller/ManterFilmesController.java
@@ -1,27 +1,21 @@
 package br.usjt.ads.arqdes.controller;
 
 import java.io.IOException;
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
-import java.util.Date;
 
 import javax.servlet.http.HttpSession;
-import javax.validation.Valid;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.propertyeditors.CustomDateEditor;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.WebDataBinder;
-import org.springframework.web.bind.annotation.InitBinder;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
 
 import br.usjt.ads.arqdes.model.entity.Filme;
 import br.usjt.ads.arqdes.model.entity.Genero;
+import br.usjt.ads.arqdes.model.entity.Usuario;
 import br.usjt.ads.arqdes.model.service.FilmeService;
 import br.usjt.ads.arqdes.model.service.GeneroService;
+import br.usjt.ads.arqdes.model.service.UsuarioService;
 
 @Controller
 public class ManterFilmesController {
@@ -29,12 +23,12 @@ public class ManterFilmesController {
 	private FilmeService fService;
 	@Autowired
 	private GeneroService gService;
+	@Autowired
+	private UsuarioService uService;
 	
-	@InitBinder
-	public void initBinder(WebDataBinder binder) {
-	    SimpleDateFormat dateFormat = new SimpleDateFormat("dd/MM/yyyy");
-	    dateFormat.setLenient(false);
-	    binder.registerCustomEditor(Date.class, new CustomDateEditor(dateFormat, true));
+	public ManterFilmesController() {
+		fService = new FilmeService();
+		gService = new GeneroService();
 	}
 	
 	@RequestMapping("/")
@@ -66,147 +60,38 @@ public String novoFilme(HttpSession session) {
 	}
 	
 	@RequestMapping("/inserir_filme")
-	public String inserirFilme(@Valid Filme filme, BindingResult result, Model model) {
+	public String inserirFilme(Filme filme, Model model) {
 		try {
-			if (!result.hasFieldErrors()) {
-				Genero genero = gService.buscarGenero(filme.getGenero().getId());
-				filme.setGenero(genero);
-				model.addAttribute("filme", filme);
-				fService.inserirFilme(filme);
-				return "VisualizarFilme";
-			}
-			return "CriarFilme";
-			
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-		return "index";
-	}
-	
-	@RequestMapping("/buscar_filmes")
-	public String buscarFilmes(HttpSession session, @RequestParam String chave) {
-		try {
-			ArrayList<Filme> lista;
-			
-			if(chave != null && chave.length() > 0)
-				lista = fService.listarFilmes(chave);
-			else
-				lista = fService.listarFilmes();
-			
-			session.setAttribute("lista", lista);
-			return "ListarFilmes";
-		} catch (IOException e) {
-			e.printStackTrace();
-			return "Erro";
-		}
-	}
-	
-	@RequestMapping("/visualizar_filme")
-	public String visualizarFilme(HttpSession session, @RequestParam String id) {
-		try {
-			Filme verFilme = fService.buscarFilme(Integer.parseInt(id));
-			session.setAttribute("filme", verFilme);
+			Genero genero = gService.buscarGenero(filme.getGenero().getId());
+			filme.setGenero(genero);
+			model.addAttribute("filme", filme);
+			fService.inserirFilme(filme);
 			return "VisualizarFilme";
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-		
-		return "ListarFilmes";
-	}
-	
-	@RequestMapping("/excluir_filme")
-	public String excluirFilme(Model model, @RequestParam String id) {
-		try {
-			fService.excluirFilme(Integer.parseInt(id));
-			model.addAttribute("chave", "");
-			return "redirect:buscar_filmes";
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-		
-		return "Erro";
-	}
-	
-	@RequestMapping("/editar_filme")
-	public String editarFilme(Model model, @RequestParam String id) {
-		try {
-			ArrayList<Genero> generos = gService.listarGeneros();
-			model.addAttribute("generos", generos);
-			model.addAttribute("filme", fService.buscarFilme(Integer.parseInt(id)));
-			return "EditarFilme";
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-		
-		return "Erro";
-	}
-	
-	@RequestMapping("/salvar_filme")
-	public String salvarFilme(@Valid Filme filme, BindingResult result, Model model) {
-		System.out.println(filme);
-		try {
-			if (!result.hasFieldErrors()) {
-				Genero genero = gService.buscarGenero(filme.getGenero().getId());
-				filme.setGenero(genero);
-				model.addAttribute("filme", filme);
-				fService.alterarFilme(filme);
-				return "VisualizarFilme";
-			}
-			return "EditarFilme";
 			
 		} catch (IOException e) {
+			// TODO Auto-generated catch block
 			e.printStackTrace();
 		}
 		return "index";
 	}
 	
-	@RequestMapping("/listar_genero")
-	public String listarGenero(Model model) {
-		try {
-			ArrayList<Genero> glista = gService.buscarGenerosFilmes();
-			ArrayList<Filme> flista = fService.listarFilmes();
-			model.addAttribute("glista", glista);
-			model.addAttribute("flista", flista);
-			return "ListarFilmesGenero";
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-		return "Erro";
-	}
-	
-	@RequestMapping("/listar_popularidade")
-	public String listarPopularidade(Model model) {
-		
-		try {
-			int[][] ratingRanges = new int[][] { { 81, 100 }, { 61, 80 }, { 41, 60 }, { 21, 40 }, { 0, 20 } };
-			ArrayList<Filme> lista = fService.listarFilmes();
-			model.addAttribute("flista", lista);
-			model.addAttribute("ratings", fService.getRatings(lista, ratingRanges));
-			model.addAttribute("ranges", ratingRanges);
-			return "ListarFilmesPopularidade";
-		}catch (IOException e) {
-			e.printStackTrace();
-		}
-		
-		return "Erro";
+	@RequestMapping("/tela_login")
+	public String telaLogin() {
+		return "TelaLogin";
 	}
 	
-	@RequestMapping("/listar_lancamento")
-	public String listarLancamento(Model model) {
-		
+	@RequestMapping("/fazer_login")
+	public String fazerLogin(Usuario usuario, HttpSession session) {
 		try {
-			ArrayList<Filme> lista = fService.listarFilmes();
-			ArrayList<ArrayList<Filme>> listas = new ArrayList<ArrayList<Filme>>();
-			listas = fService.getLancamentos(lista);
-			model.addAttribute("listas", listas);
-			return "ListarFilmesLancamento";
-		}catch (IOException e) {
+			usuario = uService.fazerLogin(usuario);
+			session.setAttribute("usuario", usuario);
+			return "redirect:/inicio";
+		} catch (IOException e) {
 			e.printStackTrace();
 		}
-		
-		return "Erro";
+		return "erro";
 	}
-	
+
 }
 
 
diff --git a/HoraDaPipocaUpSource/src/br/usjt/ads/arqdes/controller/OldManterFilmesController.java b/HoraDaPipocaUpSource/src/br/usjt/ads/arqdes/controller/OldManterFilmesController.java
new file mode 100644
index 0000000..cf7f824
--- /dev/null
+++ b/HoraDaPipocaUpSource/src/br/usjt/ads/arqdes/controller/OldManterFilmesController.java
@@ -0,0 +1,123 @@
+package br.usjt.ads.arqdes.controller;
+
+import java.io.IOException;
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+
+import javax.servlet.RequestDispatcher;
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+
+import br.usjt.ads.arqdes.model.entity.Filme;
+import br.usjt.ads.arqdes.model.entity.Genero;
+import br.usjt.ads.arqdes.model.service.FilmeService;
+import br.usjt.ads.arqdes.model.service.GeneroService;
+
+/**
+ * Servlet implementation class ManterFilmesController
+ */
+@WebServlet("/manterfilmes.do")
+public class OldManterFilmesController extends HttpServlet {
+	private static final long serialVersionUID = 1L;
+
+	protected void doGet(HttpServletRequest request, HttpServletResponse response)
+			throws ServletException, IOException {
+		request.setCharacterEncoding("UTF-8");
+		String acao = request.getParameter("acao");
+		RequestDispatcher dispatcher;
+		FilmeService fService;
+		GeneroService gService;
+		Filme filme;
+		HttpSession session;
+
+		String titulo = request.getParameter("titulo");
+		String descricao = request.getParameter("descricao");
+		String diretor = request.getParameter("diretor");
+		String posterPath = request.getParameter("posterPath");
+		String popularidade = request.getParameter("popularidade") == null
+				|| request.getParameter("popularidade").length() == 0 ? "0" : request.getParameter("popularidade");
+		String dataLancamento = request.getParameter("dataLancamento") == null
+				|| request.getParameter("dataLancamento").length() == 0 ? ""
+						: request.getParameter("dataLancamento");
+		String idGenero = request.getParameter("genero.id");
+		String chave = request.getParameter("data[search]");
+
+		switch (acao) {
+		case "novo":
+			gService = new GeneroService();
+			ArrayList<Genero> generos = gService.listarGeneros();
+			session = request.getSession();
+			session.setAttribute("generos", generos);
+			dispatcher = request.getRequestDispatcher("CriarFilme.jsp");
+			dispatcher.forward(request, response);
+			break;
+		case "criar":
+			
+
+			fService = new FilmeService();
+			filme = new Filme();
+			filme.setTitulo(titulo);
+			filme.setDescricao(descricao);
+			filme.setDiretor(diretor);
+
+			gService = new GeneroService();
+			Genero genero = new Genero();
+			genero.setId(Integer.parseInt(idGenero));
+			genero.setNome(gService.buscarGenero(genero.getId()).getNome());
+			filme.setGenero(genero);
+
+			DateFormat formatter = new SimpleDateFormat("dd/MM/yyyy");
+			try {
+				filme.setDataLancamento(formatter.parse(dataLancamento));
+			} catch (ParseException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+				filme.setDataLancamento(null);
+			}
+
+			filme.setPopularidade(Double.parseDouble(popularidade));
+			filme.setPosterPath(posterPath);
+
+			filme = fService.inserirFilme(filme);
+
+			request.setAttribute("filme", filme);
+
+			dispatcher = request.getRequestDispatcher("VisualizarFilme.jsp");
+			dispatcher.forward(request, response);
+			break;
+		case "buscar":
+
+		case "reiniciar":
+			session = request.getSession();
+			session.setAttribute("lista", null);
+			dispatcher = request.getRequestDispatcher("ListarFilmes.jsp");
+			dispatcher.forward(request, response);
+			break;
+		case "listar":
+			session = request.getSession();
+			fService = new FilmeService();
+			ArrayList<Filme> lista;
+			if (chave != null && chave.length() > 0) {
+				lista = fService.listarFilmes(chave);
+			} else {
+				lista = fService.listarFilmes();
+			}
+			session.setAttribute("lista", lista);
+			dispatcher = request.getRequestDispatcher("ListarFilmes.jsp");
+			dispatcher.forward(request, response);
+		}
+
+	}
+
+	protected void doPost(HttpServletRequest request, HttpServletResponse response)
+			throws ServletException, IOException {
+		doGet(request, response);
+	}
+
+}
diff --git a/HoraDaPipocaUpSource/src/br/usjt/ads/arqdes/interceptor/Interceptor.java b/HoraDaPipocaUpSource/src/br/usjt/ads/arqdes/interceptor/Interceptor.java
new file mode 100644
index 0000000..42c05af
--- /dev/null
+++ b/HoraDaPipocaUpSource/src/br/usjt/ads/arqdes/interceptor/Interceptor.java
@@ -0,0 +1,25 @@
+package br.usjt.ads.arqdes.interceptor;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
+
+public class Interceptor extends HandlerInterceptorAdapter {
+	
+	@Override
+	public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object controller) throws Exception {
+		
+		String uri = request.getRequestURI();
+		
+		if (uri.endsWith("/") || uri.endsWith("inicio") || uri.endsWith("fazer_login") || uri.endsWith("tela_login") || uri.contains("css") || uri.contains("js") ||uri.contains("img")) {
+			return true;
+		}
+		
+		if (request.getSession().getAttribute("usuario") != null) {
+			return true;
+		}
+		response.sendRedirect("tela_login");
+		return false;
+	}
+}
diff --git a/HoraDaPipocaUpSource/src/br/usjt/ads/arqdes/model/dao/ConnectionFactory.java b/HoraDaPipocaUpSource/src/br/usjt/ads/arqdes/model/dao/ConnectionFactory.java
index 681e982..663e65b 100644
--- a/HoraDaPipocaUpSource/src/br/usjt/ads/arqdes/model/dao/ConnectionFactory.java
+++ b/HoraDaPipocaUpSource/src/br/usjt/ads/arqdes/model/dao/ConnectionFactory.java
@@ -11,6 +11,8 @@ public class ConnectionFactory {
 			Class.forName("com.mysql.jdbc.Driver");
 		} catch (ClassNotFoundException e) {
 			e.printStackTrace();
+			// porque este erro nao pode ser prevenido via programa usa-se RuntimeException,
+			// que é unchecked.
 			throw new RuntimeException(e);
 		}
 	}
@@ -18,7 +20,7 @@ public class ConnectionFactory {
 	public static Connection getConnection() throws IOException {
 		try {
 			return DriverManager.getConnection("jdbc:mysql://localhost/pipocadb?"
-					+ "user=morone&password=morone123&useSSL=false&allowMultiQueries=true");
+					+ "user=alunos&password=alunos&useSSL=false");
 		} catch (SQLException e) {
 			e.printStackTrace();
 			throw new IOException(e);
diff --git a/HoraDaPipocaUpSource/src/br/usjt/ads/arqdes/model/dao/FilmeDAO.java b/HoraDaPipocaUpSource/src/br/usjt/ads/arqdes/model/dao/FilmeDAO.java
index 4b759f3..eb65709 100644
--- a/HoraDaPipocaUpSource/src/br/usjt/ads/arqdes/model/dao/FilmeDAO.java
+++ b/HoraDaPipocaUpSource/src/br/usjt/ads/arqdes/model/dao/FilmeDAO.java
@@ -17,13 +17,12 @@
 
 @Repository
 public class FilmeDAO {
-	
 	Connection conn;
 	
 	@Autowired
-	public FilmeDAO(DataSource ds) throws IOException {
+	public FilmeDAO(DataSource data) throws IOException {
 		try {
-			conn = ds.getConnection();
+			conn = data.getConnection();
 		} catch (SQLException e) {
 			e.printStackTrace();
 			throw new IOException(e);
@@ -67,46 +66,14 @@ public int inserirFilme(Filme filme) throws IOException {
 	}
 
 	public Filme buscarFilme(int id) throws IOException{
-		Filme filme = new Filme();
-		String sql = "select f.id, f.titulo, f.descricao, f.diretor, f.posterpath, "
-				+ "f.popularidade, f.data_lancamento, f.id_genero, g.nome "
-				+ "from filme f, genero g "
-				+ "where f.id_genero = g.id and f.id = ?";
-		
-		try(PreparedStatement pst = conn.prepareStatement(sql);){
-			
-			pst.setInt(1, id);
-			
-			try(ResultSet rs = pst.executeQuery();){
-				Genero genero;
-				if(rs.next()) {
-					
-					filme.setId(rs.getInt("f.id"));
-					filme.setTitulo(rs.getString("f.titulo"));
-					filme.setDescricao(rs.getString("f.descricao"));
-					filme.setDiretor(rs.getString("f.diretor"));
-					filme.setPosterPath(rs.getString("f.posterpath"));
-					filme.setPopularidade(rs.getDouble("f.popularidade"));
-					filme.setDataLancamento(rs.getDate("f.data_lancamento"));
-					genero = new Genero();
-					genero.setId(rs.getInt("f.id_genero"));
-					genero.setNome(rs.getString("g.nome"));
-					filme.setGenero(genero);
-				}
-			}
-			
-		}	catch (SQLException e) {
-			e.printStackTrace();
-			throw new IOException(e);
-		}
-		
-		return filme;		
+		// TODO Auto-generated method stub
+		return null;
 	}
 
 	public ArrayList<Filme> listarFilmes(String chave) throws IOException {
 		ArrayList<Filme> lista = new ArrayList<>();
 		String sql = "select f.id, f.titulo, f.descricao, f.diretor, f.posterpath, "
-				+ "f.popularidade, f.data_lancamento, f.id_genero, g.nome "
+				+ "f. popularidade, f.data_lancamento, f.id_genero, g.nome "
 				+ "from filme f, genero g "
 				+ "where f.id_genero = g.id and upper(f.titulo) like ?";
 		try(PreparedStatement pst = conn.prepareStatement(sql);){
@@ -124,7 +91,6 @@ public ArrayList<Filme> listarFilmes(String chave) throws IOException {
 					filme.setDescricao(rs.getString("f.descricao"));
 					filme.setDiretor(rs.getString("f.diretor"));
 					filme.setPosterPath(rs.getString("f.posterpath"));
-					filme.setPopularidade(rs.getDouble("f.popularidade"));
 					filme.setDataLancamento(rs.getDate("f.data_lancamento"));
 					genero = new Genero();
 					genero.setId(rs.getInt("f.id_genero"));
@@ -142,87 +108,11 @@ public ArrayList<Filme> listarFilmes(String chave) throws IOException {
 	}
 	
 	public ArrayList<Filme> listarFilmes() throws IOException {
-		ArrayList<Filme> lista = new ArrayList<>();
-		String sql = "select f.id, f.titulo, f.descricao, f.diretor, f.posterpath, "
-				+ "f.popularidade, f.data_lancamento, f.id_genero, g.nome "
-				+ "from filme f, genero g "
-				+ "where f.id_genero = g.id ORDER BY f.data_lancamento DESC";
-		try(PreparedStatement pst = conn.prepareStatement(sql);
-			ResultSet rs = pst.executeQuery();){
-			
-			Filme filme;
-			Genero genero;
-			while(rs.next()) {
-				filme = new Filme();
-				filme.setId(rs.getInt("f.id"));
-				filme.setTitulo(rs.getString("f.titulo"));
-				filme.setDescricao(rs.getString("f.descricao"));
-				filme.setDiretor(rs.getString("f.diretor"));
-				filme.setPosterPath(rs.getString("f.posterpath"));
-				filme.setPopularidade(rs.getDouble("f.popularidade"));
-				filme.setDataLancamento(rs.getDate("f.data_lancamento"));
-				genero = new Genero();
-				genero.setId(rs.getInt("f.id_genero"));
-				genero.setNome(rs.getString("g.nome"));
-				filme.setGenero(genero);
-				lista.add(filme);
-			}
-		} catch (SQLException e) {
-			e.printStackTrace();
-			throw new IOException(e);
-		}				
-		return lista;
-	}
-	
-	public void excluirFilme(int id) throws IOException {
-		String sql = "delete from filme where id = ?";
-		
-		try(PreparedStatement pst = conn.prepareStatement(sql);){
-			
-			pst.setInt(1, id);
-			pst.execute();
-			
-		}	catch (SQLException e) {
-			e.printStackTrace();
-			throw new IOException(e);
-		}	
-	}
-	
-	public int alterarFilme(Filme filme) throws IOException {
-		int id = -1;
-		String sql = "update filme set titulo = ?, descricao = ?, diretor = ?, posterpath = ?, "
-				+ "popularidade = ?, data_lancamento = ?, id_genero = ? where id = ?";
-		
-		try(PreparedStatement pst = conn.prepareStatement(sql);){
-			
-			pst.setString(1, filme.getTitulo());
-			pst.setString(2, filme.getDescricao());
-			pst.setString(3, filme.getDiretor());
-			pst.setString(4, filme.getPosterPath());
-			pst.setDouble(5, filme.getPopularidade());
-			if(filme.getDataLancamento() != null) {
-				pst.setDate(6, new java.sql.Date(filme.getDataLancamento().getTime()));
-			} else {
-				pst.setDate(6,  null);
-			}
-			pst.setInt(7, filme.getGenero().getId());	
-			pst.setInt(8, filme.getId());
-			id = filme.getId();
-			pst.execute();
-			
-		} catch (SQLException e) {
-			e.printStackTrace();
-			throw new IOException(e);
-		}
-		return id;
-	}
-	
-	public ArrayList<Filme> listarFilmesData() throws IOException {
 		ArrayList<Filme> lista = new ArrayList<>();
 		String sql = "select f.id, f.titulo, f.descricao, f.diretor, f.posterpath, "
 				+ "f. popularidade, f.data_lancamento, f.id_genero, g.nome "
 				+ "from filme f, genero g "
-				+ "where f.id_genero = g.id ORDER BY f.data_lancamento desc";
+				+ "where f.id_genero = g.id";
 		try(PreparedStatement pst = conn.prepareStatement(sql);
 			ResultSet rs = pst.executeQuery();){
 			
@@ -235,7 +125,6 @@ public ArrayList<Filme> listarFilmesData() throws IOException {
 				filme.setDescricao(rs.getString("f.descricao"));
 				filme.setDiretor(rs.getString("f.diretor"));
 				filme.setPosterPath(rs.getString("f.posterpath"));
-				filme.setPopularidade(rs.getDouble("f.popularidade"));
 				filme.setDataLancamento(rs.getDate("f.data_lancamento"));
 				genero = new Genero();
 				genero.setId(rs.getInt("f.id_genero"));
diff --git a/HoraDaPipocaUpSource/src/br/usjt/ads/arqdes/model/dao/GeneroDAO.java b/HoraDaPipocaUpSource/src/br/usjt/ads/arqdes/model/dao/GeneroDAO.java
index 146ff14..bb9eb84 100644
--- a/HoraDaPipocaUpSource/src/br/usjt/ads/arqdes/model/dao/GeneroDAO.java
+++ b/HoraDaPipocaUpSource/src/br/usjt/ads/arqdes/model/dao/GeneroDAO.java
@@ -8,6 +8,7 @@
 import java.util.ArrayList;
 
 import javax.sql.DataSource;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Repository;
 
@@ -15,13 +16,12 @@
 
 @Repository
 public class GeneroDAO {
-
 	Connection conn;
-
+	
 	@Autowired
-	public GeneroDAO(DataSource ds) throws IOException {
+	public GeneroDAO(DataSource data) throws IOException {
 		try {
-			conn = ds.getConnection();
+			conn = data.getConnection();
 		} catch (SQLException e) {
 			e.printStackTrace();
 			throw new IOException(e);
@@ -69,24 +69,4 @@ public ArrayList<Genero> listarGeneros() throws IOException {
 		}
 		return generos;
 	}
-	
-	public ArrayList<Genero> buscarGenerosFilmes() throws IOException {
-		ArrayList<Genero> generos = new ArrayList<>();
-		String sql = "select distinct g.id, g.nome, f.id_genero from genero g, filme f where g.id = f.id_genero;";
-
-		try (PreparedStatement pst = conn.prepareStatement(sql);
-				ResultSet rs = pst.executeQuery();) {
-
-			while (rs.next()) {
-				Genero genero = new Genero();
-				genero.setId(rs.getInt("g.id"));
-				genero.setNome(rs.getString("g.nome"));
-				generos.add(genero);
-			}
-		} catch (SQLException e) {
-			e.printStackTrace();
-			throw new IOException(e);
-		}
-		return generos;
-	}
 }
diff --git a/HoraDaPipocaUpSource/src/br/usjt/ads/arqdes/model/dao/UsuarioDAO.java b/HoraDaPipocaUpSource/src/br/usjt/ads/arqdes/model/dao/UsuarioDAO.java
new file mode 100644
index 0000000..ccbbed2
--- /dev/null
+++ b/HoraDaPipocaUpSource/src/br/usjt/ads/arqdes/model/dao/UsuarioDAO.java
@@ -0,0 +1,54 @@
+package br.usjt.ads.arqdes.model.dao;
+
+import java.io.IOException;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+import javax.sql.DataSource;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Repository;
+
+
+import br.usjt.ads.arqdes.model.entity.Usuario;
+
+@Repository
+public class UsuarioDAO {
+	Connection conn;
+	
+	@Autowired
+	public UsuarioDAO(DataSource data) throws IOException {
+		try {
+			conn = data.getConnection();
+		} catch (SQLException e) {
+			e.printStackTrace();
+			throw new IOException(e);
+		}
+	}
+	
+	public Usuario fazerLogin(Usuario usuario) throws IOException {
+		String sql = "select u from usuario u where u.usuario = ? and u.senha = ?";
+		
+		try(PreparedStatement pst = conn.prepareStatement(sql);){
+			
+			pst.setString(1, usuario.getUsuario());
+			pst.setString(2, usuario.getSenha());
+			
+			try(ResultSet rs = pst.executeQuery()) {
+				if(rs.next()) {
+					return usuario;
+				}
+			} catch (SQLException e) {
+				e.printStackTrace();
+				return null;
+			}
+			
+		} catch(SQLException e) {
+			e.printStackTrace();
+			throw new IOException(e);
+		}
+		return null;
+	}
+}
diff --git a/HoraDaPipocaUpSource/src/br/usjt/ads/arqdes/model/entity/Filme.java b/HoraDaPipocaUpSource/src/br/usjt/ads/arqdes/model/entity/Filme.java
index a713cd0..9023d62 100644
--- a/HoraDaPipocaUpSource/src/br/usjt/ads/arqdes/model/entity/Filme.java
+++ b/HoraDaPipocaUpSource/src/br/usjt/ads/arqdes/model/entity/Filme.java
@@ -2,27 +2,13 @@
 
 import java.util.Date;
 
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Past;
-import javax.validation.constraints.Size;
-
 public class Filme {
 	private int id;
-	@NotNull(message="Título em branco")
-	@Size(min=2, max=100, message="Use titulos entre 2 a 100 caracteres")
 	private String titulo;
-	@NotNull 
-	@Size(min=1, max=4000, message="Descrição entre 1 a 4000 caracteres")
 	private String descricao;
 	private double popularidade;
-	@NotNull 
-	@Past(message="Data está no futuro")
 	private Date dataLancamento;
-	@NotNull 
-	@Size(min=1, max=200, message="Poster entre 1 a 200 caracteres")
 	private String posterPath;
-	@NotNull 
-	@Size(min=1, max=60, message="Diretor entre 1 a 60 caracteres")
 	private String diretor;
 	private Genero genero;
 	
diff --git a/HoraDaPipocaUpSource/src/br/usjt/ads/arqdes/model/entity/Usuario.java b/HoraDaPipocaUpSource/src/br/usjt/ads/arqdes/model/entity/Usuario.java
new file mode 100644
index 0000000..6ea77f0
--- /dev/null
+++ b/HoraDaPipocaUpSource/src/br/usjt/ads/arqdes/model/entity/Usuario.java
@@ -0,0 +1,34 @@
+package br.usjt.ads.arqdes.model.entity;
+
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import javax.validation.constraints.NotNull;
+
+@Entity
+@Table(name="usuario")
+public class Usuario {
+	@NotNull
+	private String usuario;
+	@NotNull
+	private String senha;
+	
+	public String getUsuario() {
+		return usuario;
+	}
+	public void setUsuario(String usuario) {
+		this.usuario = usuario;
+	}
+	public String getSenha() {
+		return senha;
+	}
+	public void setSenha(String senha) {
+		this.senha = senha;
+	}
+	
+	@Override
+	public String toString() {
+		return "Usuario [usuario=" + usuario + ", senha=" + senha + "]";
+	}
+	
+	
+}
diff --git a/HoraDaPipocaUpSource/src/br/usjt/ads/arqdes/model/service/FilmeService.java b/HoraDaPipocaUpSource/src/br/usjt/ads/arqdes/model/service/FilmeService.java
index 77067bf..937d584 100644
--- a/HoraDaPipocaUpSource/src/br/usjt/ads/arqdes/model/service/FilmeService.java
+++ b/HoraDaPipocaUpSource/src/br/usjt/ads/arqdes/model/service/FilmeService.java
@@ -2,7 +2,6 @@
 
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Calendar;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -15,7 +14,6 @@ public class FilmeService {
 	@Autowired
 	private FilmeDAO dao;
 	
-	
 	public Filme buscarFilme(int id) throws IOException{
 		return dao.buscarFilme(id);
 	}
@@ -34,81 +32,4 @@ public ArrayList<Filme> listarFilmes() throws IOException{
 		return dao.listarFilmes();
 	}
 
-	public void excluirFilme(int id) throws IOException {
-		dao.excluirFilme(id);
-	}
-	
-	public Filme alterarFilme(Filme filme) throws IOException {
-		int id = dao.alterarFilme(filme);
-		filme.setId(id);
-		return filme;
-	}
-	
-	public ArrayList<Filme> listarFilmesData() throws IOException{
-		return dao.listarFilmesData();
-	}
-	
-	public int[] getRatings(ArrayList<Filme> lista, int[][] r) {
-		int[] res = new int[] { 0, 0, 0, 0, 0 };
-		int k = 0;
-
-		for (int[] i : r) {
-			if (containsRatingInBetween(lista, i[0], i[1])) {
-				res[k] = 1;
-			}
-			k++;
-		}
-
-		return res;
-	}
-
-	public boolean containsRatingInBetween(ArrayList<Filme> lista, double a, double b) {
-
-		for (Filme f : lista) {
-			if (f.getPopularidade() >= a && f.getPopularidade() <= b) {
-				return true;
-			}
-		}
-
-		return false;
-	}
-	
-	public ArrayList<ArrayList<Filme>> getLancamentos(ArrayList<Filme> lista) {
-		ArrayList<ArrayList<Filme>> l = new ArrayList<ArrayList<Filme>>();
-		l.add(new ArrayList<Filme>());
-		Calendar cal = Calendar.getInstance();
-		int mesAtual, mesFilme, anoFilme, anoAtual, contador = 0;
-		mesAtual = cal.get(Calendar.MONTH);
-		anoAtual = cal.get(Calendar.YEAR);
-		ArrayList<Integer> anos = new ArrayList<Integer>();
-
-		for (Filme f : lista) {
-			cal.setTime(f.getDataLancamento());
-			mesFilme = cal.get(Calendar.MONTH);
-			anoFilme = cal.get(Calendar.YEAR);
-			if (mesAtual == mesFilme && anoFilme == anoAtual) {
-				l.get(contador).add(f);
-			}
-
-		}
-
-		contador++;
-
-		for (Filme f : lista) {
-			cal.setTime(f.getDataLancamento());
-			anoFilme = cal.get(Calendar.YEAR);
-
-			if (!anos.contains(anoFilme)) {
-				anos.add(anoFilme);
-				l.add(new ArrayList<Filme>());
-				contador++;
-			}
-
-			l.get(contador - 1).add(f);
-
-		}
-
-		return l;
-	}
-
 }
diff --git a/HoraDaPipocaUpSource/src/br/usjt/ads/arqdes/model/service/GeneroService.java b/HoraDaPipocaUpSource/src/br/usjt/ads/arqdes/model/service/GeneroService.java
index 6c8472c..34d443d 100644
--- a/HoraDaPipocaUpSource/src/br/usjt/ads/arqdes/model/service/GeneroService.java
+++ b/HoraDaPipocaUpSource/src/br/usjt/ads/arqdes/model/service/GeneroService.java
@@ -13,7 +13,6 @@
 public class GeneroService {
 	@Autowired
 	private GeneroDAO dao;
-
 	
 	public Genero buscarGenero(int id) throws IOException {
 		return dao.buscarGenero(id);
@@ -22,9 +21,5 @@ public Genero buscarGenero(int id) throws IOException {
 	public ArrayList<Genero> listarGeneros() throws IOException{
 		return dao.listarGeneros();
 	}
-	
-	public ArrayList<Genero> buscarGenerosFilmes() throws IOException{
-		return dao.buscarGenerosFilmes();
-	}
 
 }
diff --git a/HoraDaPipocaUpSource/src/br/usjt/ads/arqdes/model/service/UsuarioService.java b/HoraDaPipocaUpSource/src/br/usjt/ads/arqdes/model/service/UsuarioService.java
new file mode 100644
index 0000000..0b534d2
--- /dev/null
+++ b/HoraDaPipocaUpSource/src/br/usjt/ads/arqdes/model/service/UsuarioService.java
@@ -0,0 +1,20 @@
+package br.usjt.ads.arqdes.model.service;
+
+import java.io.IOException;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import br.usjt.ads.arqdes.model.dao.UsuarioDAO;
+import br.usjt.ads.arqdes.model.entity.Usuario;
+
+@Service
+public class UsuarioService {
+	
+	@Autowired
+	private UsuarioDAO usuarioDAO;
+	
+	public Usuario fazerLogin(Usuario usuario) throws IOException {
+		return usuarioDAO.fazerLogin(usuario);
+	}
+}