From 1ed2786b85d6f7dac5c83a1ba0474b7f33fa237c Mon Sep 17 00:00:00 2001
From: wprinz <wprinz@7b5415b0-85f9-ee4d-85bd-d5d0c3b42d1c>
Date: Thu, 29 Jan 2009 13:47:42 +0000
Subject: api signatureKeyIdentifier override added, brz distribution assembly
 for maven, mime-type argument checking in SignResult constructor fixed

git-svn-id: https://joinup.ec.europa.eu/svn/pdf-as/trunk@322 7b5415b0-85f9-ee4d-85bd-d5d0c3b42d1c
---
 src/main/java/at/gv/egiz/pdfas/impl/api/CheckHelper.java | 9 +++++++++
 src/main/java/at/gv/egiz/pdfas/impl/api/PdfAsObject.java | 3 +--
 2 files changed, 10 insertions(+), 2 deletions(-)

(limited to 'src/main/java/at/gv/egiz/pdfas/impl/api')

diff --git a/src/main/java/at/gv/egiz/pdfas/impl/api/CheckHelper.java b/src/main/java/at/gv/egiz/pdfas/impl/api/CheckHelper.java
index 9daae59..4466d8b 100644
--- a/src/main/java/at/gv/egiz/pdfas/impl/api/CheckHelper.java
+++ b/src/main/java/at/gv/egiz/pdfas/impl/api/CheckHelper.java
@@ -67,6 +67,7 @@ public final class CheckHelper
     {
       checkSignaturePositioning(sp.getSignaturePositioning());
     }
+    checkSignatureKeyIdentifier(sp.getSignatureKeyIdentifier(), sp.getSignatureDevice());
   }
 
   /**
@@ -186,6 +187,14 @@ public final class CheckHelper
       throw new IllegalArgumentException(msg);
     }
   }
+  
+  protected static void checkSignatureKeyIdentifier (String signatureKeyIdentifier, String signatureDevice)
+  {
+    if (signatureKeyIdentifier != null && !Constants.SIGNATURE_DEVICE_MOA.equals(signatureDevice))
+    {
+      log.warn("A signatureKeyIdentifier (" + signatureKeyIdentifier + ") was provided although the signatureDevice (" + signatureDevice + ") is not moa. Currently only the moa signature device evaluates the signatureKeyIdentifier parameter.");
+    }
+  }
 
   protected static void checkVerifyMode(String verifyMode)
   {
diff --git a/src/main/java/at/gv/egiz/pdfas/impl/api/PdfAsObject.java b/src/main/java/at/gv/egiz/pdfas/impl/api/PdfAsObject.java
index 40da270..46157e3 100644
--- a/src/main/java/at/gv/egiz/pdfas/impl/api/PdfAsObject.java
+++ b/src/main/java/at/gv/egiz/pdfas/impl/api/PdfAsObject.java
@@ -14,7 +14,6 @@ import java.util.Vector;
 import org.apache.commons.lang.math.NumberUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.log4j.PropertyConfigurator;
 
 import at.gv.egiz.pdfas.api.PdfAs;
 import at.gv.egiz.pdfas.api.analyze.AnalyzeParameters;
@@ -30,7 +29,6 @@ import at.gv.egiz.pdfas.api.verify.VerifyResult;
 import at.gv.egiz.pdfas.api.verify.VerifyResults;
 import at.gv.egiz.pdfas.commandline.CommandlineConnectorChooser;
 import at.gv.egiz.pdfas.exceptions.ErrorCode;
-import at.gv.egiz.pdfas.framework.ConnectorFactory;
 import at.gv.egiz.pdfas.framework.config.SettingsHelper;
 import at.gv.egiz.pdfas.framework.input.ExtractionStage;
 import at.gv.egiz.pdfas.framework.signator.SignatorInformation;
@@ -244,6 +242,7 @@ public class PdfAsObject implements PdfAs
           signatorId,
           connectorId,
           signParameters.getSignatureProfileId(),
+          signParameters.getSignatureKeyIdentifier(),
           pos
     );
 
-- 
cgit v1.2.3