(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

10 files changed, 38 insertions, 30 deletions

diff --git a/src/main/java/at/knowcenter/wag/egov/egiz/sig/ConnectorFactory.java b/src/main/java/at/knowcenter/wag/egov/egiz/sig/ConnectorFactory.java
index 9d744e1..e8deb39 100644
--- a/src/main/java/at/knowcenter/wag/egov/egiz/sig/ConnectorFactory.java
+++ b/src/main/java/at/knowcenter/wag/egov/egiz/sig/ConnectorFactory.java
@@ -337,7 +337,7 @@ public abstract class ConnectorFactory
 		is_id_field_visible = SettingsReader.getInstance().getValueFromKey(MOA_ID_VISIBLE_PROPERTY_KEY);

 	  } catch (SettingsException e)

 	  {

-		e.printStackTrace();

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

 	  }

 	  

 	  // if not setted in config, show it

diff --git a/src/main/java/at/knowcenter/wag/egov/egiz/sig/DummyLDAPAPI.java b/src/main/java/at/knowcenter/wag/egov/egiz/sig/DummyLDAPAPI.java
index 47d1d20..0ab1d25 100644
--- a/src/main/java/at/knowcenter/wag/egov/egiz/sig/DummyLDAPAPI.java
+++ b/src/main/java/at/knowcenter/wag/egov/egiz/sig/DummyLDAPAPI.java
@@ -20,6 +20,9 @@ package at.knowcenter.wag.egov.egiz.sig;
 import java.io.File;

 import java.io.FileInputStream;

 

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

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

+

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

 import at.knowcenter.wag.egov.egiz.ldap.api.LDAPAPIException;

 import at.knowcenter.wag.egov.egiz.ldap.client.LDAPIssuerNameFilter;

@@ -36,6 +39,11 @@ public class DummyLDAPAPI implements LDAPAPI
 {

   String url_ = null;

 

+  /**

+   * The Logger.

+   */

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

+

   public DummyLDAPAPI(String url)

   {

     this.url_ = url;

@@ -70,7 +78,7 @@ public byte[] loadBase64CertificateFromLDAP(String serial_number, String issuer)
       }

       catch (Exception e)

       {

-        e.printStackTrace();

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

         data = null;

       }

     }

diff --git a/src/main/java/at/knowcenter/wag/egov/egiz/sig/SignatureObject.java b/src/main/java/at/knowcenter/wag/egov/egiz/sig/SignatureObject.java
index 1b9b6a6..a765e8d 100644
--- a/src/main/java/at/knowcenter/wag/egov/egiz/sig/SignatureObject.java
+++ b/src/main/java/at/knowcenter/wag/egov/egiz/sig/SignatureObject.java
@@ -47,7 +47,6 @@ import at.knowcenter.wag.egov.egiz.exceptions.NormalizeException;
 import at.knowcenter.wag.egov.egiz.exceptions.SettingsException;

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

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

-import at.knowcenter.wag.egov.egiz.framework.SignatorFactory;

 import at.knowcenter.wag.egov.egiz.ldap.api.LDAPAPIException;

 import at.knowcenter.wag.egov.egiz.ldap.api.LDAPAPIFactory;

 import at.knowcenter.wag.egov.egiz.ldap.client.LDAPIssuerNameFilter;

@@ -197,7 +196,7 @@ public class SignatureObject implements Serializable
 			try {

 				name = parser.parse();

 			} catch (RFC2253NameParserException e) {

-				logger_.error(e);

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

 			}

 			return name;

 		}

@@ -465,7 +464,7 @@ public class SignatureObject implements Serializable
     }

     catch (InvalidIDException e)

     {

-      e.printStackTrace();

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

     }

     return kz;

   }

@@ -705,7 +704,7 @@ public class SignatureObject implements Serializable
     }

     catch (CertificateEncodingException e)

     {

-      logger_.error(e);

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

     }

   }

 

@@ -872,7 +871,7 @@ public class SignatureObject implements Serializable
     }

     catch (InvalidIDException e)

     {

-      logger_.error(e);

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

       return false;

     }

   }

@@ -891,7 +890,7 @@ public class SignatureObject implements Serializable
     }

     catch (InvalidIDException e)

     {

-      e.printStackTrace();

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

     }

     return SigKZIDHelper.isTextual(kz);

   }

@@ -910,7 +909,7 @@ public class SignatureObject implements Serializable
     }

     catch (InvalidIDException e)

     {

-      e.printStackTrace();

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

     }

  

     return SigKZIDHelper.isBinary(kz);

@@ -1175,7 +1174,7 @@ public class SignatureObject implements Serializable
              Name issuerName = new RFC2253NameParser(issuer).parse();

              cert = loadCertificateFromCertstore(serialNumber, issuerName.getRFC2253String(false));

           } catch (RFC2253NameParserException e) {

-             logger_.error(e);

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

           }

       }

 

@@ -1245,7 +1244,7 @@ public class SignatureObject implements Serializable
          this.setSignationIssuer(cert.getIssuerName());

       }

     } catch (IOException e) {

-      e.printStackTrace();

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

       return;

     }

 

diff --git a/src/main/java/at/knowcenter/wag/egov/egiz/sig/SignatureResponse.java b/src/main/java/at/knowcenter/wag/egov/egiz/sig/SignatureResponse.java
index deedb6d..6a5c95a 100644
--- a/src/main/java/at/knowcenter/wag/egov/egiz/sig/SignatureResponse.java
+++ b/src/main/java/at/knowcenter/wag/egov/egiz/sig/SignatureResponse.java
@@ -136,7 +136,7 @@ public class SignatureResponse
     }

     catch (SignatureException e)

     {

-      logger_.warn(e.getMessage());

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

     }

   }

 

diff --git a/src/main/java/at/knowcenter/wag/egov/egiz/sig/SignatureTypes.java b/src/main/java/at/knowcenter/wag/egov/egiz/sig/SignatureTypes.java
index 13fdf2f..3dd6f67 100644
--- a/src/main/java/at/knowcenter/wag/egov/egiz/sig/SignatureTypes.java
+++ b/src/main/java/at/knowcenter/wag/egov/egiz/sig/SignatureTypes.java
@@ -388,11 +388,7 @@ public class SignatureTypes
           }

           catch (SignatureException e)

           {

-            if (logger_.isDebugEnabled())

-            {

-              logger_.debug(e.getMessage());

-            }

-            e.printStackTrace();

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

           }

         }

       }

diff --git a/src/main/java/at/knowcenter/wag/egov/egiz/sig/X509Cert.java b/src/main/java/at/knowcenter/wag/egov/egiz/sig/X509Cert.java
index 148ac41..8aaa49a 100644
--- a/src/main/java/at/knowcenter/wag/egov/egiz/sig/X509Cert.java
+++ b/src/main/java/at/knowcenter/wag/egov/egiz/sig/X509Cert.java
@@ -157,12 +157,12 @@ public class X509Cert implements Serializable
     catch (java.security.cert.CertificateException ce)

     {

       // nothing to do, cause certString is not X509 conformc

-      ce.printStackTrace();

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

     }

     catch (IOException ioe)

     {

       // nothing to do, cause certString is not X509 conform

-      ioe.printStackTrace();

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

     }

     return x509_cert;

   }

@@ -217,12 +217,13 @@ public class X509Cert implements Serializable
     catch (java.security.cert.CertificateException ce)

     {

       // nothing to do, cause certString is not X509 conformc

-      ce.printStackTrace();

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

+      

     }

     catch (IOException ioe)

     {

       // nothing to do, cause certString is not X509 conform

-      ioe.printStackTrace();

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

     }

 

     return x509_cert;

@@ -453,7 +454,7 @@ public class X509Cert implements Serializable
     }

     catch (CertificateParsingException e)

     {

-      e.printStackTrace();

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

     }

     return null;

   }

diff --git a/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/MOAConnector.java b/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/MOAConnector.java
index 5e1aeed..5ec7f20 100644
--- a/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/MOAConnector.java
+++ b/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/MOAConnector.java
@@ -214,10 +214,6 @@ public class MOAConnector implements Connector
     }

     catch (WebException we)

     {

-      if (logger_.isDebugEnabled())

-      {

-        we.printStackTrace();

-      }

       SignatureException se = new SignatureException(we.getErrorCode(), we);

       throw se;

     }

diff --git a/src/main/java/at/knowcenter/wag/egov/egiz/sig/sigid/DetachedIdFormatter.java b/src/main/java/at/knowcenter/wag/egov/egiz/sig/sigid/DetachedIdFormatter.java
index 7e67d0d..1b24a98 100644
--- a/src/main/java/at/knowcenter/wag/egov/egiz/sig/sigid/DetachedIdFormatter.java
+++ b/src/main/java/at/knowcenter/wag/egov/egiz/sig/sigid/DetachedIdFormatter.java
@@ -40,7 +40,7 @@ public class DetachedIdFormatter implements IdFormatter
 	try {

 		SIG_ID_PREFIX = SettingsReader.getInstance().getValueFromKey(SIG_ID_PROPERTY_KEY);

 	} catch (SettingsException e) {

-		e.printStackTrace();

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

 	}

 	

     // ids algorithm:

diff --git a/src/main/java/at/knowcenter/wag/egov/egiz/sig/sigid/DetachedLocRefMOAIdFormatter.java b/src/main/java/at/knowcenter/wag/egov/egiz/sig/sigid/DetachedLocRefMOAIdFormatter.java
index 89f9503..14fb41e 100644
--- a/src/main/java/at/knowcenter/wag/egov/egiz/sig/sigid/DetachedLocRefMOAIdFormatter.java
+++ b/src/main/java/at/knowcenter/wag/egov/egiz/sig/sigid/DetachedLocRefMOAIdFormatter.java
@@ -44,7 +44,7 @@ public class DetachedLocRefMOAIdFormatter implements IdFormatter
 	  SIG_ID_PREFIX = SettingsReader.getInstance().getValueFromKey(SIG_ID_PROPERTY_KEY);

 	} catch (SettingsException e) 

 	{

-	  e.printStackTrace();

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

 	}

 	

 	

diff --git a/src/main/java/at/knowcenter/wag/egov/egiz/sig/sigkz/SigKZIDHelper.java b/src/main/java/at/knowcenter/wag/egov/egiz/sig/sigkz/SigKZIDHelper.java
index f2ec571..5206ed1 100644
--- a/src/main/java/at/knowcenter/wag/egov/egiz/sig/sigkz/SigKZIDHelper.java
+++ b/src/main/java/at/knowcenter/wag/egov/egiz/sig/sigkz/SigKZIDHelper.java
@@ -3,6 +3,9 @@
  */

 package at.knowcenter.wag.egov.egiz.sig.sigkz;

 

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

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

+

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

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

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

@@ -18,6 +21,11 @@ import at.knowcenter.wag.egov.egiz.sig.sigid.HotfixIdFormatter;
 public final class SigKZIDHelper

 {

   

+   /**

+    * The Logger.

+    */

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

+   

   public static boolean isTextual(PdfASID sig_kz)

   {

     if (sig_kz == null)

@@ -73,7 +81,7 @@ public final class SigKZIDHelper
       }

       catch (InvalidIDException e)

       {

-        e.printStackTrace();

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

       }

     }

     

@@ -124,7 +132,7 @@ public final class SigKZIDHelper
       }

       catch (InvalidIDException e)

       {

-        e.printStackTrace();

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

       }

     }