Necessary changes for separation of pdf-as-web and rest of the project

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

6 files changed, 753 insertions, 74 deletions

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 83a0565..d48435a 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
@@ -10,9 +10,12 @@ import at.gv.egiz.pdfas.api.analyze.AnalyzeParameters;
 import at.gv.egiz.pdfas.api.commons.Constants;

 import at.gv.egiz.pdfas.api.io.DataSource;

 import at.gv.egiz.pdfas.api.sign.SignParameters;

+import at.gv.egiz.pdfas.api.sign.SignatureDetailInformation;

 import at.gv.egiz.pdfas.api.sign.pos.SignaturePositioning;

 import at.gv.egiz.pdfas.api.verify.VerifyAfterAnalysisParameters;

 import at.gv.egiz.pdfas.api.verify.VerifyParameters;

+import at.gv.egiz.pdfas.framework.signator.SignatorInformation;

+import at.gv.egiz.pdfas.impl.api.sign.SignatureDetailInformationImpl;

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

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

 import at.knowcenter.wag.egov.egiz.sig.SignatureTypes;

@@ -44,8 +47,9 @@ public final class CheckHelper
    * 

    * @param sp

    *          The {@link SignParameters}

+   * @param allowAllDevices if true, no check for non local BKUs will be done

    */

-  public static void checkSignParameters(SignParameters sp)

+  public static void checkSignParameters(SignParameters sp, boolean allowAllDevices)

   {

     if (sp == null)

     {

@@ -58,7 +62,8 @@ public final class CheckHelper
       throw new IllegalArgumentException("The output DataSink must not be null.");

     }

     checkSignatureType(sp.getSignatureType());

-    checkSignatureDevice(sp.getSignatureDevice());

+    if (!allowAllDevices)

+       checkSignatureDevice(sp.getSignatureDevice());

     if (sp.getSignatureProfileId() != null)

     {

       checkProfileId(sp.getSignatureProfileId());

@@ -226,4 +231,23 @@ public final class CheckHelper
       throw new IllegalArgumentException("The signatureDevice must be one of the Constants.SIGNATURE_DEVICE_* constants. " + signatureDevice);

     }

   }

+

+  protected static void checkSignParametersForSignAfterPrepare(SignParameters signParameters, boolean allowAllDevices) {

+    checkSignParameters(signParameters, allowAllDevices);

+    checkProfileId(signParameters.getSignatureProfileId());

+  }

+

+  public static void checkSignatorInformation(SignatorInformation signatorInfo) {

+    if (signatorInfo.getSignSignatureObject() == null)

+    {

+       throw new IllegalArgumentException("The signatorInformation.getSignSignatureObject() must not be null.");

+    }

+  }

+

+  public static void checkSignatureDetailInformation(SignatureDetailInformation signatureDetailInformation) {

+    if (!(signatureDetailInformation instanceof SignatureDetailInformationImpl)){

+       throw new IllegalArgumentException("SignatureDetailInformation is of unsupported type. Must be " + SignatureDetailInformationImpl.class.getName());

+    }

+       

+  }

 }

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 90e7986..e630aa3 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
@@ -26,6 +26,7 @@ import at.gv.egiz.pdfas.api.commons.SignatureInformation;
 import at.gv.egiz.pdfas.api.exceptions.PdfAsException;

 import at.gv.egiz.pdfas.api.sign.SignParameters;

 import at.gv.egiz.pdfas.api.sign.SignResult;

+import at.gv.egiz.pdfas.api.sign.SignatureDetailInformation;

 import at.gv.egiz.pdfas.api.verify.VerifyAfterAnalysisParameters;

 import at.gv.egiz.pdfas.api.verify.VerifyAfterReconstructXMLDsigParameters;

 import at.gv.egiz.pdfas.api.verify.VerifyParameters;

@@ -38,10 +39,12 @@ import at.gv.egiz.pdfas.api.xmldsig.ReconstructXMLDsigResult;
 import at.gv.egiz.pdfas.api.xmldsig.XMLDsigData;

 import at.gv.egiz.pdfas.commandline.CommandlineConnectorChooser;

 import at.gv.egiz.pdfas.exceptions.ErrorCode;

+import at.gv.egiz.pdfas.framework.ConnectorParameters;

 import at.gv.egiz.pdfas.framework.DataSourceHolder;

 import at.gv.egiz.pdfas.framework.config.SettingsHelper;

 import at.gv.egiz.pdfas.framework.input.ExtractionStage;

 import at.gv.egiz.pdfas.framework.input.PdfDataSource;

+import at.gv.egiz.pdfas.framework.signator.Signator;

 import at.gv.egiz.pdfas.framework.signator.SignatorInformation;

 import at.gv.egiz.pdfas.framework.vfilter.VerificationFilterParameters;

 import at.gv.egiz.pdfas.impl.api.analyze.AnalyzeResultImpl;

@@ -52,6 +55,7 @@ import at.gv.egiz.pdfas.impl.api.commons.SignatureProfileImpl;
 import at.gv.egiz.pdfas.impl.api.commons.TextDataSourceAdapter;

 import at.gv.egiz.pdfas.impl.api.sign.ActualSignaturePositionAdapter;

 import at.gv.egiz.pdfas.impl.api.sign.SignResultImpl;

+import at.gv.egiz.pdfas.impl.api.sign.SignatureDetailInformationImpl;

 import at.gv.egiz.pdfas.impl.api.verify.VerifyResultAdapter;

 import at.gv.egiz.pdfas.impl.api.verify.VerifyResultsImpl;

 import at.gv.egiz.pdfas.impl.input.DelimitedPdfDataSource;

@@ -63,11 +67,13 @@ import at.gv.egiz.pdfas.placeholder.SignaturePlaceholderExtractor;
 import at.gv.egiz.pdfas.utils.ConfigUtils;

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

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

+import at.knowcenter.wag.egov.egiz.cfg.OverridePropertyHolder;

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

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

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

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

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

+import at.knowcenter.wag.egov.egiz.exceptions.SignatorFactoryException;

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

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

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

@@ -76,9 +82,13 @@ import at.knowcenter.wag.egov.egiz.pdf.ObjectExtractor;
 import at.knowcenter.wag.egov.egiz.pdf.SignatureHolder;

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

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

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

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

 import at.knowcenter.wag.egov.egiz.sig.SignatureResponse;

 import at.knowcenter.wag.egov.egiz.sig.SignatureTypeDefinition;

 import at.knowcenter.wag.egov.egiz.sig.SignatureTypes;

+import at.knowcenter.wag.egov.egiz.sig.connectors.Connector;

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

 

 /**

  * Implementation of the {@link PdfAs} interface.

@@ -180,6 +190,8 @@ public class PdfAsObject implements PdfAs
 

     List profileInformation = new ArrayList(profiles.size());

 

+    String default_type = settings.getValueFromKey(SignatureTypes.DEFAULT_TYPE);

+    

     Iterator it = profiles.iterator();

     while (it.hasNext())

     {

@@ -190,8 +202,9 @@ public class PdfAsObject implements PdfAs
       final String moaKeyIdentifier = settings.getSetting("sig_obj." + profileId + "." + MOA_SIGN_KEY_IDENTIFIER_KEY, defaultMoaKeyIdentifiert);

       final String profileDescription = settings.getSetting("sig_obj." + profileId + "." + SignatureTypes.SIG_DESCR, null);

 

+      boolean isDefault = (default_type != null && default_type.equals(profileId));

       // modified by tknall

-      SignatureProfileImpl signatureProfile = new SignatureProfileImpl(profileId, profileDescription, moaKeyIdentifier);

+      SignatureProfileImpl signatureProfile = new SignatureProfileImpl(profileId, profileDescription, moaKeyIdentifier, isDefault);

 

       // start - added by tknall

       

@@ -262,68 +275,13 @@ public class PdfAsObject implements PdfAs
    */

   public SignResult sign(SignParameters signParameters) throws PdfAsException

   {

-    CheckHelper.checkSignParameters(signParameters);

-    

-    signParameters.setDocument(PdfAS.applyStrictMode(signParameters.getDocument()));

-    

-    SignaturePlaceholderData spd = null;

-    SignaturePlaceholderContext.setSignaturePlaceholderData(null);

-    if (signParameters.isCheckForPlaceholder()) {

-       spd = SignaturePlaceholderExtractor.extract(signParameters.getDocument().createInputStream(), signParameters.getPlaceholderId(), signParameters.getPlaceholderMatchMode());

-       if (spd != null){

-          if (spd.getProfile() != null)

-             signParameters.setSignatureProfileId(spd.getProfile());

-          if (spd.getType() != null)

-             signParameters.setSignatureType(spd.getType());

-          if (spd.getKey() != null)

-             signParameters.setSignatureKeyIdentifier(spd.getKey());

-       }

-    }

-    CheckHelper.checkSignParameters(signParameters);

+    CheckHelper.checkSignParameters(signParameters, false);

     

-    if (signParameters.getSignatureProfileId() == null)

-    {

-      SettingsReader settings = SettingsReader.getInstance();

-      String defaultProfile = settings.getValueFromKey(SignatureTypes.DEFAULT_TYPE);

-      signParameters.setSignatureProfileId(defaultProfile);

-    }

-

-    PdfASID signatorId = null;

-    if (signParameters.getSignatureType().equals(Constants.SIGNATURE_TYPE_BINARY))

-    {

-      signatorId = SignatorFactory.MOST_RECENT_BINARY_SIGNATOR_ID;

-    }

-    if (signParameters.getSignatureType().equals(Constants.SIGNATURE_TYPE_TEXTUAL))

-    {

-      signatorId = SignatorFactory.MOST_RECENT_TEXTUAL_SIGNATOR_ID;

-    }

-    if (signParameters.getSignatureType().equals(Constants.SIGNATURE_TYPE_DETACHEDTEXTUAL))

-    {

-      signatorId = SignatorFactory.MOST_RECENT_DETACHEDTEXT_SIGNATOR_ID;

-    }

-

-    TablePos pos = null;

-    if (spd != null && spd.getTablePos() != null)

-       pos = spd.getTablePos();

-    else

-       pos = PosHelper.formTablePos(signParameters.getSignaturePositioning());

-

-    String connectorId = CommandlineConnectorChooser.chooseCommandlineConnectorForSign(signParameters.getSignatureDevice());

-

     try {

-       SignatorInformation si = PdfAS.signCommandline(

-             new PdfDataSourceAdapter(signParameters.getDocument()),

-             new DataSinkAdapter(signParameters.getOutput()),

-             signatorId,

-             connectorId,

-             signParameters.getSignatureProfileId(),

-             signParameters.getSignatureKeyIdentifier(),

-             pos,

-             signParameters.getTimeStamperImpl(),

-             signParameters.getProfileOverrideProperties()

-       );

-       return new SignResultImpl(signParameters.getOutput(), si.getSignSignatureObject().getX509Certificate(),

-             new ActualSignaturePositionAdapter(si.getActualTablePos()), si.getNonTextualObjects());

+       SignatureDetailInformation signatorInfo = prepareSign(signParameters);

+       

+       return sign(signParameters, signatorInfo);

+       

     } catch (java.lang.OutOfMemoryError e) {

        throw new OutOfMemoryException(ErrorCode.OUT_OF_MEMORY_ERROR, "Insufficient memory allocated to virtual machine. Start Java with parameters \"-Xms128m -Xmx786m -XX:MaxPermSize=256m\".", e);

     }

@@ -538,8 +496,12 @@ public class PdfAsObject implements PdfAs
     varxp.setReturnHashInputData(verifyAfterAnalysisParameters.isReturnHashInputData());

     varxp.setSignatureDevice(verifyAfterAnalysisParameters.getSignatureDevice());

     varxp.setVerificationTime(verifyAfterAnalysisParameters.getVerificationTime());

+    varxp.setVerifySignatureIndex(verifyAfterAnalysisParameters.getVerifySignatureIndex());

   }

 

+  /**

+   * @see PdfAs#reconstructXMLDSIG(ReconstructXMLDsigParameters)

+   */

   public ReconstructXMLDsigResult reconstructXMLDSIG(

       ReconstructXMLDsigParameters reconstructXMLDsigParameters)

       throws PdfAsException {

@@ -563,6 +525,9 @@ public class PdfAsObject implements PdfAs
     rxaap.setVerificationTime(reconstructXMLDsigParameters.getVerificationTime());

   }

 

+  /**

+   * @see PdfAs#reconstructXMLDSIG(ReconstructXMLDsigAfterAnalysisParameters)

+   */

   public ReconstructXMLDsigResult reconstructXMLDSIG(

       ReconstructXMLDsigAfterAnalysisParameters reconstructXMLDsigParameters)

       throws PdfAsException {

@@ -585,6 +550,9 @@ public class PdfAsObject implements PdfAs
     return new ReconstructXMLDsigResult().setExtendedSignatures(extendedSignatureInfos);

   }

 

+  /**

+   * @see PdfAs#verify(VerifyAfterReconstructXMLDsigParameters)

+   */

   public VerifyResults verify(

       VerifyAfterReconstructXMLDsigParameters verifyAfterReconstructXMLDsigParameters)

       throws PdfAsException {

@@ -594,22 +562,33 @@ public class PdfAsObject implements PdfAs
         List results = PdfAS.verifyExtendedSignatureHolders(extSignatures, 

               verifyAfterReconstructXMLDsigParameters.getSignatureDevice(), 

               verifyAfterReconstructXMLDsigParameters.isReturnHashInputData(), 

-              verifyAfterReconstructXMLDsigParameters.getVerificationTime());

+              verifyAfterReconstructXMLDsigParameters.getVerificationTime(), verifyAfterReconstructXMLDsigParameters.getVerifySignatureIndex());

         

         List vrs = new ArrayList(results.size());

         

-        assert extSignatures.size() == results.size() : "Not all signatures were verified.";

-    

-        for (int i = 0; i < extSignatures.size(); i++)

+        int verifySignatureIndex = verifyAfterReconstructXMLDsigParameters.getVerifySignatureIndex();

+        if (verifySignatureIndex < 0)

         {

-          SignatureResponse response = (SignatureResponse) results.get(i);

-          ExtendedSignatureInformation extSigInfo = (ExtendedSignatureInformation)extSignatures.get(i);

-          SignatureHolder holder = (SignatureHolder) extSigInfo.getSignatureInformation().getInternalSignatureInformation();

+          for (int i = 0; i < extSignatures.size(); i++)

+          {

+            SignatureResponse response = (SignatureResponse) results.get(i);

+            ExtendedSignatureInformation extSigInfo = (ExtendedSignatureInformation)extSignatures.get(i);

+            SignatureHolder holder = (SignatureHolder) extSigInfo.getSignatureInformation().getInternalSignatureInformation();

     

-          VerifyResult vr = new VerifyResultAdapter(response, holder, verifyAfterReconstructXMLDsigParameters.getVerificationTime());

-          vr.setNonTextualObjects( extSigInfo.getSignatureInformation().getNonTextualObjects());

+            VerifyResult vr = new VerifyResultAdapter(response, holder, verifyAfterReconstructXMLDsigParameters.getVerificationTime());

+            vr.setNonTextualObjects( extSigInfo.getSignatureInformation().getNonTextualObjects());

     

-          vrs.add(vr);

+            vrs.add(vr);

+          }

+        }else{

+           SignatureResponse response = (SignatureResponse) results.get(0);

+           ExtendedSignatureInformation extSigInfo = (ExtendedSignatureInformation)extSignatures.get(verifySignatureIndex);

+           SignatureHolder holder = (SignatureHolder) extSigInfo.getSignatureInformation().getInternalSignatureInformation();

+   

+           VerifyResult vr = new VerifyResultAdapter(response, holder, verifyAfterReconstructXMLDsigParameters.getVerificationTime());

+           vr.setNonTextualObjects( extSigInfo.getSignatureInformation().getNonTextualObjects());

+   

+           vrs.add(vr);

         }

         

         VerifyResultsImpl verifyResults = new VerifyResultsImpl(vrs); 

@@ -640,6 +619,136 @@ public class PdfAsObject implements PdfAs
          DynamicSignatureLifetimeEnum mode) {

       return DynamicSignatureProfileImpl.createEmptyProfile(myUniqueName, mode);     

    }

+

+   /**

+    * @see PdfAs#prepareSign(SignParameters)

+    */

+   public SignatureDetailInformation prepareSign(SignParameters signParameters) throws PdfAsException {

+      try{

+         CheckHelper.checkSignParameters(signParameters, true);

+         

+         if (signParameters.getProfileOverrideProperties() != null) {

+            OverridePropertyHolder.setOverrideProps(signParameters.getProfileOverrideProperties());

+         }

    

+         signParameters.setDocument(PdfAS.applyStrictMode(signParameters.getDocument()));

+         

+         SignaturePlaceholderData spd = null;

+         SignaturePlaceholderContext.setSignaturePlaceholderData(null);

+         if (signParameters.isCheckForPlaceholder()) {

+            spd = SignaturePlaceholderExtractor.extract(signParameters.getDocument().createInputStream(), signParameters.getPlaceholderId(), signParameters.getPlaceholderMatchMode());

+            if (spd != null){

+               if (spd.getProfile() != null)

+                  signParameters.setSignatureProfileId(spd.getProfile());

+               if (spd.getType() != null)

+                  signParameters.setSignatureType(spd.getType());

+               if (spd.getKey() != null)

+                  signParameters.setSignatureKeyIdentifier(spd.getKey());

+            }

+         }

+         CheckHelper.checkSignParameters(signParameters, true);

+         

+         if (signParameters.getSignatureProfileId() == null)

+         {

+           SettingsReader settings = SettingsReader.getInstance();

+           String defaultProfile = settings.getValueFromKey(SignatureTypes.DEFAULT_TYPE);

+           signParameters.setSignatureProfileId(defaultProfile);

+         }

+   

+         TablePos pos = null;

+         if (spd != null && spd.getTablePos() != null)

+            pos = spd.getTablePos();

+         else

+            pos = PosHelper.formTablePos(signParameters.getSignaturePositioning());

+         

+         Signator signator = createSignator(signParameters.getSignatureType());

+   

+         SignatorInformation signatorInfo = signator.prepareSign(

+               new PdfDataSourceAdapter(signParameters.getDocument()), 

+               signParameters.getSignatureProfileId(), 

+               pos, 

+               signParameters.getTimeStamperImpl());

+         

+         SignatureDetailInformationImpl ret = new SignatureDetailInformationImpl();

+         ret.setSignatorInformation(signatorInfo);

+         return ret;

+      } finally {

+         OverridePropertyHolder.removeProperties();

+         DynamicSignatureProfileImpl.disposeLocalProfile();

+      }

+

+   }

+   

+   private Signator createSignator(String signatureType) throws SignatorFactoryException {

+      PdfASID signatorId = null;

+      if (signatureType.equals(Constants.SIGNATURE_TYPE_BINARY))

+      {

+        signatorId = SignatorFactory.MOST_RECENT_BINARY_SIGNATOR_ID;

+      }

+      if (signatureType.equals(Constants.SIGNATURE_TYPE_TEXTUAL))

+      {

+        signatorId = SignatorFactory.MOST_RECENT_TEXTUAL_SIGNATOR_ID;

+      }

+      if (signatureType.equals(Constants.SIGNATURE_TYPE_DETACHEDTEXTUAL))

+      {

+        signatorId = SignatorFactory.MOST_RECENT_DETACHEDTEXT_SIGNATOR_ID;

+      }

+      

+      return at.gv.egiz.pdfas.framework.SignatorFactory.createSignator(signatorId);

+

+   }

+

+   public SignResult sign(SignParameters signParameters, SignatureDetailInformation signatorInfo)

+         throws PdfAsException {

+      try {

+         CheckHelper.checkSignParametersForSignAfterPrepare(signParameters, false);

+         

+         if (signParameters.getProfileOverrideProperties() != null) {

+            OverridePropertyHolder.setOverrideProps(signParameters.getProfileOverrideProperties());

+         }

+

+         String connectorId = CommandlineConnectorChooser.chooseCommandlineConnectorForSign(signParameters.getSignatureDevice());

+

+         ConnectorParameters cp = new ConnectorParameters();

+         cp.setProfileId(signParameters.getSignatureProfileId());

+         cp.setSignatureKeyIdentifier(signParameters.getSignatureKeyIdentifier());

+         Connector c = at.gv.egiz.pdfas.framework.ConnectorFactory.createConnector(connectorId, cp);

+

+         SignatureData sd = new SignatureDataImpl(new PdfDataSourceAdapter(signatorInfo.getSignatureData()), signatorInfo.getSignatureData().getMimeType());

+         SignSignatureObject sso = PdfAS.sign(sd, c, signParameters.getTimeStamperImpl());

+         ((SignatureDetailInformationImpl)signatorInfo).setSignSignatureObject(sso);

+         

+         return finishSign(signParameters, signatorInfo);

+      } finally {

+         OverridePropertyHolder.removeProperties();

+         DynamicSignatureProfileImpl.disposeLocalProfile();

+      }

+   }

+

+   public SignResult finishSign(SignParameters signParameters, SignatureDetailInformation signatureDetailInformation) 

+         throws PdfAsException {

+      try {

+         CheckHelper.checkSignParametersForSignAfterPrepare(signParameters, true);

+         CheckHelper.checkSignatureDetailInformation(signatureDetailInformation);

+         

+         if (signParameters.getProfileOverrideProperties() != null) {

+            OverridePropertyHolder.setOverrideProps(signParameters.getProfileOverrideProperties());

+         }

+   

+         Signator signator = createSignator(signParameters.getSignatureType());

+

+         SignatorInformation signatorInfo = ((SignatureDetailInformationImpl)signatureDetailInformation).getSignatorInfo();

+         signator.finishSign(signatorInfo, new DataSinkAdapter(signParameters.getOutput()));

+

+         return new SignResultImpl(

+               signParameters.getOutput(), 

+               signatorInfo.getSignSignatureObject().getX509Certificate(),

+               new ActualSignaturePositionAdapter(signatorInfo.getActualTablePos()), 

+               signatorInfo.getNonTextualObjects());

+      } finally {

+         OverridePropertyHolder.removeProperties();

+         DynamicSignatureProfileImpl.disposeLocalProfile();

+      }

+   }

      

 }

diff --git a/src/main/java/at/gv/egiz/pdfas/impl/api/commons/SignatureProfileImpl.java b/src/main/java/at/gv/egiz/pdfas/impl/api/commons/SignatureProfileImpl.java
index 90e2ca0..b825c82 100644
--- a/src/main/java/at/gv/egiz/pdfas/impl/api/commons/SignatureProfileImpl.java
+++ b/src/main/java/at/gv/egiz/pdfas/impl/api/commons/SignatureProfileImpl.java
@@ -36,6 +36,11 @@ public class SignatureProfileImpl implements SignatureProfile {
     * Short description of the profile.

     */

    protected String profileDescription;

+   

+   /**

+    * true if this is the default profile, false otherwise.

+    */

+   protected boolean defaultProfile = false;

 

    /**

     * Constructor.

@@ -60,12 +65,14 @@ public class SignatureProfileImpl implements SignatureProfile {
     *           The profile description.

     * @param moaKeyIdentifier

     *           The MOA key identifier of this profile.

+    * @param isDefault 

     */

-   public SignatureProfileImpl(String profileId, String profileDescription, String moaKeyIdentifier) {

+   public SignatureProfileImpl(String profileId, String profileDescription, String moaKeyIdentifier, boolean isDefault) {

       this.profileId = profileId;

       this.moaKeyIdentifier = moaKeyIdentifier;

       this.profileDescription = profileDescription;

       this.signatureBlockEntries = new Properties();

+      this.defaultProfile = isDefault;

    }

 

    /**

@@ -121,4 +128,11 @@ public class SignatureProfileImpl implements SignatureProfile {
          .toString();

    }

 

+   /**

+    * 

+    */

+   public boolean isDefault() {

+      return this.defaultProfile;

+   }

+

 }

diff --git a/src/main/java/at/gv/egiz/pdfas/impl/api/commons/TextBasedDataSourceApiAdapter.java b/src/main/java/at/gv/egiz/pdfas/impl/api/commons/TextBasedDataSourceApiAdapter.java
new file mode 100644
index 0000000..5363c42
--- /dev/null
+++ b/src/main/java/at/gv/egiz/pdfas/impl/api/commons/TextBasedDataSourceApiAdapter.java
@@ -0,0 +1,72 @@
+/**

+ * 

+ */

+package at.gv.egiz.pdfas.impl.api.commons;

+

+import java.io.InputStream;

+

+import at.gv.egiz.pdfas.api.io.TextBased;

+import at.gv.egiz.pdfas.framework.input.TextDataSource;

+

+/**

+ * Adapter that converts a framework DataSource to an API PdfDataSource.

+ * 

+ * @author wprinz

+ */

+public class TextBasedDataSourceApiAdapter implements at.gv.egiz.pdfas.api.io.DataSource, TextBased

+{

+  /**

+   * The framework DataSource to be adapted to an API DataSource.

+   */

+  protected TextDataSource frameworkDataSource = null;

+

+  /**

+   * Constructor.

+   * 

+   * @param frameworkDataSource

+   *          The framework DataSource to be adapted to an API DataSource.

+   */

+  public TextBasedDataSourceApiAdapter(TextDataSource frameworkDataSource)

+  {

+    this.frameworkDataSource = frameworkDataSource;

+  }

+

+  /**

+   * @see at.gv.egiz.pdfas.api.io.DataSource#createInputStream()

+   */

+  public InputStream createInputStream()

+  {

+    return this.frameworkDataSource.createInputStream();

+  }

+

+  /**

+   * @see at.gv.egiz.pdfas.api.io.DataSource#getAsByteArray()

+   */

+  public byte[] getAsByteArray()

+  {

+    return this.frameworkDataSource.getAsByteArray();

+  }

+

+  /**

+   * @see at.gv.egiz.pdfas.api.io.DataSource#getLength()

+   */

+  public int getLength()

+  {

+    return this.frameworkDataSource.getLength();

+  }

+

+  public String getCharacterEncoding()

+  {

+    return "UTF-8";

+  }

+

+  public String getMimeType()

+  {

+    return "text/plain";

+  }

+

+  public String getText() {

+    return this.frameworkDataSource.getText();

+  }

+

+}

diff --git a/src/main/java/at/gv/egiz/pdfas/impl/api/internal/PdfAsInternalObject.java b/src/main/java/at/gv/egiz/pdfas/impl/api/internal/PdfAsInternalObject.java
new file mode 100644
index 0000000..c457bd3
--- /dev/null
+++ b/src/main/java/at/gv/egiz/pdfas/impl/api/internal/PdfAsInternalObject.java
@@ -0,0 +1,293 @@
+package at.gv.egiz.pdfas.impl.api.internal;

+

+import java.util.HashMap;

+import java.util.Iterator;

+import java.util.List;

+import java.util.Map;

+import java.util.Properties;

+import java.util.Vector;

+

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

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

+

+import at.gv.egiz.pdfas.api.PdfAs;

+import at.gv.egiz.pdfas.api.analyze.AnalyzeResult;

+import at.gv.egiz.pdfas.api.commons.Constants;

+import at.gv.egiz.pdfas.api.commons.SignatureInformation;

+import at.gv.egiz.pdfas.api.exceptions.PdfAsException;

+import at.gv.egiz.pdfas.api.internal.LocalBKUParams;

+import at.gv.egiz.pdfas.api.internal.PdfAsInternal;

+import at.gv.egiz.pdfas.api.internal.SignatureEntry;

+import at.gv.egiz.pdfas.api.sign.SignParameters;

+import at.gv.egiz.pdfas.api.sign.SignResult;

+import at.gv.egiz.pdfas.api.sign.SignatureDetailInformation;

+import at.gv.egiz.pdfas.api.verify.VerifyResult;

+import at.gv.egiz.pdfas.exceptions.ErrorCode;

+import at.gv.egiz.pdfas.framework.ConnectorParameters;

+import at.gv.egiz.pdfas.framework.input.TextDataSource;

+import at.gv.egiz.pdfas.impl.api.CheckHelper;

+import at.gv.egiz.pdfas.impl.api.analyze.AnalyzeResultImpl;

+import at.gv.egiz.pdfas.impl.api.commons.PdfDataSourceAdapter;

+import at.gv.egiz.pdfas.impl.api.commons.SignatureInformationAdapter;

+import at.gv.egiz.pdfas.impl.api.sign.SignatureDetailInformationImpl;

+import at.gv.egiz.pdfas.impl.api.verify.VerifyResultAdapter;

+import at.gv.egiz.pdfas.impl.input.TextDataSourceImpl;

+import at.knowcenter.wag.egov.egiz.PdfAS;

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

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

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

+import at.knowcenter.wag.egov.egiz.exceptions.ConnectorFactoryException;

+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.pdf.SignatureHolder;

+import at.knowcenter.wag.egov.egiz.pdf.TextualSignatureHolder;

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

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

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

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

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

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

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

+import at.knowcenter.wag.egov.egiz.sig.connectors.LocalConnector;

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

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

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

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

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

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

+import at.knowcenter.wag.egov.egiz.sig.connectors.mocca.LocRefDetachedMOCCAConnector;

+import at.knowcenter.wag.egov.egiz.sig.sigid.HotfixIdFormatter;

+import at.knowcenter.wag.egov.egiz.sig.signaturelayout.SignatureLayoutHandlerFactory;

+import at.knowcenter.wag.egov.egiz.sig.signatureobject.SignatureObjectHelper;

+

+/**

+ * 

+ * @author mmocnik

+ *

+ */

+public class PdfAsInternalObject implements PdfAsInternal {

+   /**

+    * The log.

+    */

+   private static Log log = LogFactory.getLog(CheckHelper.class);

+

+   public void verifyBKUSupport(LocalBKUParams bkuParams) throws ConnectorException, SettingsException {

+    String bkuIdentifier = BKUHelper.getBKUIdentifier(bkuParams);

+    SignatureLayoutHandlerFactory.verifyBKUSupport(bkuIdentifier);

+   }

+

+   public SignResult finishLocalSign(PdfAs pdfAs, SignParameters signParameters, SignatureDetailInformation sdi, LocalBKUParams bkuParams, String xmlResponse) throws PdfAsException {

+      LocalConnector c = chooseLocalConnectorForSign(signParameters.getSignatureDevice(), signParameters.getSignatureProfileId(), "not needed");

+      SignSignatureObject sso = c.analyzeSignResponse(buildResponseProperties(bkuParams, xmlResponse));

+      ((SignatureDetailInformationImpl)sdi).setSignSignatureObject(sso);

+      

+      return pdfAs.finishSign(signParameters, sdi);

+   }

+   

+   private Properties buildResponseProperties(LocalBKUParams bkuParams, String xmlResponse) {

+      Properties ret = new Properties();

+      if (bkuParams.getServer() != null)

+         ret.setProperty(BKUPostConnection.BKU_SERVER_HEADER_KEY, bkuParams.getServer());

+      if (bkuParams.getUserAgent() != null)

+         ret.setProperty(BKUPostConnection.BKU_USER_AGENT_HEADER_KEY, bkuParams.getUserAgent());

+      if (bkuParams.getSignatureLayout() != null)

+         ret.setProperty(BKUPostConnection.BKU_SIGNATURE_LAYOUT_HEADER_KEY, bkuParams.getSignatureLayout());

+      ret.setProperty(BKUPostConnection.RESPONSE_STRING_KEY, xmlResponse);

+      return ret;

+   }

+

+   private LocalConnector chooseLocalConnectorForSign(String connector, String profile, String loc_ref_url) throws ConnectorException{

+      ConnectorParameters cp = new ConnectorParameters();

+      cp.setProfileId(profile);

+

+      if (Constants.SIGNATURE_DEVICE_MOC.equals(connector)) {

+      

+         return new LocRefDetachedMOCCAConnector(cp, loc_ref_url);

+         

+      } else if (Constants.SIGNATURE_DEVICE_BKU.equals(connector)){

+      

+         return new LocRefDetachedBKUConnector(cp, loc_ref_url);

+         

+      }

+      

+      log.error("Currently only the BKU connector is fully implemented.");

+      return new LocRefDetachedBKUConnector(cp, loc_ref_url);

+   }

+   

+   private LocalConnector chooseLocalConnectorForVerify(String connector,

+         PdfASID sig_kz, String sig_id, String profile, String loc_ref_url) throws ConnectorException

+     {

+      log.debug("Choosing LocalConnector for verification...");

+

+      log.debug("connector type = " + connector);

+      log.debug("sig_kz = " + sig_kz);

+      log.debug("sig_id = " + sig_id);

+

+      if (!connector.equals("bku"))

+      {

+        log.error("Currently only the BKU connector is fully implemented.");

+      }

+

+      if (sig_kz == null)

+      {

+        log.debug("sig_kz is null -> must be old signature -> choosing old Base64 connector.");

+

+        return new OldEnvelopingBase64BKUConnector(profile);

+      }

+

+      log.debug("sig_kz is not null -> must be one of the newer ... base64, base64 hotfix, or detached");

+

+      if (sig_kz.getVersion().equals(SignatorFactory.VERSION_1_0_0))

+      {

+        log.debug("sig_kz version is 1.0.0 -> choosing base64 (old or hotfix)");

+

+        if (sig_id == null)

+        {

+          log.debug("sig_id is null, which means that it is a MOA signature -> choose a hotfix base64 connector (thus it is moa - it doesn't matter).");

+

+          return new EnvelopedBase64BKUConnector(profile);

+        }

+

+        String[] sig_id_parts = sig_id.split("@");

+        if (sig_id_parts.length == 2)

+        {

+          log.debug("sig_id has 2 @-separated parts -> choosing old base64 connector");

+

+          return new OldEnvelopingBase64BKUConnector(profile);

+        }

+        if (sig_id_parts[0].equals(HotfixIdFormatter.SIG_ID_PREFIX))

+        {

+          log.debug("sig_id prefix is hotfix -> choosing hotfix base64 connector");

+

+          return new EnvelopedBase64BKUConnector(profile);

+        }

+

+        throw new ConnectorException(300, "The SIG_KZ version is 1.0.0, but SIG_ID is neither MOA nor Old base64 nor Hotfix base64 ???'");

+      }

+      if (sig_kz.getVersion().equals(SignatorFactory.VERSION_1_1_0) || sig_kz.getVersion().equals(SignatorFactory.VERSION_1_2_0))

+      {

+        log.debug("sig_kz version is 1.1.0/1.2.0 -> choosing detached (loc ref) connector.");

+

+        ConnectorParameters cp = new ConnectorParameters();

+        cp.setProfileId(profile);

+        return new LocRefDetachedBKUConnector(cp, loc_ref_url);

+      }

+

+      throw new ConnectorException(ErrorCode.UNSUPPORTED_SIGNATURE, "The SIG_KZ version '" + sig_kz.getVersion() + "' is unknown.");

+   }

+

+

+   public String getLocalServiceAddress(String profile, String device) throws SettingsException {

+      SettingsReader settings = SettingsReader.getInstance();

+

+      String key = device + ".sign.url";

+      String value = settings.getValueFromKey("sig_obj." + profile + "." + key); //$NON-NLS-1$//$NON-NLS-2$

+      if (value == null)

+      {

+        value = settings.getValueFromKey(key);

+      }

+      return value;

+   }

+

+   public String prepareLocalSignRequest(SignParameters signParameters, String loc_ref_url,

+         SignatureDetailInformation sdi) throws ConnectorException {

+      LocalConnector c = chooseLocalConnectorForSign(signParameters.getSignatureDevice(), signParameters.getSignatureProfileId(), loc_ref_url);

+      SignatureData sd = new SignatureDataImpl(new PdfDataSourceAdapter(sdi.getSignatureData()), sdi.getSignatureData().getMimeType(), sdi.getSignatureData().getCharacterEncoding());

+      String sign_request = c.prepareSignRequest(sd);

+      return sign_request;

+   }

+

+   public AnalyzeResult analyzeFromRawText(String rawText, Map sigValues) throws SignatureException, SettingsException, SignatureTypesException, NormalizeException {

+     String normalizedText = PdfAS.normalizeText(rawText);

+

+      SignatureObject signature_object = new SignatureObject();

+

+      String default_type = SettingsReader.getInstance().getValueFromKey(SignatureTypes.DEFAULT_TYPE);

+      signature_object.setSigType(default_type);

+      signature_object.initByType();

+      

+      Iterator sigKeys = sigValues.keySet().iterator();

+      while (sigKeys.hasNext()){

+         String key = (String)sigKeys.next();

+         signature_object.setSigValue(key, (String)sigValues.get(key));

+      }

+

+      TextDataSource tds = new TextDataSourceImpl(normalizedText);

+      SignatureHolder new_holder = new TextualSignatureHolder(tds, signature_object);

+      

+      SignatureInformation si = new SignatureInformationAdapter(new_holder);

+      List signatures = new Vector();

+      signatures.add(si);

+      AnalyzeResult ret = new AnalyzeResultImpl(signatures);

+      return ret;

+   }

+

+   public String prepareLocalVerifyRequest(SignatureInformation sigInfo, String connector, String profile, String loc_ref_url) throws SignatureException, ConnectorException {

+

+      SignatureHolder holder = (SignatureHolder)sigInfo.getInternalSignatureInformation();

+      SignatureObject s = holder.getSignatureObject();

+

+      SignatureData sd = PdfAS.convertSignatureHolderToSignatureData(holder);

+

+      SignSignatureObject so = SignatureObjectHelper.convertSignatureObjectToSignSignatureObject(s);

+

+      LocalConnector local_conn = chooseLocalConnectorForVerify(connector, s.getKZ(), so.id, profile, loc_ref_url);

+

+      String request_string = local_conn.prepareVerifyRequest(sd, so, null);

+      return request_string;

+   }

+

+   public VerifyResult finishLocalVerify(SignatureInformation sigInfo, String connector, String profile, String loc_ref_url, String xmlResponse) throws SignatureException, ConnectorException {

+      SignatureHolder holder = (SignatureHolder)sigInfo.getInternalSignatureInformation();

+      SignatureObject s = holder.getSignatureObject();

+

+      SignSignatureObject so = SignatureObjectHelper.convertSignatureObjectToSignSignatureObject(s);

+

+      LocalConnector local_conn = chooseLocalConnectorForVerify(connector, s.getKZ(), so.id, profile, loc_ref_url);

+      

+      Properties props = new Properties();

+      props.setProperty(BKUPostConnection.RESPONSE_STRING_KEY, xmlResponse);

+      SignatureResponse sigResponse = local_conn.analyzeVerifyResponse(props);

+      return new VerifyResultAdapter(sigResponse, holder, null);

+   }

+

+  public SignatureEntry getSignatureEntryFromSignatureInformation(String key,

+    SignatureInformation sigInfo) {

+

+    SignatureHolder holder = (SignatureHolder)sigInfo.getInternalSignatureInformation();

+    SignatureObject s = holder.getSignatureObject();

+    at.knowcenter.wag.egov.egiz.sig.SignatureEntry internalEntry = s.getSigEntry(key);

+    if (internalEntry == null)

+      return null;

+    SignatureEntry ret = new SignatureEntry(key);

+    ret.setCaption(internalEntry.getCaption());

+    ret.setValue(internalEntry.getValue());

+    return ret;

+  }

+

+  public String getSignedText(SignatureInformation sigInfo) {

+    SignatureHolder holder = (SignatureHolder)sigInfo.getInternalSignatureInformation();

+    if (holder instanceof TextualSignatureHolder)

+      return ((TextualSignatureHolder)holder).getSignedText();

+    return null;

+  }

+

+  public Map getConnectorsAvailableForWeb() throws ConnectorFactoryException {

+    ConnectorInformation ci[] = ConnectorFactory.getConnectorInformationArray();

+

+    Map ret = new HashMap();

+    for (int i = 0; i < ci.length; i++)

+    {

+      String id = ci[i].getIdentifier();

+      if (ConnectorFactory.isAvailableForWeb(id))

+      {

+        ret.put(id, ci[i].getDescription());

+      }

+    }

+    return ret;

+  }

+

+}

diff --git a/src/main/java/at/gv/egiz/pdfas/impl/api/sign/SignatureDetailInformationImpl.java b/src/main/java/at/gv/egiz/pdfas/impl/api/sign/SignatureDetailInformationImpl.java
new file mode 100644
index 0000000..d893411
--- /dev/null
+++ b/src/main/java/at/gv/egiz/pdfas/impl/api/sign/SignatureDetailInformationImpl.java
@@ -0,0 +1,167 @@
+package at.gv.egiz.pdfas.impl.api.sign;

+

+import java.security.cert.X509Certificate;

+import java.util.Date;

+import java.util.List;

+import java.util.Map;

+import java.util.Properties;

+

+import at.gv.egiz.pdfas.api.io.DataSource;

+import at.gv.egiz.pdfas.api.sign.SignatureDetailInformation;

+import at.gv.egiz.pdfas.api.sign.pos.SignaturePosition;

+import at.gv.egiz.pdfas.framework.input.TextDataSource;

+import at.gv.egiz.pdfas.framework.signator.SignatorInformation;

+import at.gv.egiz.pdfas.impl.api.commons.DataSourceApiAdapter;

+import at.gv.egiz.pdfas.impl.api.commons.TextBasedDataSourceApiAdapter;

+import at.knowcenter.wag.egov.egiz.pdf.EGIZDate;

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

+

+/**

+ * 

+ * @author exthex

+ *

+ */

+public class SignatureDetailInformationImpl implements SignatureDetailInformation {

+

+   private DataSource signatureData;

+   private SignaturePosition signaturePosition;

+   private List nonTextualObjects;

+   private String dateString;

+   private Date signDate;

+   private String issuer;

+   private Map issuerDNMap;

+   private String name;

+   private String serialNumber;

+   private String sigAlgorithm;

+   private String sigID;

+   private String sigKZ;

+   private String signatureValue;

+   private String sigTimeStamp;

+   private Map subjectDNMap;

+   private X509Certificate x509Certificate;

+   private boolean textual;

+   private Properties responseProperties;

+   private SignatorInformation signatorInfo;

+   

+   public DataSource getSignatureData() {

+      return this.signatureData;

+   }

+

+   public SignaturePosition getSignaturePosition() {

+      return this.signaturePosition;

+   }

+

+   public List getNonTextualObjects() {

+      return this.nonTextualObjects;

+   }

+

+   public Date getSignDate() {

+      return this.signDate;

+   }

+

+   public String getIssuer() {

+      return this.issuer;

+   }

+

+   public Map getIssuerDNMap() {

+      return this.issuerDNMap;

+   }

+

+   public String getSubjectName() {

+      return this.name;

+   }

+

+   public String getSerialNumber() {

+      return this.serialNumber;

+   }

+

+   public String getSigAlgorithm() {

+      return this.sigAlgorithm;

+   }

+

+   public String getSigID() {

+      return this.sigID;

+   }

+

+   public String getSigKZ() {

+      return this.sigKZ;

+   }

+

+   public String getSignatureValue() {

+      return this.signatureValue;

+   }

+

+   public String getSigTimeStamp() {

+      return this.sigTimeStamp;

+   }

+

+   public Map getSubjectDNMap() {

+      return this.subjectDNMap;

+   }

+

+   public X509Certificate getX509Certificate() {

+      return this.x509Certificate;

+   }

+

+   public boolean isTextual() {

+      return textual;

+   }

+

+   public boolean isBinary() {

+      return !textual;

+   }

+

+   public void setSignSignatureObject(SignSignatureObject sso) {

+     this.dateString = sso.getDate();

+     if (this.dateString != null){

+        this.signDate = EGIZDate.parseDateFromString(this.dateString);

+     }

+     this.issuer = sso.getIssuer();

+     this.issuerDNMap = sso.getIssuerDNMap();

+     this.name = sso.getName(); //extracted from x509Certificate

+     this.serialNumber = sso.getSerialNumber(); //extracted from x509Certificate

+     this.sigAlgorithm = sso.getSigAlgorithm();

+     this.sigID = sso.getSigID();

+     this.sigKZ = sso.getSigKZ();

+     this.signatureValue = sso.getSignatureValue();

+     this.sigTimeStamp = sso.getSigTimeStamp();

+     this.subjectDNMap = sso.getSubjectDNMap();

+     this.x509Certificate = sso.getX509Certificate();

+     this.responseProperties = sso.response_properties;

+     if (this.signatorInfo != null){

+       this.signatorInfo.setSignSignatureObject(sso);

+     }

+   }

+

+   public SignSignatureObject getSignSignatureObject() {

+      SignSignatureObject ret = new SignSignatureObject();

+      ret.date = this.dateString;

+      ret.id = this.sigID;

+      ret.issuer = this.issuer;

+      ret.issuerDNMap = this.issuerDNMap;

+      ret.kz = this.sigKZ;

+      ret.response_properties = this.responseProperties;

+      ret.sigAlgorithm = this.sigAlgorithm;

+      ret.signatureValue = this.signatureValue;

+      ret.sigTimeStamp = this.sigTimeStamp;

+      ret.subjectDNMap = this.subjectDNMap;

+      ret.x509Certificate = this.x509Certificate;

+      

+      return ret;

+   }

+

+   public SignatorInformation getSignatorInfo() {

+      return this.signatorInfo;

+   }

+   

+   public void setSignatorInformation(SignatorInformation signatorInformation){

+      this.signatorInfo = signatorInformation;

+      this.signaturePosition = new ActualSignaturePositionAdapter(signatorInformation.getActualTablePos());

+      this.nonTextualObjects = signatorInformation.getNonTextualObjects();

+      at.gv.egiz.pdfas.framework.input.DataSource dataSource = signatorInformation.getSignatureData().getDataSource();

+      if (dataSource instanceof TextDataSource)

+        this.signatureData = new TextBasedDataSourceApiAdapter((TextDataSource)dataSource);

+      else

+        this.signatureData = new DataSourceApiAdapter(dataSource);

+   }

+}