(Default) configuration updated regarding new configuration keys.

Update concerting exclusion of minimal layout profiles for verification.
APIDemo updated.
Many printStackTraces replaces with logger-messages.
Web-Application: New error code (251) introduced: Textual signature of files with no extractable textual content (e.g. files that solely contain images) is prevented.

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

9 files changed, 35 insertions, 26 deletions

diff --git a/src/main/java/at/knowcenter/wag/egov/egiz/web/LocalRequestHelper.java b/src/main/java/at/knowcenter/wag/egov/egiz/web/LocalRequestHelper.java
index 2f02944..15792b9 100644
--- a/src/main/java/at/knowcenter/wag/egov/egiz/web/LocalRequestHelper.java
+++ b/src/main/java/at/knowcenter/wag/egov/egiz/web/LocalRequestHelper.java
@@ -26,8 +26,9 @@ import java.util.Properties;
 import javax.servlet.http.HttpServletRequest;

 import javax.servlet.http.HttpServletResponse;

 

-import at.gv.egiz.pdfas.impl.input.TextDataSourceImpl;

-import at.gv.egiz.pdfas.framework.input.DataSource;

+import org.apache.commons.logging.Log;

+import org.apache.commons.logging.LogFactory;

+

 import at.gv.egiz.pdfas.web.CurrentLocalOperation;

 import at.gv.egiz.pdfas.web.SignSessionInformation;

 import at.gv.egiz.pdfas.web.VerifySessionInformation;

@@ -39,10 +40,8 @@ import at.knowcenter.wag.egov.egiz.exceptions.NormalizeException;
 import at.knowcenter.wag.egov.egiz.exceptions.PresentableException;

 import at.knowcenter.wag.egov.egiz.exceptions.SettingsException;

 import at.knowcenter.wag.egov.egiz.exceptions.SignatureException;

-import at.knowcenter.wag.egov.egiz.pdf.BinarySignatureHolder;

 import at.knowcenter.wag.egov.egiz.pdf.SignatureHolder;

 import at.knowcenter.wag.egov.egiz.sig.SignatureData;

-import at.knowcenter.wag.egov.egiz.sig.SignatureDataImpl;

 import at.knowcenter.wag.egov.egiz.sig.SignatureObject;

 import at.knowcenter.wag.egov.egiz.sig.connectors.ConnectorChooser;

 import at.knowcenter.wag.egov.egiz.sig.connectors.LocalConnector;

@@ -56,6 +55,12 @@ import at.knowcenter.wag.egov.egiz.sig.signatureobject.SignatureObjectHelper;
  */

 public abstract class LocalRequestHelper

 {

+   

+   /**

+    * The logger.

+    */

+   protected static Log logger = LogFactory.getLog(LocalRequestHelper.class);

+

   /**

    * The resource of the null request page jsp.

    */

@@ -426,7 +431,7 @@ public abstract class LocalRequestHelper
     }

     catch (MalformedURLException e)

     {

-      e.printStackTrace();

+      logger.error(e.getMessage(), e);

     }

     String loc_server = response.encodeURL(local_server.toString());

 

diff --git a/src/main/java/at/knowcenter/wag/egov/egiz/web/PdfASServletContextListener.java b/src/main/java/at/knowcenter/wag/egov/egiz/web/PdfASServletContextListener.java
index 95cb041..cdd3df1 100644
--- a/src/main/java/at/knowcenter/wag/egov/egiz/web/PdfASServletContextListener.java
+++ b/src/main/java/at/knowcenter/wag/egov/egiz/web/PdfASServletContextListener.java
@@ -98,7 +98,7 @@ public class PdfASServletContextListener implements ServletContextListener
     try {

       SettingsReader.getInstance();

    } catch (SettingsException e) {

-      logger.error(e);

+      logger.error(e.getMessage(), e);

    }

 

     SettingsReader.clearTemporaryDirectory();

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 cbb33ba..19a82c3 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
@@ -133,7 +133,7 @@ public class DataURLServlet extends HttpServlet
     }

     catch (PresentableException e)

     {

-      log.error(e);

+      log.error(e.getMessage(), e);

       SignServlet.prepareDispatchToErrorPage(e, request);

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

     }

@@ -147,9 +147,9 @@ public class DataURLServlet extends HttpServlet
 //  if (request.getCharacterEncoding() == null || request.getCharacterEncoding().equals("UTF-8")) //$NON-NLS-1$

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

   {

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

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

 

-    log.warn("Manually setting character encoding to UTF-8"); //$NON-NLS-1$

+    log.info("Manually setting character encoding to UTF-8"); //$NON-NLS-1$

     request.setCharacterEncoding("UTF-8"); //$NON-NLS-1$

   }

   }

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 03bd074..a8ff426 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
@@ -88,7 +88,7 @@ public class ProvidePDFServlet extends HttpServlet {
                   response.getOutputStream().flush();

                   signedDocuments.remove(current);

                } catch (IOException e) {

-                  log.warn("IO excepton while providing pdf document: " + e.getMessage());

+                  log.error("IO excepton while providing pdf document: " + e.getMessage(), e);

                }

             }

          }

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 61996da..1b32db8 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
@@ -86,7 +86,7 @@ public class RetrieveSignatureDataServlet extends HttpServlet
     }

     catch (SessionExpiredException e)

     {

-      log.error(e);

+      log.error(e.getMessage(), e);

       SignServlet.prepareDispatchToErrorPage(e, request);

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

     }

diff --git a/src/main/java/at/knowcenter/wag/egov/egiz/web/servlets/SignPreviewServlet.java b/src/main/java/at/knowcenter/wag/egov/egiz/web/servlets/SignPreviewServlet.java
index aec4f25..fa6b734 100644
--- a/src/main/java/at/knowcenter/wag/egov/egiz/web/servlets/SignPreviewServlet.java
+++ b/src/main/java/at/knowcenter/wag/egov/egiz/web/servlets/SignPreviewServlet.java
@@ -25,6 +25,9 @@ import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;

 import javax.servlet.http.HttpServletResponse;

 

+import org.apache.commons.logging.Log;

+import org.apache.commons.logging.LogFactory;

+

 import at.gv.egiz.pdfas.web.SignSessionInformation;

 import at.gv.egiz.pdfas.web.helper.SessionHelper;

 import at.gv.egiz.pdfas.web.helper.SignServletHelper;

@@ -36,6 +39,8 @@ import at.knowcenter.wag.egov.egiz.exceptions.PresentableException;
 public class SignPreviewServlet extends HttpServlet

 {

 

+   protected static Log logger = LogFactory.getLog(SignPreviewServlet.class);

+

   /**

    * SVUID.

    */

@@ -63,7 +68,8 @@ public class SignPreviewServlet extends HttpServlet
     }

     catch (PresentableException e)

     {

-      e.printStackTrace();

+      logger.error(e.getMessage(), e);

+

       SignServlet.prepareDispatchToErrorPage(e, request);

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

     }

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 9b340e6..6330f0c 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
@@ -34,15 +34,6 @@ import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;

 import javax.servlet.http.HttpServletResponse;

 

-import at.gv.egiz.pdfas.exceptions.ErrorCode;

-import at.gv.egiz.pdfas.exceptions.ErrorCodeHelper;

-import at.gv.egiz.pdfas.exceptions.external.ExternalErrorException;

-import at.gv.egiz.pdfas.framework.input.PdfDataSource;

-import at.gv.egiz.pdfas.impl.input.FileBasedPdfDataSourceImpl;

-import at.gv.egiz.pdfas.web.SignSessionInformation;

-import at.gv.egiz.pdfas.web.helper.SignServletHelper;

-import at.gv.egiz.pdfas.web.helper.TempDirHelper;

-

 import org.apache.commons.fileupload.FileItem;

 import org.apache.commons.fileupload.FileUploadException;

 import org.apache.commons.fileupload.disk.DiskFileItemFactory;

@@ -50,6 +41,13 @@ import org.apache.commons.fileupload.servlet.ServletFileUpload;
 import org.apache.commons.logging.Log;

 import org.apache.commons.logging.LogFactory;

 

+import at.gv.egiz.pdfas.exceptions.ErrorCode;

+import at.gv.egiz.pdfas.exceptions.ErrorCodeHelper;

+import at.gv.egiz.pdfas.exceptions.external.ExternalErrorException;

+import at.gv.egiz.pdfas.framework.input.PdfDataSource;

+import at.gv.egiz.pdfas.web.SignSessionInformation;

+import at.gv.egiz.pdfas.web.helper.SignServletHelper;

+import at.gv.egiz.pdfas.web.helper.TempDirHelper;

 import at.knowcenter.wag.egov.egiz.PdfAS;

 import at.knowcenter.wag.egov.egiz.cfg.SettingsReader;

 import at.knowcenter.wag.egov.egiz.exceptions.PDFDocumentException;

@@ -197,7 +195,7 @@ public class SignServlet extends HttpServlet
          }

          catch (PDFDocumentException e)

          {

-           log.warn("Unable to create signature position object: " + e.getMessage());

+           log.warn("Unable to create signature position object: " + e.getMessage(), e);

          }

       } else {

       	log.debug("No signature position provided.");

@@ -308,7 +306,7 @@ public class SignServlet extends HttpServlet
     }

     catch (PresentableException e)

     {

-      e.printStackTrace();

+      log.error(e.getMessage(), e);

       prepareDispatchToErrorPage(e, request);

       dispatch(request, response, "/jsp/error.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 9a91567..9b8583d 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
@@ -582,7 +582,7 @@ public class VerifyPreviewServlet extends HttpServlet
     }

     catch (PresentableException e)

     {

-      e.printStackTrace();

+      logger_.error(e.getMessage(), e);

       SignServlet.prepareDispatchToErrorPage(e, request);

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

     }

@@ -702,7 +702,7 @@ public class VerifyPreviewServlet extends HttpServlet
     }

     catch (PresentableException e)

     {

-      e.printStackTrace();

+      logger_.error(e.getMessage(), e);

       SignServlet.prepareDispatchToErrorPage(e, request);

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

     }

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 97a1e6f..387ae08 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
@@ -175,7 +175,7 @@ public class VerifyServlet extends HttpServlet
     }

     catch (PresentableException e)

     {

-      e.printStackTrace();

+      log.error(e.getMessage(), e);

       SignServlet.prepareDispatchToErrorPage(e, request);

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

     }