Ajustes das novas chamadas do mediador para registro do log e retorno de ações.

diff --git a/src/java/org/ufcspa/simdecs/comunicacao/MetodoConfiancaEtapa.java b/src/java/org/ufcspa/simdecs/comunicacao/MetodoConfiancaEtapa.java
index 3b838d3..bfbde48 100644 (file)
--- a/src/java/org/ufcspa/simdecs/comunicacao/MetodoConfiancaEtapa.java
+++ b/src/java/org/ufcspa/simdecs/comunicacao/MetodoConfiancaEtapa.java
@@ -51,6 +51,7 @@ public class MetodoConfiancaEtapa extends HttpServlet {
             out.println( "<xml>" );
 
             out.println("   <nivel_confianca registrado=\"sim\" />");
+            out.println("   <resposta_acao_mediador acao=\"nao\" />");
             
             out.println( "</xml>" );
         } finally {

diff --git a/src/java/org/ufcspa/simdecs/comunicacao/MetodoConfiancaInicial.java b/src/java/org/ufcspa/simdecs/comunicacao/MetodoConfiancaInicial.java
index 80de661..3969560 100644 (file)
--- a/src/java/org/ufcspa/simdecs/comunicacao/MetodoConfiancaInicial.java
+++ b/src/java/org/ufcspa/simdecs/comunicacao/MetodoConfiancaInicial.java
@@ -47,6 +47,7 @@ public class MetodoConfiancaInicial extends HttpServlet {
             out.println( "<xml>" );
 
             out.println("   <nivel_confianca registrado=\"sim\" />");
+            out.println("   <resposta_acao_mediador acao=\"nao\" />");
             
             out.println( "</xml>" );
         } finally {

diff --git a/src/java/org/ufcspa/simdecs/comunicacao/MetodoRegistraAcao.java b/src/java/org/ufcspa/simdecs/comunicacao/MetodoRegistraAcao.java
new file mode 100644 (file)
index 0000000..0bfb71e
--- /dev/null
+++ b/src/java/org/ufcspa/simdecs/comunicacao/MetodoRegistraAcao.java
@@ -0,0 +1,97 @@
+/*
+ * 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.persistence.EntityManager;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.ufcspa.simdecs.util.DbUtil;
+
+/**
+ *
+ * @author maroni
+ */
+public class MetodoRegistraAcao 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
+     */
+    protected void processRequest(HttpServletRequest request, HttpServletResponse response)
+            throws ServletException, IOException {
+        response.setContentType("text/html;charset=UTF-8");
+        PrintWriter out = response.getWriter();
+        try {
+            response.setContentType( "text/xml" );
+            response.setHeader( "Cache-Control", "no-cache" );
+
+            EntityManager em    = DbUtil.getInstance().getEntityManager();
+            long   pIdSessao    = Long.parseLong(request.getParameter("idsessao"));
+            String pAcao        = request.getParameter("acao");
+//Acoes: abre_investigacao, fecha_investigacao, abre_diagnostico, fecha_diagnostico, abre_conduta, fecha_conduta
+            out.println( "<xml>" );
+
+            //if (isPar)
+            //    out.println("   <resposta_acao_mediador acao=\"sim\" problema=\"PROBLEMA ORIGINADO PELO MEDIADOR\" mensagem=\"MENSAGEM A CADA ACAO VINDA DO MEDIADOR\" />");
+            //else                
+                out.println("   <resposta_acao_mediador acao=\"nao\" />");
+            
+            out.println( "</xml>" );
+        } finally {
+            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>
+}

diff --git a/web/WEB-INF/web.xml b/web/WEB-INF/web.xml
index a1d6e20..33af7cb 100644 (file)
--- a/web/WEB-INF/web.xml
+++ b/web/WEB-INF/web.xml
@@ -41,6 +41,10 @@
         <servlet-name>MetodoGravaHistorico</servlet-name>
         <servlet-class>org.ufcspa.simdecs.comunicacao.MetodoGravaHistorico</servlet-class>
     </servlet>
+    <servlet>
+        <servlet-name>MetodoRegistraAcao</servlet-name>
+        <servlet-class>org.ufcspa.simdecs.comunicacao.MetodoRegistraAcao</servlet-class>
+    </servlet>
     <servlet-mapping>
         <servlet-name>Faces Servlet</servlet-name>
         <url-pattern>*.jsf</url-pattern>
@@ -77,6 +81,10 @@
         <servlet-name>MetodoGravaHistorico</servlet-name>
         <url-pattern>/MetodoGravaHistorico</url-pattern>
     </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>MetodoRegistraAcao</servlet-name>
+        <url-pattern>/MetodoRegistraAcao</url-pattern>
+    </servlet-mapping>
     <session-config>
         <session-timeout>
             30

diff --git a/web/login.xhtml b/web/login.xhtml
index 891c589..26af0a4 100644 (file)
--- a/web/login.xhtml
+++ b/web/login.xhtml
@@ -33,7 +33,7 @@
             </p:panel>
             <br/>
             <br/>
-            <h:outputText value="Versão 2.1.0" />
+            <h:outputText value="Versão 2.2.0" />
         </center>
     </h:body>
 </html>