Switching to itext-2.1.5-rev3628.

itext library: minor adjustments for pdf-as
Adding new error code (103) for invalid pdfa/1b font configuration.
Minor updates for PDF/A support.
Support for local MOCCA CCS added.
Multi language for web application.
Encoding issue for web application fixed by implementing an EncodingFilter.
Dynamic sign upload form implemented.
Order of input fields for dynamic upload form changed.
MOCCA logo added to sign upload form.

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

5 files changed, 64 insertions, 10 deletions

diff --git a/src/main/java/at/knowcenter/wag/egov/egiz/web/servlets/DataURLServlet.java b/src/main/java/at/knowcenter/wag/egov/egiz/web/servlets/DataURLServlet.java
index 2adc4b1..16352de 100644
--- a/src/main/java/at/knowcenter/wag/egov/egiz/web/servlets/DataURLServlet.java
+++ b/src/main/java/at/knowcenter/wag/egov/egiz/web/servlets/DataURLServlet.java
@@ -126,6 +126,7 @@ public class DataURLServlet extends HttpServlet
     {

       Object sessionObject = SessionHelper.getSession(request);

 

+      // obsolete since EncodingFilter is set in web.xml

       checkRequestCharacterEncoding(request);

       

       if (sessionObject instanceof SignSessionInformation)

@@ -152,8 +153,6 @@ public class DataURLServlet extends HttpServlet
   

   protected void checkRequestCharacterEncoding(HttpServletRequest request) throws UnsupportedEncodingException

   {

-    log.debug("Request character encoding = " + request.getCharacterEncoding()); //$NON-NLS-1$

-//  if (request.getCharacterEncoding() == null || request.getCharacterEncoding().equals("UTF-8")) //$NON-NLS-1$

   if (request.getCharacterEncoding() == null || request.getCharacterEncoding().length() <= 0) //$NON-NLS-1$

   {

     log.info("The BKU didn't set a character encoding for the request."); //$NON-NLS-1$

@@ -220,12 +219,20 @@ public class DataURLServlet extends HttpServlet
       response.setCharacterEncoding("UTF-8");

       response.getWriter().println(request_string);

     }

-    else

+    else if (xml_response != null)

     {

       log.debug("Received a normal response -> storing the response."); //$NON-NLS-1$

 

       Properties response_properties = new Properties();

       response_properties.setProperty(BKUPostConnection.RESPONSE_STRING_KEY, xml_response);

+      

+      String userAgent = request.getHeader("User-Agent");

+      if (userAgent != null) {

+         response_properties.setProperty(BKUPostConnection.BKU_USER_AGENT_HEADER_KEY, userAgent);

+      } else {

+         log.warn("BKU request/response header \"User-Agent\" is empty.");

+      }

+      

       si.response_properties = response_properties;

       

       log.debug("All requests have been processed -> processing the responses."); //$NON-NLS-1$

@@ -294,7 +301,9 @@ public class DataURLServlet extends HttpServlet
          

          // do not insert any code within this else block !

       }

-    }

+    } else {

+        log.debug("No XMLResponse found. Do nothing.");

+     }

   }

   

   protected void processVerify(HttpServletRequest request, HttpServletResponse response, VerifySessionInformation si) throws ServletException, IOException, ConnectorException, InvalidIDException

diff --git a/src/main/java/at/knowcenter/wag/egov/egiz/web/servlets/ProvidePDFServlet.java b/src/main/java/at/knowcenter/wag/egov/egiz/web/servlets/ProvidePDFServlet.java
index a8ff426..1efc64f 100644
--- a/src/main/java/at/knowcenter/wag/egov/egiz/web/servlets/ProvidePDFServlet.java
+++ b/src/main/java/at/knowcenter/wag/egov/egiz/web/servlets/ProvidePDFServlet.java
@@ -59,8 +59,8 @@ public class ProvidePDFServlet extends HttpServlet {
             log.debug("Signed pdf found.");

             session.removeAttribute(SessionAttributes.SIGNED_PDF_DOCUMENT);

             log.debug("Returning signed pdf to browser.");

-            log.debug("Invalidating session.");

-            session.invalidate();

+//            log.debug("Invalidating session.");

+//            session.invalidate();

             SignServletHelper.returnSignResponse(si, response);

             return;

          }

diff --git a/src/main/java/at/knowcenter/wag/egov/egiz/web/servlets/SignServlet.java b/src/main/java/at/knowcenter/wag/egov/egiz/web/servlets/SignServlet.java
index 124b2a3..589de7c 100644
--- a/src/main/java/at/knowcenter/wag/egov/egiz/web/servlets/SignServlet.java
+++ b/src/main/java/at/knowcenter/wag/egov/egiz/web/servlets/SignServlet.java
@@ -244,8 +244,11 @@ public class SignServlet extends HttpServlet
       catch (Exception e)

       {

         // Error retrieving data

-        request.setAttribute("error", "Fehler beim Upload der Daten");

-        request.setAttribute("cause", "Beim Upload der Daten ist ein Fehler aufgetreten.");

+//         request.setAttribute("error", "Fehler beim Upload der Daten");

+//         request.setAttribute("cause", "Beim Upload der Daten ist ein Fehler aufgetreten.");

+        request.setAttribute("error", "signservlet.error");

+        request.setAttribute("cause", "signservlet.cause");

+        request.setAttribute("resourcebundle", Boolean.TRUE);

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

         return;

       }

diff --git a/src/main/java/at/knowcenter/wag/egov/egiz/web/servlets/UpdateFormServlet.java b/src/main/java/at/knowcenter/wag/egov/egiz/web/servlets/UpdateFormServlet.java
new file mode 100644
index 0000000..ba5d43e
--- /dev/null
+++ b/src/main/java/at/knowcenter/wag/egov/egiz/web/servlets/UpdateFormServlet.java
@@ -0,0 +1,41 @@
+package at.knowcenter.wag.egov.egiz.web.servlets;

+

+import java.io.IOException;

+

+import javax.servlet.RequestDispatcher;

+import javax.servlet.ServletException;

+import javax.servlet.http.HttpServlet;

+import javax.servlet.http.HttpServletRequest;

+import javax.servlet.http.HttpServletResponse;

+import javax.servlet.http.HttpSession;

+

+import at.knowcenter.wag.egov.egiz.web.FormFields;

+

+public class UpdateFormServlet extends HttpServlet {

+

+   private static final long serialVersionUID = 1L;

+   

+   public static final String UPLOADFORM_SIGNATURE_TYPE_KEY   = "signupload.jsp:signatureType";

+   public static final String UPLOADFORM_SIGNATURE_MODE_KEY   = "signupload.jsp:signatureMode";

+   public static final String UPLOADFORM_SIGNATURE_DEVICE_KEY = "signupload.jsp:signatureKey";

+

+   protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {

+      this.doPost(request, response);

+   }

+

+   protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {

+      String mode = request.getParameter(FormFields.FIELD_MODE);

+      String device = request.getParameter(FormFields.FIELD_CONNECTOR);

+      String type = request.getParameter(FormFields.FIELD_SIGNATURE_TYPE);

+      

+      HttpSession session = request.getSession();

+      session.setAttribute(UPLOADFORM_SIGNATURE_DEVICE_KEY, device);

+      session.setAttribute(UPLOADFORM_SIGNATURE_MODE_KEY, mode);

+      session.setAttribute(UPLOADFORM_SIGNATURE_TYPE_KEY, type);

+      

+      RequestDispatcher dispatcher = request.getRequestDispatcher("/jsp/signupload.jsp");

+      dispatcher.forward(request, response);

+//      response.sendRedirect(response.encodeRedirectURL(request.getContextPath() + "/jsp/signupload.jsp"));

+   }

+

+}

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 5e1819e..0eb417b 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
@@ -699,8 +699,9 @@ public class VerifyPreviewServlet extends HttpServlet
     }

     catch (FileUploadException e)

     {

-      request.setAttribute("error", "Fehler beim Upload der Daten");

-      request.setAttribute("cause", "Beim Upload der Daten ist ein Fehler aufgetreten.");

+       request.setAttribute("error", "verifypreviewservlet.error");

+       request.setAttribute("cause", "verifypreviewservlet.cause");

+       request.setAttribute("resourcebundle", Boolean.TRUE);

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

     }

     catch (PresentableException e)