Template Versioning, BKU and MOA 1.1.0 (detached)

NOTE: MOA enveloping is still not fixed

git-svn-id: https://joinup.ec.europa.eu/svn/pdf-as/trunk@149 7b5415b0-85f9-ee4d-85bd-d5d0c3b42d1c

3 files changed, 8 insertions, 19 deletions

diff --git a/src/main/java/at/knowcenter/wag/egov/egiz/web/servlets/RetrieveSignatureDataServlet.java b/src/main/java/at/knowcenter/wag/egov/egiz/web/servlets/RetrieveSignatureDataServlet.java
index cbc4e06..402170c 100644
--- a/src/main/java/at/knowcenter/wag/egov/egiz/web/servlets/RetrieveSignatureDataServlet.java
+++ b/src/main/java/at/knowcenter/wag/egov/egiz/web/servlets/RetrieveSignatureDataServlet.java
@@ -3,9 +3,7 @@
  */

 package at.knowcenter.wag.egov.egiz.web.servlets;

 

-import java.io.ByteArrayInputStream;

 import java.io.IOException;

-import java.io.InputStream;

 

 import javax.servlet.ServletException;

 import javax.servlet.http.HttpServlet;

@@ -93,18 +91,7 @@ public class RetrieveSignatureDataServlet extends HttpServlet
     

     response.setContentType(sd.getMimeType());

     response.setCharacterEncoding(sd.getCharacterEncoding());

-    //response.getOutputStream().write(sd.getData());

-    

-    //::::

-    InputStream is = new ByteArrayInputStream(sd.getData());

-    final int bufferSize = 1024;

-    byte[] buffer = new byte[bufferSize];

-    int len = -1;

-    while ((len = is.read(buffer)) != -1) {

-    	response.getOutputStream().write(buffer, 0, len);

-    }

-    response.getOutputStream().flush();

-    //::::

+    response.getOutputStream().write(sd.getData());

     

     log.debug("Writing SignatureData finished."); //$NON-NLS-1$

   }

diff --git a/src/main/java/at/knowcenter/wag/egov/egiz/web/servlets/VerifyPreviewServlet.java b/src/main/java/at/knowcenter/wag/egov/egiz/web/servlets/VerifyPreviewServlet.java
index 1ab89ed..3a79939 100644
--- a/src/main/java/at/knowcenter/wag/egov/egiz/web/servlets/VerifyPreviewServlet.java
+++ b/src/main/java/at/knowcenter/wag/egov/egiz/web/servlets/VerifyPreviewServlet.java
@@ -561,7 +561,7 @@ public class VerifyPreviewServlet extends HttpServlet
       URL loc_ref_URL = new URL(request.getScheme(), host, request.getServerPort(), request.getContextPath() + "/RetrieveSignatureData");

       String loc_ref_url = response.encodeURL(loc_ref_URL.toString());

 

-      List results = PdfAS.verifySignatureHoldersWeb(holders_to_verify, si, loc_ref_url);

+      List results = PdfAS.verifySignatureHoldersWeb(holders_to_verify, si.connector, loc_ref_url);

       boolean backbutton = true;

       if (verify_which >= 0)

       {

@@ -697,7 +697,7 @@ public class VerifyPreviewServlet extends HttpServlet
       URL loc_ref_URL = new URL(request.getScheme(), host, request.getServerPort(), request.getContextPath() + "/RetrieveSignatureData");

       String loc_ref_url = response.encodeURL(loc_ref_URL.toString());

 

-      List results = PdfAS.verifySignatureHoldersWeb(holders_to_verify, si, loc_ref_url);

+      List results = PdfAS.verifySignatureHoldersWeb(holders_to_verify, si.connector, loc_ref_url);

       dispatchToResults(results, request, response, true);

     }

     catch (FileUploadException e)

diff --git a/src/main/java/at/knowcenter/wag/egov/egiz/web/servlets/VerifyServlet.java b/src/main/java/at/knowcenter/wag/egov/egiz/web/servlets/VerifyServlet.java
index a85b31f..ba740d0 100644
--- a/src/main/java/at/knowcenter/wag/egov/egiz/web/servlets/VerifyServlet.java
+++ b/src/main/java/at/knowcenter/wag/egov/egiz/web/servlets/VerifyServlet.java
@@ -105,13 +105,15 @@ public class VerifyServlet extends HttpServlet
       si.mode = null;

       si.pdf = null;

       si.type = null;

-      si.user_name = null; 

+      si.user_name = null;

       si.user_password = null;

 

       si.signature_holders = signature_holders;

 

       request.getSession().setAttribute(SessionAttributes.ATTRIBUTE_SESSION_INFORMATION, si);

-

+      System.out.println("\n\n-----------------------------------------------------------------------");

+      System.out.println();

+      System.out.println("-----------------------------------------------------------------------\n\n");

       if (ud.preview)

       {

         dispatch(request, response, "/jsp/verifylist.jsp");

@@ -131,7 +133,7 @@ public class VerifyServlet extends HttpServlet
         URL loc_ref_URL = new URL(request.getScheme(), host, request.getServerPort(), request.getContextPath() + "/RetrieveSignatureData");

         String loc_ref_url = response.encodeURL(loc_ref_URL.toString());

 

-        List results = PdfAS.verifySignatureHoldersWeb(signature_holders, si, loc_ref_url);

+        List results = PdfAS.verifySignatureHoldersWeb(signature_holders, si.connector, loc_ref_url);

         dispatchToResults(results, request, response);

       }