Detached Multipart BKU for Auftrag "Support"

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

1 files changed, 23 insertions, 8 deletions

diff --git a/src/main/java/at/knowcenter/wag/egov/egiz/framework/signators/DetachedfTextualSignator_1_0_0.java b/src/main/java/at/knowcenter/wag/egov/egiz/framework/signators/DetachedfTextualSignator_1_0_0.java
index 0de4bc4..93f10ff 100644
--- a/src/main/java/at/knowcenter/wag/egov/egiz/framework/signators/DetachedfTextualSignator_1_0_0.java
+++ b/src/main/java/at/knowcenter/wag/egov/egiz/framework/signators/DetachedfTextualSignator_1_0_0.java
@@ -26,12 +26,10 @@ import at.knowcenter.wag.egov.egiz.exceptions.PresentableException;
 import at.knowcenter.wag.egov.egiz.framework.SignResult;

 import at.knowcenter.wag.egov.egiz.framework.Signator;

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

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

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

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

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

-

-import com.lowagie.text.pdf.PdfPTable;

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

+import at.knowcenter.wag.egov.egiz.sig.connectors.bku.BKUPostConnection;

 

 /**

  * Signs a document textually.

@@ -51,12 +49,20 @@ public class DetachedfTextualSignator_1_0_0 implements Signator
 	  /**

 	   * The Mime Type.

 	   */

-	  public static final String MIME_TYPE = "text/xml";

+	  public static final String MIME_TYPE = "text/xml"; //$NON-NLS-1$

 	

   /**

    * The Pdf-AS ID of this Signator.

    */

   public static final PdfASID MY_ID = new PdfASID(SignatorFactory.VENDOR, SignatorFactory.TYPE_DETACHED_TEXTUAL, SignatorFactory.VERSION_1_0_0);

+  

+  /**

+   * @see at.knowcenter.wag.egov.egiz.framework.Signator#getMyId()

+   */

+  public PdfASID getMyId()

+  {

+    return MY_ID;

+  }

 

   /**

    * Default constructor.

@@ -83,8 +89,17 @@ public class DetachedfTextualSignator_1_0_0 implements Signator
     iui.signature_type = signature_type;

     iui.pos = pos;

 

-    iui.document_text = PdfAS.extractNormalizedTextTextual(pdf);

+    String document_text = PdfAS.extractNormalizedTextTextual(pdf);

     // logger_.debug("signed_text = " + document_text);

+    

+    try

+    {

+      iui.signature_data = new SignatureDataImpl(document_text.getBytes("UTF-8"), MIME_TYPE, "UTF-8"); //$NON-NLS-1$ //$NON-NLS-2$

+    }

+    catch (UnsupportedEncodingException e)

+    {

+      throw new RuntimeException("Very strange: UTF-8 character encoding not supported???"); //$NON-NLS-1$

+    }

 

     return iui;

   }

@@ -96,8 +111,8 @@ public class DetachedfTextualSignator_1_0_0 implements Signator
   {

 	  try

 	    {

-	      String response = iui.signed_signature_object.getRawSignatureResponse();

-	      byte[] response_bytes = response.getBytes("UTF-8");

+	      String response = iui.signed_signature_object.response_properties.getProperty(BKUPostConnection.RESPONSE_STRING_KEY);

+	      byte[] response_bytes = response.getBytes("UTF-8"); //$NON-NLS-1$

 

 	      SignResult sign_result = new SignResult(MIME_TYPE, response_bytes);

 	      return sign_result;