- fixing bug #411

- fixed invalid verification link in configuration
- removed some needless log.info messages


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

5 files changed, 11 insertions, 10 deletions

diff --git a/src/main/java/at/knowcenter/wag/egov/egiz/pdf/BinarySignature.java b/src/main/java/at/knowcenter/wag/egov/egiz/pdf/BinarySignature.java
index ef4e1c2..8cb0d42 100644
--- a/src/main/java/at/knowcenter/wag/egov/egiz/pdf/BinarySignature.java
+++ b/src/main/java/at/knowcenter/wag/egov/egiz/pdf/BinarySignature.java
@@ -232,7 +232,7 @@ public abstract class BinarySignature
   /**

    * The number placeholder that is used to give numbers a fixed length.

    */

-  protected static final PdfNumber NUMBER_PLACEHOLDER = new PdfNumber(99999999);

+  protected static final PdfNumber NUMBER_PLACEHOLDER = new PdfNumber(999999999);

   

   /**

    * Extracts the signature text only.

diff --git a/src/main/java/at/knowcenter/wag/egov/egiz/pdf/ObjectExtractor.java b/src/main/java/at/knowcenter/wag/egov/egiz/pdf/ObjectExtractor.java
index 4516b6b..039df9c 100644
--- a/src/main/java/at/knowcenter/wag/egov/egiz/pdf/ObjectExtractor.java
+++ b/src/main/java/at/knowcenter/wag/egov/egiz/pdf/ObjectExtractor.java
@@ -31,7 +31,7 @@ public class ObjectExtractor {
     * If set <code>true</code> signature annotations are not extracted otherwise

     * all signatures except PDF-AS signatures are extracted.

     */

-   private final static boolean SKIP_SIGNATURES = true;

+   private final static boolean SKIP_NON_PDFAS_SIGNATURES = false;

 

    /**

     * Find annotation objects in pdf documents

@@ -54,9 +54,9 @@ public class ObjectExtractor {
               if (log.isTraceEnabled()) {

                  log.trace("annotation def: " + dictToString(anno.getDictionary()));

               }

-              String ft = anno.getDictionary().getNameAsString("FT");              

+              String ft = anno.getDictionary().getNameAsString("FT");

               if (ft != null && ft.equals("Sig")) {  // skip signature widgets

-                 if (SKIP_SIGNATURES) {

+                 if (SKIP_NON_PDFAS_SIGNATURES) {

                     log.debug("found signature widged, skip extraction");

                     continue;

                  } else {

@@ -66,7 +66,8 @@ public class ObjectExtractor {
                        continue;

                     }

                  }

-              }             

+              }

+

               NonTextObjectInfo objInfo = new NonTextObjectInfo();

               objInfo.setName(anno.getDictionary().getString( "NM" ));

               objInfo.setObjectType(NonTextObjectInfo.TYPE_ANNOTATION);

diff --git a/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/moa/MOASoapConnection.java b/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/moa/MOASoapConnection.java
index 38998c4..1eaa6cb 100644
--- a/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/moa/MOASoapConnection.java
+++ b/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/moa/MOASoapConnection.java
@@ -80,10 +80,10 @@ public final class MOASoapConnection
   {

     try

     {

-      if (log.isInfoEnabled())

+      if (log.isDebugEnabled())

       {

-        log.info(serviceMode);

-        log.info(endpointURL);

+        log.debug(serviceMode);

+        log.debug(endpointURL);

       }

       // Parser/DOMBuilder instanzieren

       DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();

diff --git a/src/main/resources/DefaultConfiguration.zip b/src/main/resources/DefaultConfiguration.zip
index 74aac6c..c248b9a 100644
--- a/src/main/resources/DefaultConfiguration.zip
+++ b/src/main/resources/DefaultConfiguration.zip
diff --git a/work/cfg/config.properties b/work/cfg/config.properties
index cb50888..6967454 100644
--- a/work/cfg/config.properties
+++ b/work/cfg/config.properties
@@ -464,7 +464,7 @@ sig_obj.SIGNATURBLOCK_EN.key.SIG_META=Verification
 

 sig_obj.SIGNATURBLOCK_EN.pos=f:80

 sig_obj.SIGNATURBLOCK_EN.adobeSignFieldValue=PDF-AS Signature

-sig_obj.SIGNATURBLOCK_EN.adobeSignReasonValue=Information about the verification can be found at http://signature-verification.gv.at

+sig_obj.SIGNATURBLOCK_EN.adobeSignReasonValue=Information about the verification can be found at http://www.signature-verification.gv.at

 sig_obj.SIGNATURBLOCK_EN.verifyURL=http://www.signature-verification.gv.at

 

 sig_obj.SIGNATURBLOCK_EN.value.SIG_META=Information about the verification of the electronic signature and of the printout can be found at: http://www.signature-verification.gv.at

@@ -513,7 +513,7 @@ sig_obj.SIGNATURBLOCK_EN_PDFA.key.SIG_META=Verification
 

 sig_obj.SIGNATURBLOCK_EN_PDFA.pos=f:80

 sig_obj.SIGNATURBLOCK_EN_PDFA.adobeSignFieldValue=PDF-AS Signature

-sig_obj.SIGNATURBLOCK_EN_PDFA.adobeSignReasonValue=Information about the verification can be found at http://signature-verification.gv.at

+sig_obj.SIGNATURBLOCK_EN_PDFA.adobeSignReasonValue=Information about the verification can be found at http://www.signature-verification.gv.at

 sig_obj.SIGNATURBLOCK_EN_PDFA.verifyURL=http://www.signature-verification.gv.at

 

 sig_obj.SIGNATURBLOCK_EN_PDFA.value.SIG_META=Information about the verification of the electronic signature and of the printout can be found at: http://www.signature-verification.gv.at