Some more log messages (e.g. encoding related issues).

Updating web application (in external invocation mode) enhancing support for being used within an iframe.
Two new (optional) parameters for external invocation mode:
locale: defines the locale being used for webapp (e.g. locale=de or locale=de_DE),
invoke-app-error-url: can be used to declare a callback url to the calling web application in order to transfer error messages from pdf-as.
In case of error pdf-as redirects the user to the error-page-url (if given) providing the error and the cause in url encoded parameters ("error", "cause").
Formatter for mocca signature params enhanced.

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

3 files changed, 4 insertions, 3 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 16352de..f74bd1c 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
@@ -277,7 +277,7 @@ public class DataURLServlet extends HttpServlet
          //            redirect to download.jsp but return the sign-response immediately

          if (si.exappinf != null) {

             log.debug("Entering external application interface mode. Skipping redirection to download page.");

-            SignServletHelper.returnSignResponse(si, response);

+            SignServletHelper.returnSignResponse(si, request, response);

             

             // Not needed due to redirection of returnSignResponse.

             // Just to clarify that there must not be any code after returnSignResponse.

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 1efc64f..c40f3c6 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
@@ -61,7 +61,7 @@ public class ProvidePDFServlet extends HttpServlet {
             log.debug("Returning signed pdf to browser.");

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

 //            session.invalidate();

-            SignServletHelper.returnSignResponse(si, response);

+            SignServletHelper.returnSignResponse(si, request, response);

             return;

          }

       } else {

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 589de7c..792a3e1 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
@@ -184,6 +184,7 @@ public class SignServlet extends HttpServlet
       String pdf_id = (String) request.getParameter(FormFields.FIELD_PDF_ID);

       String pdf_length = (String) request.getParameter(FormFields.FIELD_FILE_LENGTH);

       String invoke_url = (String) request.getParameter(FormFields.FIELD_INVOKE_APP_URL);

+      String invoke_error_url = (String) request.getParameter(FormFields.FIELD_INVOKE_APP_ERROR_URL);

       String session_id = (String) request.getParameter(FormFields.FIELD_SESSION_ID);

       String sig_pos_y = (String) request.getParameter(FormFields.FIELD_SIGPOS_Y);

       String sig_pos_p = (String) request.getParameter(FormFields.FIELD_SIGPOS_P);

@@ -227,7 +228,7 @@ public class SignServlet extends HttpServlet
 

       ud = ud_extern;

       

-      exappinf = new ExternAppInformation(invoke_url, pdf_id, session_id);

+      exappinf = new ExternAppInformation(invoke_url, pdf_id, session_id, invoke_error_url);

     }

     else

     {