6 files changed, 669 insertions, 531 deletions
diff --git a/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/xmldsig/ExtendedSignatureInformation.java b/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/xmldsig/ExtendedSignatureInformation.java
index df12b529..f2cd3598 100644
--- a/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/xmldsig/ExtendedSignatureInformation.java
+++ b/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/xmldsig/ExtendedSignatureInformation.java
@@ -1,69 +1,92 @@
-/**
- * <copyright> Copyright 2006 by Know-Center, Graz, Austria </copyright>
- * PDF-AS has been contracted by the E-Government Innovation Center EGIZ, a
- * joint initiative of the Federal Chancellery Austria and Graz University of
- * Technology.
- *
- * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by
- * the European Commission - subsequent versions of the EUPL (the "Licence");
- * You may not use this work except in compliance with the Licence.
- * You may obtain a copy of the Licence at:
- * http://www.osor.eu/eupl/
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the Licence is distributed on an "AS IS" basis,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the Licence for the specific language governing permissions and
- * limitations under the Licence.
- *
- * This product combines work with different licenses. See the "NOTICE" text
- * file for details on the various modules and licenses.
- * The "NOTICE" text file is part of the distribution. Any derivative works
- * that you distribute must include a readable copy of the "NOTICE" text file.
- */
-package at.gv.egiz.pdfas.api.xmldsig;
-
-import at.gv.egiz.pdfas.api.commons.SignatureInformation;
-
-/**
- * A wrapper to combine {@link SignatureInformation} and {@link XMLDsigData}
- * 
- * @author exthex
- *
- */
-public class ExtendedSignatureInformation {
-
-   private final SignatureInformation signatureInformation;
-   
-   private final XMLDsigData xmlDsigData;
-   
-   /**
-    * Constructor.
-    * 
-    * @param siginfo
-    *          The signature information
-    * @param dsigData
-    *          The matching xmldsig to the signature information.
-    */
-   public ExtendedSignatureInformation(SignatureInformation siginfo, XMLDsigData dsigData) {
-      this.signatureInformation = siginfo;
-      this.xmlDsigData = dsigData;
-   }
-
-   /**
-    * 
-    * @return the signatureInformation
-    */
-   public SignatureInformation getSignatureInformation() {
-      return signatureInformation;
-   }
-
-   /**
-    * 
-    * @return the xmlDsigData
-    */
-   public XMLDsigData getXmlDsigData() {
-      return xmlDsigData;
-   }
-   
-}
+/*******************************************************************************
+ * <copyright> Copyright 2014 by E-Government Innovation Center EGIZ, Graz, Austria </copyright>
+ * PDF-AS has been contracted by the E-Government Innovation Center EGIZ, a
+ * joint initiative of the Federal Chancellery Austria and Graz University of
+ * Technology.
+ * 
+ * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by
+ * the European Commission - subsequent versions of the EUPL (the "Licence");
+ * You may not use this work except in compliance with the Licence.
+ * You may obtain a copy of the Licence at:
+ * http://www.osor.eu/eupl/
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the Licence is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the Licence for the specific language governing permissions and
+ * limitations under the Licence.
+ * 
+ * This product combines work with different licenses. See the "NOTICE" text
+ * file for details on the various modules and licenses.
+ * The "NOTICE" text file is part of the distribution. Any derivative works
+ * that you distribute must include a readable copy of the "NOTICE" text file.
+ ******************************************************************************/
+/**
+ * <copyright> Copyright 2006 by Know-Center, Graz, Austria </copyright>
+ * PDF-AS has been contracted by the E-Government Innovation Center EGIZ, a
+ * joint initiative of the Federal Chancellery Austria and Graz University of
+ * Technology.
+ *
+ * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by
+ * the European Commission - subsequent versions of the EUPL (the "Licence");
+ * You may not use this work except in compliance with the Licence.
+ * You may obtain a copy of the Licence at:
+ * http://www.osor.eu/eupl/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the Licence is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the Licence for the specific language governing permissions and
+ * limitations under the Licence.
+ *
+ * This product combines work with different licenses. See the "NOTICE" text
+ * file for details on the various modules and licenses.
+ * The "NOTICE" text file is part of the distribution. Any derivative works
+ * that you distribute must include a readable copy of the "NOTICE" text file.
+ */
+package at.gv.egiz.pdfas.api.xmldsig;
+
+import at.gv.egiz.pdfas.api.commons.SignatureInformation;
+
+/**
+ * A wrapper to combine {@link SignatureInformation} and {@link XMLDsigData}
+ * 
+ * @author exthex
+ *
+ */
+public class ExtendedSignatureInformation {
+
+   private final SignatureInformation signatureInformation;
+   
+   private final XMLDsigData xmlDsigData;
+   
+   /**
+    * Constructor.
+    * 
+    * @param siginfo
+    *          The signature information
+    * @param dsigData
+    *          The matching xmldsig to the signature information.
+    */
+   public ExtendedSignatureInformation(SignatureInformation siginfo, XMLDsigData dsigData) {
+      this.signatureInformation = siginfo;
+      this.xmlDsigData = dsigData;
+   }
+
+   /**
+    * 
+    * @return the signatureInformation
+    */
+   public SignatureInformation getSignatureInformation() {
+      return signatureInformation;
+   }
+
+   /**
+    * 
+    * @return the xmlDsigData
+    */
+   public XMLDsigData getXmlDsigData() {
+      return xmlDsigData;
+   }
+   
+}
diff --git a/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/xmldsig/ReconstructXMLDsigAfterAnalysisParameters.java b/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/xmldsig/ReconstructXMLDsigAfterAnalysisParameters.java
index 229fba04..62815fb8 100644
--- a/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/xmldsig/ReconstructXMLDsigAfterAnalysisParameters.java
+++ b/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/xmldsig/ReconstructXMLDsigAfterAnalysisParameters.java
@@ -1,86 +1,109 @@
-/**
- * <copyright> Copyright 2006 by Know-Center, Graz, Austria </copyright>
- * PDF-AS has been contracted by the E-Government Innovation Center EGIZ, a
- * joint initiative of the Federal Chancellery Austria and Graz University of
- * Technology.
- *
- * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by
- * the European Commission - subsequent versions of the EUPL (the "Licence");
- * You may not use this work except in compliance with the Licence.
- * You may obtain a copy of the Licence at:
- * http://www.osor.eu/eupl/
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the Licence is distributed on an "AS IS" basis,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the Licence for the specific language governing permissions and
- * limitations under the Licence.
- *
- * This product combines work with different licenses. See the "NOTICE" text
- * file for details on the various modules and licenses.
- * The "NOTICE" text file is part of the distribution. Any derivative works
- * that you distribute must include a readable copy of the "NOTICE" text file.
- */
-package at.gv.egiz.pdfas.api.xmldsig;
-
-import at.gv.egiz.pdfas.api.analyze.AnalyzeResult;
-import at.gv.egiz.pdfas.api.commons.Constants;
-
-/**
- * Parameters for the reconstructXMLDsig method which is to be called after a analyze call.
- * 
- * @author exthex
- *
- */
-public class ReconstructXMLDsigAfterAnalysisParameters {
-   
-
-   /**
-    * The list of signatures to be verified.
-    */
-   protected AnalyzeResult analyzeResult = null;
-
-   /**
-    * The signature device to perform the actual signature.
-    * 
-    * <p>
-    * May be {@link Constants#SIGNATURE_DEVICE_MOA} or
-    * {@link Constants#SIGNATURE_DEVICE_BKU}.
-    * </p>
-    */
-   protected String signatureDevice = Constants.SIGNATURE_DEVICE_MOA;
-
-   /**
-    * @return the analyzeResult
-    */
-   public AnalyzeResult getAnalyzeResult()
-   {
-     return this.analyzeResult;
-   }
-
-   /**
-    * @param analyzeResult
-    *          the analyzeResult to set
-    */
-   public void setAnalyzeResult(AnalyzeResult analyzeResult)
-   {
-     this.analyzeResult = analyzeResult;
-   }
-
-   /**
-    * @return the signatureDevice
-    */
-   public String getSignatureDevice()
-   {
-     return this.signatureDevice;
-   }
-
-   /**
-    * @param signatureDevice
-    *          the signatureDevice to set
-    */
-   public void setSignatureDevice(String signatureDevice)
-   {
-     this.signatureDevice = signatureDevice;
-   }
-}
+/*******************************************************************************
+ * <copyright> Copyright 2014 by E-Government Innovation Center EGIZ, Graz, Austria </copyright>
+ * PDF-AS has been contracted by the E-Government Innovation Center EGIZ, a
+ * joint initiative of the Federal Chancellery Austria and Graz University of
+ * Technology.
+ * 
+ * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by
+ * the European Commission - subsequent versions of the EUPL (the "Licence");
+ * You may not use this work except in compliance with the Licence.
+ * You may obtain a copy of the Licence at:
+ * http://www.osor.eu/eupl/
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the Licence is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the Licence for the specific language governing permissions and
+ * limitations under the Licence.
+ * 
+ * This product combines work with different licenses. See the "NOTICE" text
+ * file for details on the various modules and licenses.
+ * The "NOTICE" text file is part of the distribution. Any derivative works
+ * that you distribute must include a readable copy of the "NOTICE" text file.
+ ******************************************************************************/
+/**
+ * <copyright> Copyright 2006 by Know-Center, Graz, Austria </copyright>
+ * PDF-AS has been contracted by the E-Government Innovation Center EGIZ, a
+ * joint initiative of the Federal Chancellery Austria and Graz University of
+ * Technology.
+ *
+ * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by
+ * the European Commission - subsequent versions of the EUPL (the "Licence");
+ * You may not use this work except in compliance with the Licence.
+ * You may obtain a copy of the Licence at:
+ * http://www.osor.eu/eupl/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the Licence is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the Licence for the specific language governing permissions and
+ * limitations under the Licence.
+ *
+ * This product combines work with different licenses. See the "NOTICE" text
+ * file for details on the various modules and licenses.
+ * The "NOTICE" text file is part of the distribution. Any derivative works
+ * that you distribute must include a readable copy of the "NOTICE" text file.
+ */
+package at.gv.egiz.pdfas.api.xmldsig;
+
+import at.gv.egiz.pdfas.api.analyze.AnalyzeResult;
+import at.gv.egiz.pdfas.api.commons.Constants;
+
+/**
+ * Parameters for the reconstructXMLDsig method which is to be called after a analyze call.
+ * 
+ * @author exthex
+ *
+ */
+public class ReconstructXMLDsigAfterAnalysisParameters {
+   
+
+   /**
+    * The list of signatures to be verified.
+    */
+   protected AnalyzeResult analyzeResult = null;
+
+   /**
+    * The signature device to perform the actual signature.
+    * 
+    * <p>
+    * May be {@link Constants#SIGNATURE_DEVICE_MOA} or
+    * {@link Constants#SIGNATURE_DEVICE_BKU}.
+    * </p>
+    */
+   protected String signatureDevice = Constants.SIGNATURE_DEVICE_MOA;
+
+   /**
+    * @return the analyzeResult
+    */
+   public AnalyzeResult getAnalyzeResult()
+   {
+     return this.analyzeResult;
+   }
+
+   /**
+    * @param analyzeResult
+    *          the analyzeResult to set
+    */
+   public void setAnalyzeResult(AnalyzeResult analyzeResult)
+   {
+     this.analyzeResult = analyzeResult;
+   }
+
+   /**
+    * @return the signatureDevice
+    */
+   public String getSignatureDevice()
+   {
+     return this.signatureDevice;
+   }
+
+   /**
+    * @param signatureDevice
+    *          the signatureDevice to set
+    */
+   public void setSignatureDevice(String signatureDevice)
+   {
+     this.signatureDevice = signatureDevice;
+   }
+}
diff --git a/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/xmldsig/ReconstructXMLDsigParameters.java b/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/xmldsig/ReconstructXMLDsigParameters.java
index 445d7ae4..03b77f1c 100644
--- a/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/xmldsig/ReconstructXMLDsigParameters.java
+++ b/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/xmldsig/ReconstructXMLDsigParameters.java
@@ -1,218 +1,241 @@
-/**
- * <copyright> Copyright 2006 by Know-Center, Graz, Austria </copyright>
- * PDF-AS has been contracted by the E-Government Innovation Center EGIZ, a
- * joint initiative of the Federal Chancellery Austria and Graz University of
- * Technology.
- *
- * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by
- * the European Commission - subsequent versions of the EUPL (the "Licence");
- * You may not use this work except in compliance with the Licence.
- * You may obtain a copy of the Licence at:
- * http://www.osor.eu/eupl/
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the Licence is distributed on an "AS IS" basis,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the Licence for the specific language governing permissions and
- * limitations under the Licence.
- *
- * This product combines work with different licenses. See the "NOTICE" text
- * file for details on the various modules and licenses.
- * The "NOTICE" text file is part of the distribution. Any derivative works
- * that you distribute must include a readable copy of the "NOTICE" text file.
- */
-package at.gv.egiz.pdfas.api.xmldsig;
-
-import java.util.Date;
-
-import at.gv.egiz.pdfas.api.PdfAs;
-import at.gv.egiz.pdfas.api.commons.Constants;
-import at.gv.egiz.pdfas.api.io.DataSource;
-
-/**
- * Parameters for the {@link PdfAs#reconstructXMLDSIG(ReconstructXMLDsigParameters)} method.
- * No need to call analyze before calling this method.  
- * 
- * @author exthex
- *
- */
-public class ReconstructXMLDsigParameters {
-   
-   /**
-    * The document to be verified.
-    */
-   protected DataSource document = null;
-
-   /**
-    * The signature device to perform the actual signature.
-    * 
-    * <p>
-    * May be {@link Constants#SIGNATURE_DEVICE_MOA} or
-    * {@link Constants#SIGNATURE_DEVICE_BKU}.
-    * </p>
-    */
-   protected String signatureDevice = Constants.SIGNATURE_DEVICE_MOA;
-
-   /**
-    * The mode of operation how the document is analyzed.
-    * 
-    * <p>
-    * May be {@link Constants#VERIFY_MODE_BINARY_ONLY} to check the document for
-    * binary signatures only (very fast). Or may be
-    * {@link Constants#VERIFY_MODE_SEMI_CONSERVATIVE} to perform a semi
-    * conservative (optimized) text and binary verification (slow). Or may be
-    * {@link Constants#VERIFY_MODE_FULL_CONSERVATIVE} to perform a full
-    * conservative text and binary verification (very slow).
-    * </p>
-    */
-   protected String verifyMode = Constants.VERIFY_MODE_FULL_CONSERVATIVE;
-
-   /**
-    * The (zero based) index of the signature to verify.
-    * 
-    * <p>
-    * This allows to verify only one found signature instead of all. {@link Constants#VERIFY_ALL} means to
-    * verify all found signatures.
-    * </p>
-    */
-   protected int signatureToVerify = Constants.VERIFY_ALL;
-
-   /**
-    * Allows to pass a VerificationTime to the verification device.
-    * 
-    * <p>
-    * Note that the actual usage of this parameter depends on the verification device.
-    * </p>
-    */
-   protected Date verificationTime = null;
-
-   /**
-    * Tells the signature device (e.g. MOA) to return the signature hash input
-    * data (which is the probably transformed signed data).
-    * 
-    * <p>
-    * Note that this forces MOA to return the potentially large signature data to
-    * be returned in the result XML, which may result in very bad performance.
-    * </p>
-    */
-   protected boolean returnHashInputData = false;
-     
-   protected boolean returnNonTextualObjects = false;
-
-   /**
-    * @return the document
-    */
-   public DataSource getDocument()
-   {
-     return this.document;
-   }
-
-   /**
-    * @param document
-    *          the document to set
-    */
-   public void setDocument(DataSource document)
-   {
-     this.document = document;
-   }
-
-   /**
-    * @return the signatureDevice
-    */
-   public String getSignatureDevice()
-   {
-     return this.signatureDevice;
-   }
-
-   /**
-    * @param signatureDevice
-    *          the signatureDevice to set
-    */
-   public void setSignatureDevice(String signatureDevice)
-   {
-     this.signatureDevice = signatureDevice;
-   }
-
-   /**
-    * @return the verifyMode
-    */
-   public String getVerifyMode()
-   {
-     return this.verifyMode;
-   }
-
-   /**
-    * @param verifyMode
-    *          the verifyMode to set
-    */
-   public void setVerifyMode(String verifyMode)
-   {
-     this.verifyMode = verifyMode;
-   }
-
-   /**
-    * @return the signatureToVerify
-    */
-   public int getSignatureToVerify()
-   {
-     return this.signatureToVerify;
-   }
-
-   /**
-    * @param signatureToVerify
-    *          the signatureToVerify to set
-    */
-   public void setSignatureToVerify(int signatureToVerify)
-   {
-     this.signatureToVerify = signatureToVerify;
-   }
-
-   /**
-    * @return the verificationTime
-    */
-   public Date getVerificationTime()
-   {
-     return this.verificationTime;
-   }
-
-   /**
-    * @param verificationTime
-    *          the verificationTime to set
-    */
-   public void setVerificationTime(Date verificationTime)
-   {
-     this.verificationTime = verificationTime;
-   }
-
-   /**
-    * @return the returnHashInputData
-    */
-   public boolean isReturnHashInputData()
-   {
-     return this.returnHashInputData;
-   }
-
-   /**
-    * @param returnHashInputData
-    *          the returnHashInputData to set
-    */
-   public void setReturnHashInputData(boolean returnHashInputData)
-   {
-     this.returnHashInputData = returnHashInputData;
-   }
-
-    public boolean isReturnNonTextualObjects() {
-       return this.returnNonTextualObjects;
-    }
-    
-    /**
-     * Tells if non text object of the signed pdf should be extracted and returned.
-     * One should show this to the user, especially in case of textual signature.
-     * Defaults to <tt>false</tt>
-     * 
-     * @param returnNonTextualObjects
-     */
-    public void setReturnNonTextualObjects(boolean returnNonTextualObjects) {
-       this.returnNonTextualObjects = returnNonTextualObjects;
-    }
-}
+/*******************************************************************************
+ * <copyright> Copyright 2014 by E-Government Innovation Center EGIZ, Graz, Austria </copyright>
+ * PDF-AS has been contracted by the E-Government Innovation Center EGIZ, a
+ * joint initiative of the Federal Chancellery Austria and Graz University of
+ * Technology.
+ * 
+ * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by
+ * the European Commission - subsequent versions of the EUPL (the "Licence");
+ * You may not use this work except in compliance with the Licence.
+ * You may obtain a copy of the Licence at:
+ * http://www.osor.eu/eupl/
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the Licence is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the Licence for the specific language governing permissions and
+ * limitations under the Licence.
+ * 
+ * This product combines work with different licenses. See the "NOTICE" text
+ * file for details on the various modules and licenses.
+ * The "NOTICE" text file is part of the distribution. Any derivative works
+ * that you distribute must include a readable copy of the "NOTICE" text file.
+ ******************************************************************************/
+/**
+ * <copyright> Copyright 2006 by Know-Center, Graz, Austria </copyright>
+ * PDF-AS has been contracted by the E-Government Innovation Center EGIZ, a
+ * joint initiative of the Federal Chancellery Austria and Graz University of
+ * Technology.
+ *
+ * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by
+ * the European Commission - subsequent versions of the EUPL (the "Licence");
+ * You may not use this work except in compliance with the Licence.
+ * You may obtain a copy of the Licence at:
+ * http://www.osor.eu/eupl/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the Licence is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the Licence for the specific language governing permissions and
+ * limitations under the Licence.
+ *
+ * This product combines work with different licenses. See the "NOTICE" text
+ * file for details on the various modules and licenses.
+ * The "NOTICE" text file is part of the distribution. Any derivative works
+ * that you distribute must include a readable copy of the "NOTICE" text file.
+ */
+package at.gv.egiz.pdfas.api.xmldsig;
+
+import java.util.Date;
+
+import at.gv.egiz.pdfas.api.PdfAs;
+import at.gv.egiz.pdfas.api.commons.Constants;
+import at.gv.egiz.pdfas.api.io.DataSource;
+
+/**
+ * Parameters for the {@link PdfAs#reconstructXMLDSIG(ReconstructXMLDsigParameters)} method.
+ * No need to call analyze before calling this method.  
+ * 
+ * @author exthex
+ *
+ */
+public class ReconstructXMLDsigParameters {
+   
+   /**
+    * The document to be verified.
+    */
+   protected DataSource document = null;
+
+   /**
+    * The signature device to perform the actual signature.
+    * 
+    * <p>
+    * May be {@link Constants#SIGNATURE_DEVICE_MOA} or
+    * {@link Constants#SIGNATURE_DEVICE_BKU}.
+    * </p>
+    */
+   protected String signatureDevice = Constants.SIGNATURE_DEVICE_MOA;
+
+   /**
+    * The mode of operation how the document is analyzed.
+    * 
+    * <p>
+    * May be {@link Constants#VERIFY_MODE_BINARY_ONLY} to check the document for
+    * binary signatures only (very fast). Or may be
+    * {@link Constants#VERIFY_MODE_SEMI_CONSERVATIVE} to perform a semi
+    * conservative (optimized) text and binary verification (slow). Or may be
+    * {@link Constants#VERIFY_MODE_FULL_CONSERVATIVE} to perform a full
+    * conservative text and binary verification (very slow).
+    * </p>
+    */
+   protected String verifyMode = Constants.VERIFY_MODE_FULL_CONSERVATIVE;
+
+   /**
+    * The (zero based) index of the signature to verify.
+    * 
+    * <p>
+    * This allows to verify only one found signature instead of all. {@link Constants#VERIFY_ALL} means to
+    * verify all found signatures.
+    * </p>
+    */
+   protected int signatureToVerify = Constants.VERIFY_ALL;
+
+   /**
+    * Allows to pass a VerificationTime to the verification device.
+    * 
+    * <p>
+    * Note that the actual usage of this parameter depends on the verification device.
+    * </p>
+    */
+   protected Date verificationTime = null;
+
+   /**
+    * Tells the signature device (e.g. MOA) to return the signature hash input
+    * data (which is the probably transformed signed data).
+    * 
+    * <p>
+    * Note that this forces MOA to return the potentially large signature data to
+    * be returned in the result XML, which may result in very bad performance.
+    * </p>
+    */
+   protected boolean returnHashInputData = false;
+     
+   protected boolean returnNonTextualObjects = false;
+
+   /**
+    * @return the document
+    */
+   public DataSource getDocument()
+   {
+     return this.document;
+   }
+
+   /**
+    * @param document
+    *          the document to set
+    */
+   public void setDocument(DataSource document)
+   {
+     this.document = document;
+   }
+
+   /**
+    * @return the signatureDevice
+    */
+   public String getSignatureDevice()
+   {
+     return this.signatureDevice;
+   }
+
+   /**
+    * @param signatureDevice
+    *          the signatureDevice to set
+    */
+   public void setSignatureDevice(String signatureDevice)
+   {
+     this.signatureDevice = signatureDevice;
+   }
+
+   /**
+    * @return the verifyMode
+    */
+   public String getVerifyMode()
+   {
+     return this.verifyMode;
+   }
+
+   /**
+    * @param verifyMode
+    *          the verifyMode to set
+    */
+   public void setVerifyMode(String verifyMode)
+   {
+     this.verifyMode = verifyMode;
+   }
+
+   /**
+    * @return the signatureToVerify
+    */
+   public int getSignatureToVerify()
+   {
+     return this.signatureToVerify;
+   }
+
+   /**
+    * @param signatureToVerify
+    *          the signatureToVerify to set
+    */
+   public void setSignatureToVerify(int signatureToVerify)
+   {
+     this.signatureToVerify = signatureToVerify;
+   }
+
+   /**
+    * @return the verificationTime
+    */
+   public Date getVerificationTime()
+   {
+     return this.verificationTime;
+   }
+
+   /**
+    * @param verificationTime
+    *          the verificationTime to set
+    */
+   public void setVerificationTime(Date verificationTime)
+   {
+     this.verificationTime = verificationTime;
+   }
+
+   /**
+    * @return the returnHashInputData
+    */
+   public boolean isReturnHashInputData()
+   {
+     return this.returnHashInputData;
+   }
+
+   /**
+    * @param returnHashInputData
+    *          the returnHashInputData to set
+    */
+   public void setReturnHashInputData(boolean returnHashInputData)
+   {
+     this.returnHashInputData = returnHashInputData;
+   }
+
+    public boolean isReturnNonTextualObjects() {
+       return this.returnNonTextualObjects;
+    }
+    
+    /**
+     * Tells if non text object of the signed pdf should be extracted and returned.
+     * One should show this to the user, especially in case of textual signature.
+     * Defaults to <tt>false</tt>
+     * 
+     * @param returnNonTextualObjects
+     */
+    public void setReturnNonTextualObjects(boolean returnNonTextualObjects) {
+       this.returnNonTextualObjects = returnNonTextualObjects;
+    }
+}
diff --git a/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/xmldsig/ReconstructXMLDsigResult.java b/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/xmldsig/ReconstructXMLDsigResult.java
index 580f3af6..01156143 100644
--- a/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/xmldsig/ReconstructXMLDsigResult.java
+++ b/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/xmldsig/ReconstructXMLDsigResult.java
@@ -1,74 +1,97 @@
-/**
- * <copyright> Copyright 2006 by Know-Center, Graz, Austria </copyright>
- * PDF-AS has been contracted by the E-Government Innovation Center EGIZ, a
- * joint initiative of the Federal Chancellery Austria and Graz University of
- * Technology.
- *
- * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by
- * the European Commission - subsequent versions of the EUPL (the "Licence");
- * You may not use this work except in compliance with the Licence.
- * You may obtain a copy of the Licence at:
- * http://www.osor.eu/eupl/
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the Licence is distributed on an "AS IS" basis,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the Licence for the specific language governing permissions and
- * limitations under the Licence.
- *
- * This product combines work with different licenses. See the "NOTICE" text
- * file for details on the various modules and licenses.
- * The "NOTICE" text file is part of the distribution. Any derivative works
- * that you distribute must include a readable copy of the "NOTICE" text file.
- */
-package at.gv.egiz.pdfas.api.xmldsig;
-
-import java.util.List;
-
-import at.gv.egiz.pdfas.api.commons.Constants;
-import at.gv.egiz.pdfas.api.commons.SignatureInformation;
-
-/**
- * The result of a reconstructXMLDsig call.<br/>
- * This is just a wrapper for a list of {@link ExtendedSignatureInformation}s
- * 
- * 
- * @author exthex
- */
-public class ReconstructXMLDsigResult {
-
-   private List extendedSignatures;
-   
-   private String device;
-   
-   /**
-    * 
-    * @param extendedSignatureInfos
-    * @param signatureDevice
-    */
-   public ReconstructXMLDsigResult(List extendedSignatureInfos, String signatureDevice) {
-      this.extendedSignatures = extendedSignatureInfos;
-      this.device = signatureDevice;
-   }
-
-   /**
-    * Get the signature device that was used to create this result.
-    * 
-    * @return {@link Constants#SIGNATURE_DEVICE_MOA} or {@link Constants#SIGNATURE_DEVICE_BKU}
-    */
-   public String getDevice() {
-      return device;
-   }
-   
-   /**
-    * Returns the list of found signatures.
-    * 
-    * @return Returns a list of {@link ExtendedSignatureInformation} objects representing all
-    *         found signatures + {@link XMLDsigData}.
-    * @see SignatureInformation
-    */
-   public List getExtendedSignatures() {
-      return this.extendedSignatures;
-   }
-   
-}
+/*******************************************************************************
+ * <copyright> Copyright 2014 by E-Government Innovation Center EGIZ, Graz, Austria </copyright>
+ * PDF-AS has been contracted by the E-Government Innovation Center EGIZ, a
+ * joint initiative of the Federal Chancellery Austria and Graz University of
+ * Technology.
+ * 
+ * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by
+ * the European Commission - subsequent versions of the EUPL (the "Licence");
+ * You may not use this work except in compliance with the Licence.
+ * You may obtain a copy of the Licence at:
+ * http://www.osor.eu/eupl/
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the Licence is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the Licence for the specific language governing permissions and
+ * limitations under the Licence.
+ * 
+ * This product combines work with different licenses. See the "NOTICE" text
+ * file for details on the various modules and licenses.
+ * The "NOTICE" text file is part of the distribution. Any derivative works
+ * that you distribute must include a readable copy of the "NOTICE" text file.
+ ******************************************************************************/
+/**
+ * <copyright> Copyright 2006 by Know-Center, Graz, Austria </copyright>
+ * PDF-AS has been contracted by the E-Government Innovation Center EGIZ, a
+ * joint initiative of the Federal Chancellery Austria and Graz University of
+ * Technology.
+ *
+ * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by
+ * the European Commission - subsequent versions of the EUPL (the "Licence");
+ * You may not use this work except in compliance with the Licence.
+ * You may obtain a copy of the Licence at:
+ * http://www.osor.eu/eupl/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the Licence is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the Licence for the specific language governing permissions and
+ * limitations under the Licence.
+ *
+ * This product combines work with different licenses. See the "NOTICE" text
+ * file for details on the various modules and licenses.
+ * The "NOTICE" text file is part of the distribution. Any derivative works
+ * that you distribute must include a readable copy of the "NOTICE" text file.
+ */
+package at.gv.egiz.pdfas.api.xmldsig;
+
+import java.util.List;
+
+import at.gv.egiz.pdfas.api.commons.Constants;
+import at.gv.egiz.pdfas.api.commons.SignatureInformation;
+
+/**
+ * The result of a reconstructXMLDsig call.<br/>
+ * This is just a wrapper for a list of {@link ExtendedSignatureInformation}s
+ * 
+ * 
+ * @author exthex
+ */
+public class ReconstructXMLDsigResult {
+
+   private List extendedSignatures;
+   
+   private String device;
+   
+   /**
+    * 
+    * @param extendedSignatureInfos
+    * @param signatureDevice
+    */
+   public ReconstructXMLDsigResult(List extendedSignatureInfos, String signatureDevice) {
+      this.extendedSignatures = extendedSignatureInfos;
+      this.device = signatureDevice;
+   }
+
+   /**
+    * Get the signature device that was used to create this result.
+    * 
+    * @return {@link Constants#SIGNATURE_DEVICE_MOA} or {@link Constants#SIGNATURE_DEVICE_BKU}
+    */
+   public String getDevice() {
+      return device;
+   }
+   
+   /**
+    * Returns the list of found signatures.
+    * 
+    * @return Returns a list of {@link ExtendedSignatureInformation} objects representing all
+    *         found signatures + {@link XMLDsigData}.
+    * @see SignatureInformation
+    */
+   public List getExtendedSignatures() {
+      return this.extendedSignatures;
+   }
+   
+}
diff --git a/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/xmldsig/XMLDsigData.java b/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/xmldsig/XMLDsigData.java
index 0449cfa2..4f39b599 100644
--- a/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/xmldsig/XMLDsigData.java
+++ b/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/xmldsig/XMLDsigData.java
@@ -1,83 +1,106 @@
-/**
- * <copyright> Copyright 2006 by Know-Center, Graz, Austria </copyright>
- * PDF-AS has been contracted by the E-Government Innovation Center EGIZ, a
- * joint initiative of the Federal Chancellery Austria and Graz University of
- * Technology.
- *
- * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by
- * the European Commission - subsequent versions of the EUPL (the "Licence");
- * You may not use this work except in compliance with the Licence.
- * You may obtain a copy of the Licence at:
- * http://www.osor.eu/eupl/
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the Licence is distributed on an "AS IS" basis,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the Licence for the specific language governing permissions and
- * limitations under the Licence.
- *
- * This product combines work with different licenses. See the "NOTICE" text
- * file for details on the various modules and licenses.
- * The "NOTICE" text file is part of the distribution. Any derivative works
- * that you distribute must include a readable copy of the "NOTICE" text file.
- */
-package at.gv.egiz.pdfas.api.xmldsig;
-
-/**
- * A container for XMLDsig data.
- * 
- * @author exthex
- *
- */
-public class XMLDsigData {
-
-   private String xmlDsig;
-   
-   private boolean detached;
-   
-   /**
-    * Constructor.
-    * 
-    * @param xmldsig the xml string of the xmldsig. 
-    * @param detached true if detached, false otherwise
-    */
-   public XMLDsigData(String xmldsig, boolean detached) {
-      this.xmlDsig = xmldsig;
-      this.detached = detached;
-   }
-
-   /**
-    * Get the xmldsig string
-    * @return
-    */
-   public String getXmlDsig() {
-      return xmlDsig;
-   }
-
-   /**
-    * Set the xmldsig string.
-    * 
-    * @param xmlDsig
-    */
-   public void setXmlDsig(String xmlDsig) {
-      this.xmlDsig = xmlDsig;
-   }
-
-   /**
-    * 
-    * @return true if detached, false otherwise
-    */
-   public boolean isDetached() {
-      return detached;
-   }
-
-   /**
-    * Set the detached.
-    * 
-    * @param detached
-    */
-   public void setDetached(boolean detached) {
-      this.detached = detached;
-   }
-
-}
+/*******************************************************************************
+ * <copyright> Copyright 2014 by E-Government Innovation Center EGIZ, Graz, Austria </copyright>
+ * PDF-AS has been contracted by the E-Government Innovation Center EGIZ, a
+ * joint initiative of the Federal Chancellery Austria and Graz University of
+ * Technology.
+ * 
+ * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by
+ * the European Commission - subsequent versions of the EUPL (the "Licence");
+ * You may not use this work except in compliance with the Licence.
+ * You may obtain a copy of the Licence at:
+ * http://www.osor.eu/eupl/
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the Licence is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the Licence for the specific language governing permissions and
+ * limitations under the Licence.
+ * 
+ * This product combines work with different licenses. See the "NOTICE" text
+ * file for details on the various modules and licenses.
+ * The "NOTICE" text file is part of the distribution. Any derivative works
+ * that you distribute must include a readable copy of the "NOTICE" text file.
+ ******************************************************************************/
+/**
+ * <copyright> Copyright 2006 by Know-Center, Graz, Austria </copyright>
+ * PDF-AS has been contracted by the E-Government Innovation Center EGIZ, a
+ * joint initiative of the Federal Chancellery Austria and Graz University of
+ * Technology.
+ *
+ * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by
+ * the European Commission - subsequent versions of the EUPL (the "Licence");
+ * You may not use this work except in compliance with the Licence.
+ * You may obtain a copy of the Licence at:
+ * http://www.osor.eu/eupl/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the Licence is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the Licence for the specific language governing permissions and
+ * limitations under the Licence.
+ *
+ * This product combines work with different licenses. See the "NOTICE" text
+ * file for details on the various modules and licenses.
+ * The "NOTICE" text file is part of the distribution. Any derivative works
+ * that you distribute must include a readable copy of the "NOTICE" text file.
+ */
+package at.gv.egiz.pdfas.api.xmldsig;
+
+/**
+ * A container for XMLDsig data.
+ * 
+ * @author exthex
+ *
+ */
+public class XMLDsigData {
+
+   private String xmlDsig;
+   
+   private boolean detached;
+   
+   /**
+    * Constructor.
+    * 
+    * @param xmldsig the xml string of the xmldsig. 
+    * @param detached true if detached, false otherwise
+    */
+   public XMLDsigData(String xmldsig, boolean detached) {
+      this.xmlDsig = xmldsig;
+      this.detached = detached;
+   }
+
+   /**
+    * Get the xmldsig string
+    * @return
+    */
+   public String getXmlDsig() {
+      return xmlDsig;
+   }
+
+   /**
+    * Set the xmldsig string.
+    * 
+    * @param xmlDsig
+    */
+   public void setXmlDsig(String xmlDsig) {
+      this.xmlDsig = xmlDsig;
+   }
+
+   /**
+    * 
+    * @return true if detached, false otherwise
+    */
+   public boolean isDetached() {
+      return detached;
+   }
+
+   /**
+    * Set the detached.
+    * 
+    * @param detached
+    */
+   public void setDetached(boolean detached) {
+      this.detached = detached;
+   }
+
+}
diff --git a/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/xmldsig/package-info.java b/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/xmldsig/package-info.java
index a34405a8..7ea150ff 100644
--- a/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/xmldsig/package-info.java
+++ b/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/xmldsig/package-info.java
@@ -1,3 +1,26 @@
+/*******************************************************************************
+ * <copyright> Copyright 2014 by E-Government Innovation Center EGIZ, Graz, Austria </copyright>
+ * PDF-AS has been contracted by the E-Government Innovation Center EGIZ, a
+ * joint initiative of the Federal Chancellery Austria and Graz University of
+ * Technology.
+ * 
+ * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by
+ * the European Commission - subsequent versions of the EUPL (the "Licence");
+ * You may not use this work except in compliance with the Licence.
+ * You may obtain a copy of the Licence at:
+ * http://www.osor.eu/eupl/
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the Licence is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the Licence for the specific language governing permissions and
+ * limitations under the Licence.
+ * 
+ * This product combines work with different licenses. See the "NOTICE" text
+ * file for details on the various modules and licenses.
+ * The "NOTICE" text file is part of the distribution. Any derivative works
+ * that you distribute must include a readable copy of the "NOTICE" text file.
+ ******************************************************************************/
 /**
  * 
  */
@@ -5,4 +28,4 @@
  * @author afitzek
  *
  */
-package at.gv.egiz.pdfas.api.xmldsig;
-\ No newline at end of file
+package at.gv.egiz.pdfas.api.xmldsig;