api signatureKeyIdentifier override added, brz distribution assembly for maven, mime-type argument checking in SignResult constructor fixedREL-3.0.9-20090129-rev322@329

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

1 files changed, 10 insertions, 3 deletions

diff --git a/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/moa/MOASoapWithAttachmentConnector.java b/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/moa/MOASoapWithAttachmentConnector.java
index b45303d..7776698 100644
--- a/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/moa/MOASoapWithAttachmentConnector.java
+++ b/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/moa/MOASoapWithAttachmentConnector.java
@@ -77,7 +77,7 @@ public class MOASoapWithAttachmentConnector implements Connector
   public MOASoapWithAttachmentConnector(ConnectorParameters connectorParameters) throws ConnectorException

   {

     this.params = connectorParameters;

-    this.environment = new Environment(this.params.getProfileId(), MULTIPART_LOC_REF_CONTENT);

+    this.environment = new Environment(this.params.getProfileId(), this.params.getSignatureKeyIdentifier(), MULTIPART_LOC_REF_CONTENT);

   }

 

   protected String prepareSignRequest(SignatureData data) throws ConnectorException

@@ -445,7 +445,7 @@ public class MOASoapWithAttachmentConnector implements Connector
      * @throws ConnectorException

      *           f.e.

      */

-    public Environment(String profile, String signature_data_url) throws ConnectorException

+    public Environment(String profile, String signKeyIdentifier, String signature_data_url) throws ConnectorException

     {

       this.profile = profile;

 

@@ -461,7 +461,14 @@ public class MOASoapWithAttachmentConnector implements Connector
         throw new ConnectorException(300, e);

       }

 

-      this.sign_key_identifier = getConnectorValueFromProfile(settings, profile, SIGN_KEY_IDENTIFIER_KEY);

+      if (signKeyIdentifier != null)

+      {

+        this.sign_key_identifier = signKeyIdentifier;

+      }

+      else

+      {        

+        this.sign_key_identifier = getConnectorValueFromProfile(settings, profile, SIGN_KEY_IDENTIFIER_KEY);

+      }

 

       String sign_request_filename = TEMPLATE_FILE_PREFIX + settings.getValueFromKey("default.moa.algorithm.id") + SIGN_TEMPLATE_FILE_SUFIX;