(no commit message)
authormaroni <maroni@192.168.1.103>
Wed, 15 Feb 2012 12:17:27 +0000 (10:17 -0200)
committermaroni <maroni@192.168.1.103>
Wed, 15 Feb 2012 12:17:27 +0000 (10:17 -0200)
16 files changed:
src/conf/persistence.xml
src/java/org/ufcspa/simdecs/comunicacao/MetodoAutenticacao.java
src/java/org/ufcspa/simdecs/comunicacao/MetodoParaGravarLog.java
src/java/org/ufcspa/simdecs/comunicacao/MetodoSelecionaCaso.java
src/java/org/ufcspa/simdecs/comunicacao/MetodoSelecionaJogo.java
src/java/org/ufcspa/simdecs/entities/ArgumentosPedagogicos.java [deleted file]
src/java/org/ufcspa/simdecs/entities/ArquivoCaso.java [deleted file]
src/java/org/ufcspa/simdecs/entities/Log.java
src/java/org/ufcspa/simdecs/entities/NivelConfianca.java [deleted file]
src/java/org/ufcspa/simdecs/entities/ProblemasPrincipais.java [deleted file]
src/java/org/ufcspa/simdecs/entities/RespostaMediador.java [deleted file]
src/java/org/ufcspa/simdecs/entities/SessaoUsuario.java [new file with mode: 0644]
src/java/org/ufcspa/simdecs/entities/TaticasMediador.java [deleted file]
src/java/org/ufcspa/simdecs/entities/TipoEventoLog.java
src/java/org/ufcspa/simdecs/mb/editarcasos/EditarCasoBean.java
web/WEB-INF/web.xml

index ab86ebb..a3b17db 100644 (file)
@@ -3,23 +3,19 @@
   <persistence-unit name="SimDeCSPU" transaction-type="RESOURCE_LOCAL">
     <provider>org.hibernate.ejb.HibernatePersistence</provider>
     <non-jta-data-source>jdbc/SimDeCS</non-jta-data-source>
-    <class>org.ufcspa.simdecs.entities.ArgumentosPedagogicos</class>
     <class>org.ufcspa.simdecs.entities.ArquivoCaso</class>
     <class>org.ufcspa.simdecs.entities.Caso</class>
     <class>org.ufcspa.simdecs.entities.DependenciaNodo</class>
     <class>org.ufcspa.simdecs.entities.Log</class>
-    <class>org.ufcspa.simdecs.entities.NivelConfianca</class>
     <class>org.ufcspa.simdecs.entities.Nodo</class>
     <class>org.ufcspa.simdecs.entities.NodoPaciente</class>
     <class>org.ufcspa.simdecs.entities.Paciente</class>
     <class>org.ufcspa.simdecs.entities.PerguntaNodo</class>
-    <class>org.ufcspa.simdecs.entities.ProblemasPrincipais</class>
     <class>org.ufcspa.simdecs.entities.Rede</class>
     <class>org.ufcspa.simdecs.entities.RedeAluno</class>
-    <class>org.ufcspa.simdecs.entities.RespostaMediador</class>
     <class>org.ufcspa.simdecs.entities.RespostaNodo</class>
+    <class>org.ufcspa.simdecs.entities.SessaoUsuario</class>
     <class>org.ufcspa.simdecs.entities.SinonimoResposta</class>
-    <class>org.ufcspa.simdecs.entities.TaticasMediador</class>
     <class>org.ufcspa.simdecs.entities.TipoEventoLog</class>
     <class>org.ufcspa.simdecs.entities.Usuario</class>
     <exclude-unlisted-classes>true</exclude-unlisted-classes>
index 45265b9..2b3ed4b 100644 (file)
-/*\r
- * To change this template, choose Tools | Templates\r
- * and open the template in the editor.\r
- */\r
-package org.ufcspa.simdecs.comunicacao;\r
-\r
-import java.io.IOException;\r
-import java.io.PrintWriter;\r
-import javax.servlet.ServletException;\r
-import javax.servlet.http.HttpServlet;\r
-import javax.servlet.http.HttpServletRequest;\r
-import javax.servlet.http.HttpServletResponse;\r
-import javax.servlet.*;\r
-import java.sql.*;\r
-import javax.persistence.EntityManager;\r
-import javax.persistence.EntityManagerFactory;\r
-import javax.persistence.NoResultException;\r
-import javax.persistence.Persistence;\r
-import javax.servlet.http.*;\r
-import org.ufcspa.simdecs.entities.Log;\r
-import org.ufcspa.simdecs.entities.Usuario;\r
-\r
-/**\r
- *\r
- * @author pbarros\r
- * testye\r
- */\r
-public class MetodoAutenticacao extends HttpServlet {\r
-\r
-    /**\r
-     * Processes requests for both HTTP\r
-     * <code>GET</code> and\r
-     * <code>POST</code> methods.\r
-     *\r
-     * @param request servlet request\r
-     * @param response servlet response\r
-     * @throws ServletException if a servlet-specific error occurs\r
-     * @throws IOException if an I/O error occurs\r
-     */\r
-    private ServletConfig config;\r
-    public void init(ServletConfig config)\r
-            throws ServletException{\r
-        this.config=config;\r
-    }\r
-    protected void processRequest(HttpServletRequest request, HttpServletResponse response)\r
-            throws ServletException, IOException {\r
-        \r
-        PrintWriter out = response.getWriter();\r
-        // alteracao solicitado mosmmann \r
-        //response.setContentType("text/html;charset=UTF-8");\r
-        \r
-        response.setContentType( "text/xml" );\r
-        response.setHeader( "Cache-Control", "no-cache" );\r
-        ///para devolver arquivo anexo\r
-        //response.addHeader("Content-Disposition", "attachment; filename="+ "teste");\r
-        //response.setContentType("text/html;charset=UTF-8");\r
-        \r
-        //metodo antigo\r
-        //PrintWriter out = response.getWriter();\r
-        EntityManagerFactory emf = Persistence.createEntityManagerFactory("simdecsPU");\r
-        EntityManager em = emf.createEntityManager();\r
-        out.println( "<xml>" );\r
-        \r
-        Usuario user;\r
-       try {\r
-               user = (Usuario) em.createQuery("select usu from Usuario as usu where usu.login=:login and usu.senha=:senha")\r
-                                                                               .setParameter("login", request.getParameter("user"))\r
-                                                                               .setParameter("senha", request.getParameter("pass"))\r
-                                                                               .getSingleResult();     \r
-                \r
-                out.println( "<id>" + String.valueOf(user.getId()) + "</id>" );\r
-//                out.println("OK "+ user.getId());\r
-//                out.close();\r
-       } catch (NoResultException ne) {\r
-            \r
-//             request.setAttribute("id","0");         \r
-//             out.println("Usuario ou senha Inválido ");\r
-                out.println( "<id>" + "0" + "</id>" );\r
-                \r
-       } finally {         \r
-            out.println( "</xml>" );\r
-            out.close();\r
-        }\r
-    }\r
-\r
-    // <editor-fold defaultstate="collapsed" desc="HttpServlet methods. Click on the + sign on the left to edit the code.">\r
-    /**\r
-     * Handles the HTTP\r
-     * <code>GET</code> method.\r
-     *\r
-     * @param request servlet request\r
-     * @param response servlet response\r
-     * @throws ServletException if a servlet-specific error occurs\r
-     * @throws IOException if an I/O error occurs\r
-     */\r
-    @Override\r
-    protected void doGet(HttpServletRequest request, HttpServletResponse response)\r
-            throws ServletException, IOException {\r
-        processRequest(request, response);\r
-    }\r
-\r
-    /**\r
-     * Handles the HTTP\r
-     * <code>POST</code> method.\r
-     *\r
-     * @param request servlet request\r
-     * @param response servlet response\r
-     * @throws ServletException if a servlet-specific error occurs\r
-     * @throws IOException if an I/O error occurs\r
-     */\r
-    @Override\r
-    protected void doPost(HttpServletRequest request, HttpServletResponse response)\r
-            throws ServletException, IOException {\r
-        processRequest(request, response);\r
-    }\r
-\r
-    /**\r
-     * Returns a short description of the servlet.\r
-     *\r
-     * @return a String containing servlet description\r
-     */\r
-    @Override\r
-    public String getServletInfo() {\r
-        return "Short description";\r
-    }// </editor-fold>\r
-}\r
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.ufcspa.simdecs.comunicacao;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.*;
+import javax.persistence.EntityManager;
+import javax.persistence.NoResultException;
+import org.ufcspa.simdecs.entities.Usuario;
+import org.ufcspa.simdecs.util.DbUtil;
+
+/**
+ *
+ * @author pbarros
+ */
+public class MetodoAutenticacao extends HttpServlet {
+
+    /**
+     * Processes requests for both HTTP
+     * <code>GET</code> and
+     * <code>POST</code> methods.
+     *
+     * @param request servlet request
+     * @param response servlet response
+     * @throws ServletException if a servlet-specific error occurs
+     * @throws IOException if an I/O error occurs
+     */
+    private ServletConfig config;
+    public void init(ServletConfig config)
+            throws ServletException{
+        this.config=config;
+    }
+    protected void processRequest(HttpServletRequest request, HttpServletResponse response)
+            throws ServletException, IOException {
+        
+        PrintWriter out = response.getWriter();
+        
+        response.setContentType( "text/xml" );
+        response.setHeader( "Cache-Control", "no-cache" );
+        EntityManager em = DbUtil.getInstance().getEntityManager();
+        
+        out.println( "<xml>" );
+        
+        Usuario user;
+       try {
+               user = (Usuario) em.createQuery("select usu from Usuario as usu where usu.login=:login and usu.senha=:senha")
+                                                                               .setParameter("login", request.getParameter("user").toLowerCase())
+                                                                               .setParameter("senha", request.getParameter("pass"))
+                                                                               .getSingleResult();     
+                
+                out.println( "<id>" + String.valueOf(user.getId()) + "</id>" );
+       } catch (NoResultException ne) {
+                out.println( "<id>" + "0" + "</id>" );
+       } finally {         
+            out.println( "</xml>" );
+            out.close();
+        }
+    }
+
+    // <editor-fold defaultstate="collapsed" desc="HttpServlet methods. Click on the + sign on the left to edit the code.">
+    /**
+     * Handles the HTTP
+     * <code>GET</code> method.
+     *
+     * @param request servlet request
+     * @param response servlet response
+     * @throws ServletException if a servlet-specific error occurs
+     * @throws IOException if an I/O error occurs
+     */
+    @Override
+    protected void doGet(HttpServletRequest request, HttpServletResponse response)
+            throws ServletException, IOException {
+        processRequest(request, response);
+    }
+
+    /**
+     * Handles the HTTP
+     * <code>POST</code> method.
+     *
+     * @param request servlet request
+     * @param response servlet response
+     * @throws ServletException if a servlet-specific error occurs
+     * @throws IOException if an I/O error occurs
+     */
+    @Override
+    protected void doPost(HttpServletRequest request, HttpServletResponse response)
+            throws ServletException, IOException {
+        processRequest(request, response);
+    }
+
+    /**
+     * Returns a short description of the servlet.
+     *
+     * @return a String containing servlet description
+     */
+    @Override
+    public String getServletInfo() {
+        return "Short description";
+    }// </editor-fold>
+}
index 2c921e6..47d76e9 100644 (file)
@@ -8,7 +8,6 @@ package org.ufcspa.simdecs.comunicacao;
 import java.io.IOException;\r
 import java.io.PrintWriter;\r
 import java.text.ParseException;\r
-import java.text.SimpleDateFormat;\r
 import java.util.Date;\r
 import java.util.logging.Level;\r
 import java.util.logging.Logger;\r
@@ -21,9 +20,6 @@ import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;\r
 import javax.servlet.http.HttpServletResponse;\r
 import javax.servlet.http.HttpSession;\r
-import org.ufcspa.simdecs.entities.Log;\r
-import org.ufcspa.simdecs.entities.RespostaMediador;\r
-import org.ufcspa.simdecs.entities.Usuario;\r
 import org.ufcspa.simdecs.util.UtilitarioSql;\r
 import org.ufcspa.simdecs.entities.TipoEventoLog;\r
 \r
@@ -96,6 +92,7 @@ public class MetodoParaGravarLog extends HttpServlet {
         //em.persist(lg);\r
         em.getTransaction().commit();\r
         }\r
+/*\r
         RespostaMediador resp;\r
         try {\r
                 em.getTransaction().begin();\r
@@ -116,7 +113,6 @@ public class MetodoParaGravarLog extends HttpServlet {
                     out.println("<resposta></resposta>");\r
                     out.println("<arquivo></arquivo>");\r
                 }\r
-                \r
 //                out.println("OK "+ user.getId());\r
 //                out.close();\r
        } catch (NoResultException ne) {\r
@@ -132,7 +128,7 @@ public class MetodoParaGravarLog extends HttpServlet {
             out.close();\r
         }\r
         \r
-\r
+*/\r
     }\r
 \r
     // <editor-fold defaultstate="collapsed" desc="HttpServlet methods. Click on the + sign on the left to edit the code.">\r
index 2ec38d5..caaa6b6 100644 (file)
@@ -4,20 +4,12 @@
  */\r
 package org.ufcspa.simdecs.comunicacao;\r
 \r
-import java.io.BufferedInputStream;\r
 import java.io.IOException;\r
 import java.io.PrintWriter;\r
-import java.net.MalformedURLException;\r
-import java.net.URL;\r
-import java.net.URLConnection;\r
-import javax.persistence.EntityManager;\r
-import javax.persistence.EntityManagerFactory;\r
-import javax.persistence.Persistence;\r
 import javax.servlet.ServletException;\r
 import javax.servlet.http.HttpServlet;\r
 import javax.servlet.http.HttpServletRequest;\r
 import javax.servlet.http.HttpServletResponse;\r
-import org.ufcspa.simdecs.entities.ArquivoCaso;\r
 \r
 /**\r
  *\r
@@ -40,7 +32,7 @@ public class MetodoSelecionaCaso extends HttpServlet {
         response.setContentType("text/html;charset=UTF-8");\r
         PrintWriter out = response.getWriter();\r
         //String file ;\r
-\r
+/*\r
         EntityManagerFactory emf = Persistence.createEntityManagerFactory("simdecsPU");\r
         EntityManager em = emf.createEntityManager();\r
         \r
@@ -75,7 +67,8 @@ public class MetodoSelecionaCaso extends HttpServlet {
             out.close();\r
             buf.close();\r
         }\r
-    }\r
+*/\r
+ }\r
 \r
     // <editor-fold defaultstate="collapsed" desc="HttpServlet methods. Click on the + sign on the left to edit the code.">\r
     /**\r
index 82e73e2..ec025e9 100644 (file)
@@ -5,16 +5,10 @@
 package org.ufcspa.simdecs.comunicacao;\r
 \r
 import java.io.IOException;\r
-import java.io.PrintWriter;\r
-import java.util.List;\r
-import javax.persistence.EntityManager;\r
-import javax.persistence.EntityManagerFactory;\r
-import javax.persistence.Persistence;\r
 import javax.servlet.ServletException;\r
 import javax.servlet.http.HttpServlet;\r
 import javax.servlet.http.HttpServletRequest;\r
 import javax.servlet.http.HttpServletResponse;\r
-import org.ufcspa.simdecs.entities.ArquivoCaso;\r
 \r
 /**\r
  *\r
@@ -34,7 +28,7 @@ public class MetodoSelecionaJogo extends HttpServlet {
      */\r
     protected void processRequest(HttpServletRequest request, HttpServletResponse response)\r
             throws ServletException, IOException {\r
-        \r
+/*        \r
         PrintWriter out = response.getWriter();\r
         // alteracao solicitado mosmmann \r
         //response.setContentType("text/html;charset=UTF-8");\r
@@ -93,7 +87,8 @@ public class MetodoSelecionaJogo extends HttpServlet {
             out.println( "</xml>" );\r
             out.close();\r
         }\r
-    }\r
+*/\r
+ }\r
 \r
     // <editor-fold defaultstate="collapsed" desc="HttpServlet methods. Click on the + sign on the left to edit the code.">\r
     /**\r
diff --git a/src/java/org/ufcspa/simdecs/entities/ArgumentosPedagogicos.java b/src/java/org/ufcspa/simdecs/entities/ArgumentosPedagogicos.java
deleted file mode 100644 (file)
index 09d12c9..0000000
+++ /dev/null
@@ -1,74 +0,0 @@
-/*\r
- * To change this template, choose Tools | Templates\r
- * and open the template in the editor.\r
- */\r
-package org.ufcspa.simdecs.entities;\r
-\r
-import java.io.Serializable;\r
-import javax.persistence.*;\r
-\r
-\r
-/**\r
- *\r
- * @author pbarros\r
- */\r
-@Entity\r
-@Table(name="ArgumentosPedagogicos")\r
-public class ArgumentosPedagogicos implements Serializable {\r
-    private static final long serialVersionUID = 1L;\r
-    \r
-    @SequenceGenerator(name="seqArgumentosPedagogicos", sequenceName="SQARGPED")\r
-    @GeneratedValue(strategy=GenerationType.AUTO, generator="seqArgumentosPedagogicos")\r
-    @Id\r
-    private Long Codigo;\r
-    \r
-    @Column(length=250)\r
-    private String Argumento;\r
-    \r
-    \r
-    @Column(length=250)\r
-    private String Expectativa;\r
-    \r
-    @Column(length=250)\r
-    private String Avaliacao;\r
-    \r
-    @Column\r
-    private Long CodTaticaMediador;\r
-\r
-    public Long getCodigo() { return this.Codigo;  }\r
-    public String getArgumento() { return this.Argumento;      }\r
-    public void setArgumento(String Argumento) { this.Argumento = Argumento; }\r
-    public String getExpectativa() { return this.Expectativa; }\r
-    public void setExpectativa(String Expectativa) { this.Expectativa = Expectativa; }\r
-    public String getAvaliacao() { return this.Avaliacao; }\r
-    public void setAvaliacao(String Avaliacao) { this.Avaliacao = Avaliacao; }\r
-    public Long getCodTaticaMediador() { return this.CodTaticaMediador;  }\r
-    public void setCodTaticaMediador(Long CodTaticaMediador) { this.CodTaticaMediador = CodTaticaMediador; }\r
-    \r
-    \r
-    @Override\r
-    public int hashCode() {\r
-        int hash = 0;\r
-        hash += (Codigo != null ? Codigo.hashCode() : 0);\r
-        return hash;\r
-    }\r
-\r
-    @Override\r
-    public boolean equals(Object object) {\r
-        // TODO: Warning - this method won't work in the case the id fields are not set\r
-        if (!(object instanceof ArgumentosPedagogicos)) {\r
-            return false;\r
-        }\r
-        ArgumentosPedagogicos other = (ArgumentosPedagogicos) object;\r
-        if ((this.Codigo == null && other.Codigo != null) || (this.Codigo != null && !this.Codigo.equals(other.Codigo))) {\r
-            return false;\r
-        }\r
-        return true;\r
-    }\r
-\r
-    @Override\r
-    public String toString() {\r
-        return "org.ufcspa.simdecs.entidade.ArgumentosPedagogicos[ Codigo=" + Codigo + " ]";\r
-    }\r
-    \r
-}\r
diff --git a/src/java/org/ufcspa/simdecs/entities/ArquivoCaso.java b/src/java/org/ufcspa/simdecs/entities/ArquivoCaso.java
deleted file mode 100644 (file)
index 0c1fd74..0000000
+++ /dev/null
@@ -1,67 +0,0 @@
-/*\r
- * To change this template, choose Tools | Templates\r
- * and open the template in the editor.\r
- */\r
-package org.ufcspa.simdecs.entities;\r
-\r
-import java.io.Serializable;\r
-import javax.persistence.*;\r
-import javax.validation.constraints.NotNull;\r
-import javax.validation.constraints.Size;\r
-\r
-/**\r
- *\r
- * @author pbarros\r
- */\r
-@Entity\r
-@Table(name="ArquivoCaso")\r
-public class ArquivoCaso implements Serializable {\r
-    private static final long serialVersionUID = 1L;\r
-    \r
-    @SequenceGenerator(name="seqArqCaso", sequenceName="SQARQC")\r
-    @GeneratedValue(strategy=GenerationType.AUTO, generator="seqArqCaso")\r
-    @Id\r
-    private Long id;\r
-    \r
-    @Column(length=255)\r
-    private String nome;\r
-    \r
-    \r
-    @Column(length=255)\r
-    private String endArquivo;\r
-    \r
-    \r
-    public Long getId() { return this.id;  }\r
-    public void setId(Long id) { this.id = id; }\r
-    public String getNome() { return this.nome;        }\r
-    public void setNome(String name) { this.nome = name; }\r
-    public String getEndArquivo() { return this.endArquivo; }\r
-    public void setEndArquivo(String endArquivo) { this.endArquivo = endArquivo; }\r
-    \r
-    \r
-    @Override\r
-    public int hashCode() {\r
-        int hash = 0;\r
-        hash += (id != null ? id.hashCode() : 0);\r
-        return hash;\r
-    }\r
-\r
-    @Override\r
-    public boolean equals(Object object) {\r
-        // TODO: Warning - this method won't work in the case the id fields are not set\r
-        if (!(object instanceof ArquivoCaso)) {\r
-            return false;\r
-        }\r
-        ArquivoCaso other = (ArquivoCaso) object;\r
-        if ((this.id == null && other.id != null) || (this.id != null && !this.id.equals(other.id))) {\r
-            return false;\r
-        }\r
-        return true;\r
-    }\r
-\r
-    @Override\r
-    public String toString() {\r
-        return "org.ufcspa.simdecs.entidade.ArquivoCaso[ id=" + id + " ]";\r
-    }\r
-    \r
-}\r
index febcdd2..1e3bcf7 100644 (file)
@@ -7,9 +7,6 @@ package org.ufcspa.simdecs.entities;
 import java.io.Serializable;\r
 import java.util.Date;\r
 import javax.persistence.*;\r
-import javax.validation.constraints.NotNull;\r
-import javax.validation.constraints.Size;\r
-import javax.xml.bind.annotation.XmlRootElement;\r
 \r
 /**\r
  *\r
@@ -17,128 +14,144 @@ import javax.xml.bind.annotation.XmlRootElement;
  */\r
 @Entity\r
 @Table(name = "log")\r
-@XmlRootElement\r
-@NamedQueries({\r
-    @NamedQuery(name = "Log.findAll", query = "SELECT l FROM Log l"),\r
-    @NamedQuery(name = "Log.findByIdlog", query = "SELECT l FROM Log l WHERE l.idlog = :idlog"),\r
-    @NamedQuery(name = "Log.findByDescricaolog", query = "SELECT l FROM Log l WHERE l.descricaolog = :descricaolog"),\r
-    @NamedQuery(name = "Log.findByUsuid", query = "SELECT l FROM Log l WHERE l.usuid = :usuid"),\r
-    @NamedQuery(name = "Log.findByDatalog", query = "SELECT l FROM Log l WHERE l.datalog = :datalog"),\r
-    @NamedQuery(name = "Log.findByHoralog", query = "SELECT l FROM Log l WHERE l.horalog = :horalog")})\r
 public class Log implements Serializable {\r
+    \r
     private static final long serialVersionUID = 1L;\r
+    \r
     @Id\r
     @SequenceGenerator(name="seqLog", sequenceName="SQLOG")\r
     @GeneratedValue(strategy=GenerationType.AUTO, generator="seqLog")\r
-    @Basic(optional = false)\r
-    @NotNull\r
-    @Column(name = "idlog")\r
-    private Integer idlog;\r
-    @Basic(optional = false)\r
-    @NotNull\r
-    @Size(min = 1, max = 200)\r
+    @Column(name = "idlog", nullable=false)\r
+    private Integer id;\r
     \r
+    @Column(nullable=false)\r
+    @Temporal(TemporalType.TIMESTAMP)\r
+    private Date data;\r
+\r
+    @ManyToOne\r
+    @JoinColumn(name="tipo_id", nullable=false)\r
+    private TipoEventoLog tipo;    \r
+\r
     @ManyToOne\r
-    @JoinColumn(name="tipo_id")\r
-    private TipoEventoLog tipo;\r
+    @JoinColumn(name="sessao_id", nullable=false)\r
+    private SessaoUsuario sessaoUsuario;\r
     \r
-    @Column(name = "descricaolog")\r
-    private String descricaolog;\r
-    @Basic(optional = false)\r
-    @NotNull\r
-    @Column(name = "usuid")\r
-    private long usuid;\r
-    @Column(name = "datalog")\r
-    @Temporal(TemporalType.DATE)\r
-    private Date datalog;\r
-    @Column(name = "horalog")\r
-    @Temporal(TemporalType.TIME)\r
-    private Date horalog;\r
+    @ManyToOne\r
+    @JoinColumn(name="caso_id", nullable=true)\r
+    private Caso caso;\r
+\r
+    @ManyToOne\r
+    @JoinColumn(name="paciente_id", nullable=true)\r
+    private Paciente paciente;\r
+\r
+    @ManyToOne\r
+    @JoinColumn(name="nodo_id", nullable=true)\r
+    private Nodo nodo;\r
 \r
-    public Log() {\r
+    @ManyToOne\r
+    @JoinColumn(name="rede_id", nullable=true)\r
+    private Rede rede;\r
+    \r
+    @Column(name = "descricao")\r
+    private String descricao;\r
+\r
+    public Caso getCaso() {\r
+        return caso;\r
     }\r
 \r
-    public Log(Integer idlog) {\r
-        this.idlog = idlog;\r
+    public void setCaso(Caso caso) {\r
+        this.caso = caso;\r
     }\r
 \r
-    public Log(Integer idlog, String descricaolog, long usuid) {\r
-        this.idlog = idlog;\r
-        this.descricaolog = descricaolog;\r
-        this.usuid = usuid;\r
+    public Date getData() {\r
+        return data;\r
     }\r
 \r
-    public Integer getIdlog() {\r
-        return idlog;\r
+    public void setData(Date data) {\r
+        this.data = data;\r
     }\r
 \r
-    public void setIdlog(Integer idlog) {\r
-        this.idlog = idlog;\r
+    public String getDescricao() {\r
+        return descricao;\r
     }\r
 \r
-    public String getDescricaolog() {\r
-        return descricaolog;\r
+    public void setDescricao(String descricao) {\r
+        this.descricao = descricao;\r
     }\r
 \r
-    public void setDescricaolog(String descricaolog) {\r
-        this.descricaolog = descricaolog;\r
+    public Integer getId() {\r
+        return id;\r
     }\r
 \r
-    public TipoEventoLog getTipo() {\r
-        return tipo;\r
+    public void setId(Integer id) {\r
+        this.id = id;\r
     }\r
 \r
-    public void setTipo(TipoEventoLog tipo) {\r
-        this.tipo = tipo;\r
+    public Nodo getNodo() {\r
+        return nodo;\r
     }\r
-    \r
-    public long getUsuid() {\r
-        return usuid;\r
+\r
+    public void setNodo(Nodo nodo) {\r
+        this.nodo = nodo;\r
     }\r
 \r
-    public void setUsuid(long usuid) {\r
-        this.usuid = usuid;\r
+    public Paciente getPaciente() {\r
+        return paciente;\r
     }\r
 \r
-    public Date getDatalog() {\r
-        return datalog;\r
+    public void setPaciente(Paciente paciente) {\r
+        this.paciente = paciente;\r
     }\r
 \r
-    public void setDatalog(Date datalog) {\r
-        this.datalog = datalog;\r
+    public Rede getRede() {\r
+        return rede;\r
     }\r
 \r
-    public Date getHoralog() {\r
-        return horalog;\r
+    public void setRede(Rede rede) {\r
+        this.rede = rede;\r
     }\r
 \r
-    public void setHoralog(Date horalog) {\r
-        this.horalog = horalog;\r
+    public SessaoUsuario getSessaoUsuario() {\r
+        return sessaoUsuario;\r
     }\r
 \r
-    @Override\r
-    public int hashCode() {\r
-        int hash = 0;\r
-        hash += (idlog != null ? idlog.hashCode() : 0);\r
-        return hash;\r
+    public void setSessaoUsuario(SessaoUsuario sessaoUsuario) {\r
+        this.sessaoUsuario = sessaoUsuario;\r
+    }\r
+\r
+    public TipoEventoLog getTipo() {\r
+        return tipo;\r
+    }\r
+\r
+    public void setTipo(TipoEventoLog tipo) {\r
+        this.tipo = tipo;\r
     }\r
 \r
     @Override\r
-    public boolean equals(Object object) {\r
-        // TODO: Warning - this method won't work in the case the id fields are not set\r
-        if (!(object instanceof Log)) {\r
+    public boolean equals(Object obj) {\r
+        if (obj == null) {\r
             return false;\r
         }\r
-        Log other = (Log) object;\r
-        if ((this.idlog == null && other.idlog != null) || (this.idlog != null && !this.idlog.equals(other.idlog))) {\r
+        if (getClass() != obj.getClass()) {\r
+            return false;\r
+        }\r
+        final Log other = (Log) obj;\r
+        if (this.id != other.id && (this.id == null || !this.id.equals(other.id))) {\r
             return false;\r
         }\r
         return true;\r
     }\r
 \r
     @Override\r
+    public int hashCode() {\r
+        int hash = 5;\r
+        hash = 97 * hash + (this.id != null ? this.id.hashCode() : 0);\r
+        return hash;\r
+    }\r
+\r
+    @Override\r
     public String toString() {\r
-        return "org.ufcspa.simdecs.entidade.Log[ idlog=" + idlog + " ]";\r
+        return "Log{" + "id=" + id + ", data=" + data + ", tipo=" + tipo + ", sessaoUsuario=" + sessaoUsuario + ", caso=" + caso + ", paciente=" + paciente + ", nodo=" + nodo + ", rede=" + rede + ", descricao=" + descricao + '}';\r
     }\r
     \r
 }\r
diff --git a/src/java/org/ufcspa/simdecs/entities/NivelConfianca.java b/src/java/org/ufcspa/simdecs/entities/NivelConfianca.java
deleted file mode 100644 (file)
index 9af48bb..0000000
+++ /dev/null
@@ -1,66 +0,0 @@
-/*\r
- * To change this template, choose Tools | Templates\r
- * and open the template in the editor.\r
- */\r
-package org.ufcspa.simdecs.entities;\r
-\r
-\r
-import java.io.Serializable;\r
-import javax.persistence.*;\r
-\r
-/**\r
- *\r
- * @author pbarros\r
- */\r
-@Entity\r
-@Table(name="NivelConfianca")\r
-public class NivelConfianca implements Serializable {\r
-    private static final long serialVersionUID = 1L;\r
-    \r
-    @SequenceGenerator(name="seqNivelConfianca", sequenceName="SQNIVCON")\r
-    @GeneratedValue(strategy=GenerationType.AUTO, generator="seqNivelConfianca")\r
-    @Id\r
-    private Long Codigo;\r
-    \r
-    @Column(length=10)\r
-    private String Nome;\r
-    \r
-    \r
-    @Column(length=250)\r
-    private String Descricao;\r
-    \r
-\r
-    public Long getCodigo() { return this.Codigo;  }\r
-    public void setCodigo(Long Codigo) { this.Codigo = Codigo; }\r
-    public String getNome() { return this.Nome;        }\r
-    public void setNome(String Nome) { this.Nome = Nome; }\r
-    public String getDescricao() { return this.Descricao; }\r
-    public void setDescricao(String Descricao) { this.Descricao = Descricao; }\r
-    \r
-    \r
-    @Override\r
-    public int hashCode() {\r
-        int hash = 0;\r
-        hash += (Codigo != null ? Codigo.hashCode() : 0);\r
-        return hash;\r
-    }\r
-\r
-    @Override\r
-    public boolean equals(Object object) {\r
-        // TODO: Warning - this method won't work in the case the id fields are not set\r
-        if (!(object instanceof NivelConfianca)) {\r
-            return false;\r
-        }\r
-        NivelConfianca other = (NivelConfianca) object;\r
-        if ((this.Codigo == null && other.Codigo != null) || (this.Codigo != null && !this.Codigo.equals(other.Codigo))) {\r
-            return false;\r
-        }\r
-        return true;\r
-    }\r
-\r
-    @Override\r
-    public String toString() {\r
-        return "org.ufcspa.simdecs.entidade.NivelConfianca[ Codigo=" + Codigo + " ]";\r
-    }\r
-    \r
-}\r
diff --git a/src/java/org/ufcspa/simdecs/entities/ProblemasPrincipais.java b/src/java/org/ufcspa/simdecs/entities/ProblemasPrincipais.java
deleted file mode 100644 (file)
index a435069..0000000
+++ /dev/null
@@ -1,64 +0,0 @@
-/*\r
- * To change this template, choose Tools | Templates\r
- * and open the template in the editor.\r
- */\r
-package org.ufcspa.simdecs.entities;\r
-\r
-import java.io.Serializable;\r
-import javax.persistence.*;\r
-/**\r
- *\r
- * @author pbarros\r
- */\r
-@Entity\r
-@Table(name="ProblemasPrincipais")\r
-public class ProblemasPrincipais implements Serializable {\r
-    private static final long serialVersionUID = 1L;\r
-    \r
-    @SequenceGenerator(name="seqProblemasPrincipais", sequenceName="SQPROPRI")\r
-    @GeneratedValue(strategy=GenerationType.AUTO, generator="seqProblemasPrincipais")\r
-    @Id\r
-    private Long Codigo;\r
-    \r
-    @Column(length=10)\r
-    private String Nome;\r
-    \r
-    \r
-    @Column(length=250)\r
-    private String Descricao;\r
-    \r
-\r
-    public Long getCodigo() { return this.Codigo;}\r
-    public void setCodigo(Long Codigo) { this.Codigo = Codigo; }\r
-    public String getNome() { return this.Nome;        }\r
-    public void setNome(String Nome) { this.Nome = Nome; }\r
-    public String getDescricao() { return this.Descricao; }\r
-    public void setDescricao(String Descricao) { this.Descricao = Descricao; }\r
-    \r
-    \r
-    @Override\r
-    public int hashCode() {\r
-        int hash = 0;\r
-        hash += (Codigo != null ? Codigo.hashCode() : 0);\r
-        return hash;\r
-    }\r
-\r
-    @Override\r
-    public boolean equals(Object object) {\r
-        // TODO: Warning - this method won't work in the case the id fields are not set\r
-        if (!(object instanceof ProblemasPrincipais)) {\r
-            return false;\r
-        }\r
-        ProblemasPrincipais other = (ProblemasPrincipais) object;\r
-        if ((this.Codigo == null && other.Codigo != null) || (this.Codigo != null && !this.Codigo.equals(other.Codigo))) {\r
-            return false;\r
-        }\r
-        return true;\r
-    }\r
-\r
-    @Override\r
-    public String toString() {\r
-        return "org.ufcspa.simdecs.entidade.ProblemasPrincipais[ Codigo=" + Codigo + " ]";\r
-    }\r
-    \r
-}\r
diff --git a/src/java/org/ufcspa/simdecs/entities/RespostaMediador.java b/src/java/org/ufcspa/simdecs/entities/RespostaMediador.java
deleted file mode 100644 (file)
index 23249d3..0000000
+++ /dev/null
@@ -1,80 +0,0 @@
-/*\r
- * To change this template, choose Tools | Templates\r
- * and open the template in the editor.\r
- */\r
-package org.ufcspa.simdecs.entities;\r
-\r
-import java.io.Serializable;\r
-import java.util.Date;\r
-import javax.persistence.*;\r
-import javax.validation.constraints.NotNull;\r
-import javax.validation.constraints.Size;\r
-\r
-/**\r
- *\r
- * @author pbarros\r
- */\r
-@Entity\r
-@Table(name="RespostaMediador")\r
-public class RespostaMediador implements Serializable {\r
-    private static final long serialVersionUID = 1L;\r
-    \r
-    @SequenceGenerator(name="seqRespMediador", sequenceName="SQRESPM")\r
-    @GeneratedValue(strategy=GenerationType.AUTO, generator="seqRespMediador")\r
-    @Id\r
-    private Long id;\r
-    \r
-    @Column(length=255)\r
-    private String resposta;\r
-    \r
-    \r
-    @Column(length=255)\r
-    private String endArquivo;\r
-    \r
-    @Column \r
-    private Long idUsuario;\r
-    \r
-    @Column (nullable=true)\r
-    @Temporal(TemporalType.DATE)\r
-    private Date dataResposta;\r
-    \r
-    \r
-\r
-    public Long getId() { return this.id;  }\r
-    public void setId(Long id) { this.id = id; }\r
-    public String getNome() { return this.resposta;    }\r
-    public void setNome(String name) { this.resposta = resposta; }\r
-    public String getEndArquivo() { return this.endArquivo; }\r
-    public void setEndArquivo(String endArquivo) { this.endArquivo = endArquivo; }\r
-    public Long getIdUsuario() { return this.idUsuario;  }\r
-    public void setIdUsuario(Long idUsuario) { this.idUsuario = idUsuario; }\r
-    public Date getDataResposta() { return this.dataResposta; }\r
-    public void setDataResposta(Date dataResposta) { this.dataResposta = dataResposta; }\r
-    \r
-    \r
-    @Override\r
-    public int hashCode() {\r
-        int hash = 0;\r
-        hash += (id != null ? id.hashCode() : 0);\r
-        return hash;\r
-    }\r
-\r
-    @Override\r
-    public boolean equals(Object object) {\r
-        // TODO: Warning - this method won't work in the case the id fields are not set\r
-        if (!(object instanceof RespostaMediador)) {\r
-            return false;\r
-        }\r
-        RespostaMediador other = (RespostaMediador) object;\r
-        if ((this.id == null && other.id != null) || (this.id != null && !this.id.equals(other.id))) {\r
-            return false;\r
-        }\r
-        return true;\r
-    }\r
-\r
-    @Override\r
-    public String toString() {\r
-        return "org.ufcspa.simdecs.entidade.RespostaMediador[ id=" + id + " ]";\r
-    }\r
-    \r
-}\r
diff --git a/src/java/org/ufcspa/simdecs/entities/SessaoUsuario.java b/src/java/org/ufcspa/simdecs/entities/SessaoUsuario.java
new file mode 100644 (file)
index 0000000..8f02323
--- /dev/null
@@ -0,0 +1,81 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.ufcspa.simdecs.entities;
+
+import java.io.Serializable;
+import java.util.Date;
+import javax.persistence.*;
+
+/**
+ *
+ * @author maroni
+ */
+@Entity
+@Table(name="SESSAO_USUARIO")
+public class SessaoUsuario implements Serializable {
+    private static final long serialVersionUID = 1L;
+    @Id
+    @SequenceGenerator(name="seqSessaoUsuario", sequenceName="SQ_SESSAO_USUARIO")
+    @GeneratedValue(strategy = GenerationType.AUTO, generator="seqSessaoUsuario")
+    private Long id;
+    
+    @Temporal(TemporalType.TIMESTAMP)
+    @Column(nullable=false)
+    private Date data;
+
+    @ManyToOne
+    @JoinColumn(nullable=false, name="usu_id")
+    private Usuario usuario;
+
+    public Date getData() {
+        return data;
+    }
+
+    public void setData(Date data) {
+        this.data = data;
+    }
+
+    public Usuario getUsuario() {
+        return usuario;
+    }
+
+    public void setUsuario(Usuario usuario) {
+        this.usuario = usuario;
+    }
+    
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Override
+    public int hashCode() {
+        int hash = 0;
+        hash += (id != null ? id.hashCode() : 0);
+        return hash;
+    }
+
+    @Override
+    public boolean equals(Object object) {
+        // TODO: Warning - this method won't work in the case the id fields are not set
+        if (!(object instanceof SessaoUsuario)) {
+            return false;
+        }
+        SessaoUsuario other = (SessaoUsuario) object;
+        if ((this.id == null && other.id != null) || (this.id != null && !this.id.equals(other.id))) {
+            return false;
+        }
+        return true;
+    }
+
+    @Override
+    public String toString() {
+        return "org.ufcspa.simdecs.entities.SessaoUsuario[ id=" + id + " ]";
+    }
+    
+}
diff --git a/src/java/org/ufcspa/simdecs/entities/TaticasMediador.java b/src/java/org/ufcspa/simdecs/entities/TaticasMediador.java
deleted file mode 100644 (file)
index 2b102b7..0000000
+++ /dev/null
@@ -1,71 +0,0 @@
-/*\r
- * To change this template, choose Tools | Templates\r
- * and open the template in the editor.\r
- */\r
-package org.ufcspa.simdecs.entities;\r
-import java.io.Serializable;\r
-import javax.persistence.*;\r
-\r
-\r
-/**\r
- *\r
- * @author pbarros\r
- */\r
-@Entity\r
-@Table(name="TaticasMediador")\r
-public class TaticasMediador implements Serializable {\r
-    private static final long serialVersionUID = 1L;\r
-    \r
-    @SequenceGenerator(name="seqTaticasMediador", sequenceName="SQTATMED")\r
-    @GeneratedValue(strategy=GenerationType.AUTO, generator="seqTaticasMediador")\r
-    @Id\r
-    private Long Codigo;\r
-    \r
-    @Column(length=50)\r
-    private String Tatica;\r
-    \r
-    \r
-    @Column(length=50)\r
-    private String Problema;\r
-    \r
-    @Column(length=500)\r
-    private String MensagemArgumento      ;\r
-    \r
-    \r
-    public Long getCodigo() { return this.Codigo;  }\r
-    public void setCodigo(Long Codigo) { this.Codigo = Codigo; }\r
-    public String getTatica() { return this.Tatica;    }\r
-    public void setTatica(String Tatica) { this.Tatica = Tatica; }\r
-    public String getProblema() { return this.Problema; }\r
-    public void setProblema(String Problema) { this.Problema = Problema; }\r
-    public String getMensagemArgumento() { return this.MensagemArgumento; }\r
-    public void setMensagemArgumento(String MensagemArgumento) { this.MensagemArgumento = MensagemArgumento; }\r
-\r
-    \r
-    \r
-    @Override\r
-    public int hashCode() {\r
-        int hash = 0;\r
-        hash += (Codigo != null ? Codigo.hashCode() : 0);\r
-        return hash;\r
-    }\r
-\r
-    @Override\r
-    public boolean equals(Object object) {\r
-        // TODO: Warning - this method won't work in the case the id fields are not set\r
-        if (!(object instanceof TaticasMediador)) {\r
-            return false;\r
-        }\r
-        TaticasMediador other = (TaticasMediador) object;\r
-        if ((this.Codigo == null && other.Codigo != null) || (this.Codigo != null && !this.Codigo.equals(other.Codigo))) {\r
-            return false;\r
-        }\r
-        return true;\r
-    }\r
-\r
-    @Override\r
-    public String toString() {\r
-        return "org.ufcspa.simdecs.entidade.TaticasMediador[ Codigo=" + Codigo + " ]";\r
-    }\r
-    \r
-}\r
index c3909ae..f9b0a7d 100644 (file)
@@ -21,39 +21,55 @@ public class TipoEventoLog implements Serializable {
     @SequenceGenerator(name="seqTipEveLog", sequenceName="SQTPEVLG")\r
     @GeneratedValue(strategy=GenerationType.AUTO, generator="seqTipEveLog")\r
     @Id\r
-    private Long id;\r
+    private String id;\r
     \r
-    @Column(length=255)\r
+    @Column(length=255, nullable=false)\r
     private String nome;\r
-    \r
-    public Long getId() { return this.id; }\r
-    public void setId(Long id) { this.id = id; }\r
-    public String getNome() { return this.nome;        }\r
-    public void setNome(String name) { this.nome = name; }\r
-    \r
-    @Override\r
-    public int hashCode() {\r
-        int hash = 0;\r
-        hash += (id != null ? id.hashCode() : 0);\r
-        return hash;\r
+\r
+    public TipoEventoLog() {\r
+    }\r
+\r
+    public String getId() {\r
+        return id;\r
+    }\r
+\r
+    public void setId(String id) {\r
+        this.id = id;\r
+    }\r
+\r
+    public String getNome() {\r
+        return nome;\r
+    }\r
+\r
+    public void setNome(String nome) {\r
+        this.nome = nome;\r
     }\r
 \r
     @Override\r
-    public boolean equals(Object object) {\r
-        // TODO: Warning - this method won't work in the case the id fields are not set\r
-        if (!(object instanceof TipoEventoLog)) {\r
+    public boolean equals(Object obj) {\r
+        if (obj == null) {\r
+            return false;\r
+        }\r
+        if (getClass() != obj.getClass()) {\r
             return false;\r
         }\r
-        TipoEventoLog other = (TipoEventoLog) object;\r
-        if ((this.id == null && other.id != null) || (this.id != null && !this.id.equals(other.id))) {\r
+        final TipoEventoLog other = (TipoEventoLog) obj;\r
+        if ((this.id == null) ? (other.id != null) : !this.id.equals(other.id)) {\r
             return false;\r
         }\r
         return true;\r
     }\r
 \r
     @Override\r
+    public int hashCode() {\r
+        int hash = 7;\r
+        hash = 37 * hash + (this.id != null ? this.id.hashCode() : 0);\r
+        return hash;\r
+    }\r
+\r
+    @Override\r
     public String toString() {\r
-        return "org.ufcspa.simdecs.entidade.ArquivoCaso[ id=" + id + " ]";\r
+        return "TipoEventoLog{" + "id=" + id + ", nome=" + nome + '}';\r
     }\r
     \r
 }\r
index 5afeccf..bbbbfeb 100644 (file)
@@ -260,8 +260,11 @@ public class EditarCasoBean extends DefaultManagedBean {
         return "";
     }
     
+    private String getDependencia(Long idNodo) {
+        return "";
+    }
+    
     public void gerarXML() throws IOException {
-        System.out.println("TESTE GIT");        
         StringBuilder str = new StringBuilder();
         str.append("<caso uid=\"caso-" + caso.getId() + "\" titulo=\"" + caso.getNome() + "\" modelo=\"" + caso.getModelo() + "\" descricaoAmbiente=\"" + caso.getTextoInicial() + "\">\n");
 
@@ -284,7 +287,7 @@ public class EditarCasoBean extends DefaultManagedBean {
                 if (!nodo.getNodo().getTipo().equals(Nodo.SINAL_SINTOMA))
                     continue;
                 
-                str.append("                <sintoma uid=\"sintoma-" + nodo.getId() + "\" nomeCientifico=\"" + nodo.getNodo().getNome() + "\" nomePopular=\"" + nodo.getNodo().getNomeAmigavel() + "\" imagem=\"\" som=\"\" video=\"\" falaPaciente=\"" + getPerguntaNodo(nodo.getNodo().getId())  + "\">\n");
+                str.append("                <sintoma uid=\"sintoma-" + nodo.getId() + "\" nomeCientifico=\"" + nodo.getNodo().getNome() + "\" nomePopular=\"" + nodo.getNodo().getNomeAmigavel() + "\" imagem=\"\" som=\"\" video=\"\" dependencia=\"" + getDependencia(nodo.getNodo().getId()) + "\" falaPaciente=\"" + getPerguntaNodo(nodo.getNodo().getId())  + "\">\n");
             }
             str.append("            </perguntar_sintoma>\n");
 
@@ -294,7 +297,7 @@ public class EditarCasoBean extends DefaultManagedBean {
                 if (!nodo.getNodo().getTipo().equals(Nodo.EXAME_FISICO))
                     continue;
                 
-                str.append("                <exame_fisico uid=\"exame-fisico-" + nodo.getId() + "\" descricao=\"" + nodo.getNodo().getNomeAmigavel() + "\" resultado=\"\" imagem=\"\" som=\"\" video=\"\">\n");
+                str.append("                <exame_fisico uid=\"exame-fisico-" + nodo.getId() + "\" dependencia=\"" + getDependencia(nodo.getNodo().getId()) + "\" descricao=\"" + nodo.getNodo().getNomeAmigavel() + "\" resultado=\"\" imagem=\"\" som=\"\" video=\"\">\n");
             }
             str.append("            </realiza_exame_fisico>\n");
 
@@ -304,7 +307,7 @@ public class EditarCasoBean extends DefaultManagedBean {
                 if (!nodo.getNodo().getTipo().equals(Nodo.EXAME_COMPLEMENTAR))
                     continue;
                 
-                str.append("                <exame_complementar uid=\"exame-complementar-" + nodo.getId() + "\" descricao=\"" + nodo.getNodo().getNomeAmigavel() + "\" resultado=\"\" imagem=\"\" som=\"\" video=\"\">\n");
+                str.append("                <exame_complementar uid=\"exame-complementar-" + nodo.getId() + "\" dependencia=\"" + getDependencia(nodo.getNodo().getId()) + "\" descricao=\"" + nodo.getNodo().getNomeAmigavel() + "\" resultado=\"\" imagem=\"\" som=\"\" video=\"\">\n");
             }
             str.append("            </solicitar_exames_complementar>\n");
 
@@ -313,7 +316,7 @@ public class EditarCasoBean extends DefaultManagedBean {
                 if (!nodo.getNodo().getTipo().equals(Nodo.HISTORICO))
                     continue;
                 
-                str.append("        <historico_medico uid=\"historico-medico-" + nodo.getId() + "\" descricao=\"Histórico Médico\" historico=\"" + nodo.getNodo().getNomeAmigavel() + "\" falaPaciente=\"" + getPerguntaNodo(nodo.getNodo().getId())  + "\" imagem=\"\" som=\"\" video=\"\">\n");
+                str.append("        <historico_medico uid=\"historico-medico-" + nodo.getId() + "\" dependencia=\"" + getDependencia(nodo.getNodo().getId()) + "\" descricao=\"Histórico Médico\" historico=\"" + nodo.getNodo().getNomeAmigavel() + "\" dependencia=\"\" imagem=\"\" som=\"\" video=\"\">\n");
             }
             
             
index 9f0863d..27f5175 100644 (file)
@@ -9,10 +9,18 @@
         <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
         <load-on-startup>1</load-on-startup>
     </servlet>
+    <servlet>
+        <servlet-name>MetodoAutenticacao</servlet-name>
+        <servlet-class>org.ufcspa.simdecs.comunicacao.MetodoAutenticacao</servlet-class>
+    </servlet>
     <servlet-mapping>
         <servlet-name>Faces Servlet</servlet-name>
         <url-pattern>*.jsf</url-pattern>
     </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>MetodoAutenticacao</servlet-name>
+        <url-pattern>/MetodoAutenticacao</url-pattern>
+    </servlet-mapping>
     <session-config>
         <session-timeout>
             30
     <welcome-file-list>
         <welcome-file>login.jsf</welcome-file>
     </welcome-file-list>
-    <filter>   
-        <filter-name>PrimeFaces FileUpload Filter</filter-name>        
+    <filter>
+        <filter-name>PrimeFaces FileUpload Filter</filter-name>
         <filter-class> 
             org.primefaces.webapp.filter.FileUploadFilter
         </filter-class>
-    </filter>  
-    <filter-mapping>   
-        <filter-name>PrimeFaces FileUpload Filter</filter-name>        
+    </filter>
+    <filter-mapping>
+        <filter-name>PrimeFaces FileUpload Filter</filter-name>
         <servlet-name>Faces Servlet</servlet-name>
     </filter-mapping>
     <filter>