Added license text

259 files changed, 15306 insertions, 9399 deletions

diff --git a/license/EUPL v.1.1 - Licence.pdf b/license/EUPL v.1.1 - Licence.pdf
new file mode 100644
index 00000000..80b5007e
--- /dev/null
+++ b/license/EUPL v.1.1 - Licence.pdf
diff --git a/pdf-as-cli/src/main/java/at/gv/egiz/pdfas/cli/DeveloperMain.java b/pdf-as-cli/src/main/java/at/gv/egiz/pdfas/cli/DeveloperMain.java
index d99f7bd8..c1201cb5 100644
--- a/pdf-as-cli/src/main/java/at/gv/egiz/pdfas/cli/DeveloperMain.java
+++ b/pdf-as-cli/src/main/java/at/gv/egiz/pdfas/cli/DeveloperMain.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.
+ ******************************************************************************/
 package at.gv.egiz.pdfas.cli;
 
 import java.io.File;
diff --git a/pdf-as-cli/src/main/java/at/gv/egiz/pdfas/cli/Main.java b/pdf-as-cli/src/main/java/at/gv/egiz/pdfas/cli/Main.java
index d2944ba1..e9bbdc59 100644
--- a/pdf-as-cli/src/main/java/at/gv/egiz/pdfas/cli/Main.java
+++ b/pdf-as-cli/src/main/java/at/gv/egiz/pdfas/cli/Main.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.
+ ******************************************************************************/
 package at.gv.egiz.pdfas.cli;
 
 import java.io.File;
diff --git a/pdf-as-cli/src/main/java/at/gv/egiz/pdfas/cli/ModeOfOperation.java b/pdf-as-cli/src/main/java/at/gv/egiz/pdfas/cli/ModeOfOperation.java
index 7d41b802..58700461 100644
--- a/pdf-as-cli/src/main/java/at/gv/egiz/pdfas/cli/ModeOfOperation.java
+++ b/pdf-as-cli/src/main/java/at/gv/egiz/pdfas/cli/ModeOfOperation.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.
+ ******************************************************************************/
 package at.gv.egiz.pdfas.cli;
 
 public enum ModeOfOperation {
diff --git a/pdf-as-cli/src/main/java/at/gv/egiz/pdfas/cli/package-info.java b/pdf-as-cli/src/main/java/at/gv/egiz/pdfas/cli/package-info.java
index 6dbf3f3e..74e40667 100644
--- a/pdf-as-cli/src/main/java/at/gv/egiz/pdfas/cli/package-info.java
+++ b/pdf-as-cli/src/main/java/at/gv/egiz/pdfas/cli/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.cli;
\ No newline at end of file
+package at.gv.egiz.pdfas.cli;
diff --git a/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/exceptions/PDFIOException.java b/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/exceptions/PDFIOException.java
index 5be7b6ec..cc619259 100644
--- a/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/exceptions/PDFIOException.java
+++ b/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/exceptions/PDFIOException.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.
+ ******************************************************************************/
 package at.gv.egiz.pdfas.common.exceptions;
 
 /**
diff --git a/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/exceptions/PdfAsException.java b/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/exceptions/PdfAsException.java
index 21762bb2..38edf331 100644
--- a/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/exceptions/PdfAsException.java
+++ b/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/exceptions/PdfAsException.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.
+ ******************************************************************************/
 package at.gv.egiz.pdfas.common.exceptions;
 
 import at.gv.egiz.pdfas.common.messages.MessageResolver;
diff --git a/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/exceptions/PdfAsMOAException.java b/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/exceptions/PdfAsMOAException.java
index 7350680d..1e602388 100644
--- a/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/exceptions/PdfAsMOAException.java
+++ b/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/exceptions/PdfAsMOAException.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.
+ ******************************************************************************/
 package at.gv.egiz.pdfas.common.exceptions;
 
 import at.gv.egiz.pdfas.common.messages.MessageResolver;
diff --git a/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/exceptions/PdfAsSettingsException.java b/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/exceptions/PdfAsSettingsException.java
index ec1d22b0..0ebcd233 100644
--- a/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/exceptions/PdfAsSettingsException.java
+++ b/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/exceptions/PdfAsSettingsException.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.
+ ******************************************************************************/
 package at.gv.egiz.pdfas.common.exceptions;
 
 /**
diff --git a/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/exceptions/PdfAsSignatureException.java b/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/exceptions/PdfAsSignatureException.java
index 8ce81acb..759a9ec8 100644
--- a/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/exceptions/PdfAsSignatureException.java
+++ b/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/exceptions/PdfAsSignatureException.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.
+ ******************************************************************************/
 package at.gv.egiz.pdfas.common.exceptions;
 
 public class PdfAsSignatureException extends PdfAsException {
diff --git a/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/exceptions/PdfAsValidationException.java b/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/exceptions/PdfAsValidationException.java
index 95380794..56550a70 100644
--- a/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/exceptions/PdfAsValidationException.java
+++ b/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/exceptions/PdfAsValidationException.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.
+ ******************************************************************************/
 package at.gv.egiz.pdfas.common.exceptions;
 
 import at.gv.egiz.pdfas.common.messages.MessageResolver;
diff --git a/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/exceptions/PdfAsWrappedIOException.java b/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/exceptions/PdfAsWrappedIOException.java
index dfb2114e..4a67abac 100644
--- a/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/exceptions/PdfAsWrappedIOException.java
+++ b/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/exceptions/PdfAsWrappedIOException.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.
+ ******************************************************************************/
 package at.gv.egiz.pdfas.common.exceptions;
 
 import java.io.IOException;
diff --git a/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/exceptions/PlaceholderExtractionException.java b/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/exceptions/PlaceholderExtractionException.java
index ff2e48c0..9c89d979 100644
--- a/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/exceptions/PlaceholderExtractionException.java
+++ b/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/exceptions/PlaceholderExtractionException.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.
+ ******************************************************************************/
 package at.gv.egiz.pdfas.common.exceptions;
 
 public class PlaceholderExtractionException extends PdfAsException {
diff --git a/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/exceptions/SLPdfAsException.java b/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/exceptions/SLPdfAsException.java
index fa9031ec..64536ea4 100644
--- a/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/exceptions/SLPdfAsException.java
+++ b/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/exceptions/SLPdfAsException.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.
+ ******************************************************************************/
 package at.gv.egiz.pdfas.common.exceptions;
 
 
diff --git a/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/messages/MessageResolver.java b/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/messages/MessageResolver.java
index 34108978..41b8a979 100644
--- a/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/messages/MessageResolver.java
+++ b/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/messages/MessageResolver.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.
+ ******************************************************************************/
 package at.gv.egiz.pdfas.common.messages;
 
 import java.util.Locale;
diff --git a/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/settings/DefaultSignatureProfileSettings.java b/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/settings/DefaultSignatureProfileSettings.java
index 9cd8cfea..611a9480 100644
--- a/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/settings/DefaultSignatureProfileSettings.java
+++ b/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/settings/DefaultSignatureProfileSettings.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.
+ ******************************************************************************/
 package at.gv.egiz.pdfas.common.settings;
 
 import java.util.HashMap;
diff --git a/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/settings/IProfileConstants.java b/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/settings/IProfileConstants.java
index 4ebcc019..1ed90cec 100644
--- a/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/settings/IProfileConstants.java
+++ b/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/settings/IProfileConstants.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.
+ ******************************************************************************/
 package at.gv.egiz.pdfas.common.settings;
 
 /**
diff --git a/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/settings/ISettings.java b/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/settings/ISettings.java
index 9e3291d2..42cdb8ab 100644
--- a/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/settings/ISettings.java
+++ b/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/settings/ISettings.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.
+ ******************************************************************************/
 package at.gv.egiz.pdfas.common.settings;
 
 import java.util.Map;
diff --git a/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/settings/Settings.java b/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/settings/Settings.java
index 255c8ba8..abeba8b2 100644
--- a/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/settings/Settings.java
+++ b/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/settings/Settings.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.
+ ******************************************************************************/
 package at.gv.egiz.pdfas.common.settings;
 
 import at.gv.egiz.pdfas.common.exceptions.PdfAsSettingsException;
diff --git a/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/settings/SignatureProfileEntry.java b/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/settings/SignatureProfileEntry.java
index d8842014..598eb3ec 100644
--- a/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/settings/SignatureProfileEntry.java
+++ b/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/settings/SignatureProfileEntry.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.
+ ******************************************************************************/
 package at.gv.egiz.pdfas.common.settings;
 
 public class SignatureProfileEntry {
diff --git a/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/settings/SignatureProfileSettings.java b/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/settings/SignatureProfileSettings.java
index 456e58b2..8af69382 100644
--- a/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/settings/SignatureProfileSettings.java
+++ b/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/settings/SignatureProfileSettings.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.
+ ******************************************************************************/
 package at.gv.egiz.pdfas.common.settings;
 
 import org.slf4j.Logger;
diff --git a/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/utils/DNUtils.java b/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/utils/DNUtils.java
index d61a1694..6ca18c02 100644
--- a/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/utils/DNUtils.java
+++ b/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/utils/DNUtils.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.
+ ******************************************************************************/
 package at.gv.egiz.pdfas.common.utils;
 
 import java.util.HashMap;
diff --git a/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/utils/OgnlUtils.java b/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/utils/OgnlUtils.java
index 500bd081..d5bae58e 100644
--- a/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/utils/OgnlUtils.java
+++ b/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/utils/OgnlUtils.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.
+ ******************************************************************************/
 package at.gv.egiz.pdfas.common.utils;
 
 import ognl.Ognl;
diff --git a/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/utils/PDFUtils.java b/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/utils/PDFUtils.java
index 2161c05a..8eb2e8bb 100644
--- a/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/utils/PDFUtils.java
+++ b/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/utils/PDFUtils.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.
+ ******************************************************************************/
 package at.gv.egiz.pdfas.common.utils;
 
 import java.util.ArrayList;
diff --git a/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/utils/StreamUtils.java b/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/utils/StreamUtils.java
index 0b15d700..579099f0 100644
--- a/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/utils/StreamUtils.java
+++ b/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/utils/StreamUtils.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.
+ ******************************************************************************/
 package at.gv.egiz.pdfas.common.utils;
 
 import java.io.ByteArrayOutputStream;
diff --git a/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/utils/StringUtils.java b/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/utils/StringUtils.java
index 63aae211..a29f5db3 100644
--- a/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/utils/StringUtils.java
+++ b/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/utils/StringUtils.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.
+ ******************************************************************************/
 package at.gv.egiz.pdfas.common.utils;
 
 import java.util.Formatter;
diff --git a/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/utils/TempFileHelper.java b/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/utils/TempFileHelper.java
index 03cd28f3..07370eed 100644
--- a/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/utils/TempFileHelper.java
+++ b/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/utils/TempFileHelper.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.
+ ******************************************************************************/
 package at.gv.egiz.pdfas.common.utils;
 
 import java.io.File;
diff --git a/pdf-as-legacy/build.gradle b/pdf-as-legacy/build.gradle
index ae33b3f4..5451d89d 100644
--- a/pdf-as-legacy/build.gradle
+++ b/pdf-as-legacy/build.gradle
@@ -1,5 +1,6 @@
 apply plugin: 'java'
 apply plugin: 'eclipse'
+apply plugin: 'java-library-distribution'
 
 jar {
 	manifest {
@@ -40,6 +41,17 @@ dependencies {
 
 test { systemProperties 'property': 'value' }
 
+distributions {
+    main {
+        contents {
+            from { '../docs' }
+            from('../doc/') {
+               include '*.pdf'
+            } 
+        }
+    }
+}
+
 uploadArchives {
 	repositories {
 		flatDir { dirs 'repos' }
diff --git a/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/PdfAsFactory.java b/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/PdfAsFactory.java
index c09dbd40..431e5db2 100644
--- a/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/PdfAsFactory.java
+++ b/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/PdfAsFactory.java
@@ -1,131 +1,154 @@
-/**

- * <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;

-

-import java.io.File;

-

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

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

-import at.gv.egiz.pdfas.wrapper.PdfAsObject;

-

-/**

- * Main factory for creating a PDF-AS API Instance (PdfAs Interface).

- * 

- * @see PdfAs

- * 

- * @author wprinz

- */

-@Deprecated

-public class PdfAsFactory

-{

-   /**

-    * Creates a PDF-AS API instance for the given work directory.

-    * 

-    * @param workDirectory

-    *          The work directory. If <code>null</code> the configuration is assumed to be located

-    *          within the user's home directory. Note: IAIK JCE and IAIK ECC security provders are

-    *          automatically registered.

-    * 

-    * @return Returns an instance of the PDF-AS API.

-    * @throws IllegalArgumentException

-    *           Thrown, if the workDirectory doesn't exist.

-    * @throws PdfAsException

-    *           Thrown, if the work directory does not meet its requirements, or

-    *           if the config file is invalid.

-    * @see PdfAS#USERHOME_CONFIG_FOLDER          

-    */

-	@Deprecated

-   public static PdfAs createPdfAs(File workDirectory) throws PdfAsException

-   {

-      return new PdfAsObject(workDirectory);

-   }

-   

-   /**

-    * Creates a PDF-AS API instance for the given work directory.

-    * 

-    * WARNING registerProvider is IGNORED as ov Version 4.0

-    * 

-    * @param workDirectory

-    *          The work directory. If <code>null</code> the configuration is assumed to be located

-    *          within the user's home directory.

-    * 

-   * @param registerProvider <code>true</code>: automatically registers IAIK JCE and ECC Provider;

-   * <code>false</code>: providers will NOT be automatically registered, providers

-   * needed have to be registered by the API user 

-    * @return Returns an instance of the PDF-AS API.

-    * @throws IllegalArgumentException

-    *           Thrown, if the workDirectory doesn't exist.

-    * @throws PdfAsException

-    *           Thrown, if the work directory does not meet its requirements, or

-    *           if the config file is invalid.

-    * @see PdfAS#USERHOME_CONFIG_FOLDER          

-    */

-	@Deprecated

-   public static PdfAs createPdfAs(File workDirectory, boolean registerProvider) throws PdfAsException

-   {

-     return new PdfAsObject(workDirectory);

-   }

-   

-   /**

-    * Creates a PDF-AS API instance assuming that the configuration is located within the user's

-    * home directory. Note: IAIK JCE and IAIK ECC security providers are automatically registered.

-    * 

-    * @return Returns an instance of the PDF-AS API.

-    * @throws IllegalArgumentException

-    *           Thrown, if the work directory doesn't exist within the user's home directory.

-    * @throws PdfAsException

-    *           Thrown, if the work directory does not meet its requirements, or

-    *           if the config file is invalid.

-    * @see PdfAS#USERHOME_CONFIG_FOLDER          

-    */

-	@Deprecated

-   public static PdfAs createPdfAs() throws PdfAsException

-   {

-      return createPdfAs(new File(System.getProperty("user.home") + "/.pdfas/"));

-   }

-   

-   /**

-    * Creates a PDF-AS API instance assuming that the configuration is located within the user's

-    * home directory.

-    * 

-    * WARNING registerProvider is IGNORED as ov Version 4.0

-    * 

-    * @return Returns an instance of the PDF-AS API.

-    * @param registerProvider <code>true</code>: automatically registers IAIK JCE and ECC Provider;

-    * <code>false</code>: providers will NOT be automatically registered, providers

-    * needed have to be registered by the API user 

-    * @throws IllegalArgumentException

-    *           Thrown, if the work directory doesn't exist within the user's home directory.

-    * @throws PdfAsException

-    *           Thrown, if the work directory does not meet its requirements, or

-    *           if the config file is invalid.

-    * @see PdfAS#USERHOME_CONFIG_FOLDER          

-    */

-	@Deprecated

-   public static PdfAs createPdfAs(boolean registerProvider) throws PdfAsException

-   {

-     return createPdfAs(null, registerProvider);

-   }

-

-}

+/*******************************************************************************
+ * <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;
+
+import java.io.File;
+
+import at.gv.egiz.pdfas.api.PdfAs;
+import at.gv.egiz.pdfas.api.exceptions.PdfAsException;
+import at.gv.egiz.pdfas.wrapper.PdfAsObject;
+
+/**
+ * Main factory for creating a PDF-AS API Instance (PdfAs Interface).
+ * 
+ * @see PdfAs
+ * 
+ * @author wprinz
+ */
+@Deprecated
+public class PdfAsFactory
+{
+   /**
+    * Creates a PDF-AS API instance for the given work directory.
+    * 
+    * @param workDirectory
+    *          The work directory. If <code>null</code> the configuration is assumed to be located
+    *          within the user's home directory. Note: IAIK JCE and IAIK ECC security provders are
+    *          automatically registered.
+    * 
+    * @return Returns an instance of the PDF-AS API.
+    * @throws IllegalArgumentException
+    *           Thrown, if the workDirectory doesn't exist.
+    * @throws PdfAsException
+    *           Thrown, if the work directory does not meet its requirements, or
+    *           if the config file is invalid.
+    * @see PdfAS#USERHOME_CONFIG_FOLDER          
+    */
+	@Deprecated
+   public static PdfAs createPdfAs(File workDirectory) throws PdfAsException
+   {
+      return new PdfAsObject(workDirectory);
+   }
+   
+   /**
+    * Creates a PDF-AS API instance for the given work directory.
+    * 
+    * WARNING registerProvider is IGNORED as ov Version 4.0
+    * 
+    * @param workDirectory
+    *          The work directory. If <code>null</code> the configuration is assumed to be located
+    *          within the user's home directory.
+    * 
+   * @param registerProvider <code>true</code>: automatically registers IAIK JCE and ECC Provider;
+   * <code>false</code>: providers will NOT be automatically registered, providers
+   * needed have to be registered by the API user 
+    * @return Returns an instance of the PDF-AS API.
+    * @throws IllegalArgumentException
+    *           Thrown, if the workDirectory doesn't exist.
+    * @throws PdfAsException
+    *           Thrown, if the work directory does not meet its requirements, or
+    *           if the config file is invalid.
+    * @see PdfAS#USERHOME_CONFIG_FOLDER          
+    */
+	@Deprecated
+   public static PdfAs createPdfAs(File workDirectory, boolean registerProvider) throws PdfAsException
+   {
+     return new PdfAsObject(workDirectory);
+   }
+   
+   /**
+    * Creates a PDF-AS API instance assuming that the configuration is located within the user's
+    * home directory. Note: IAIK JCE and IAIK ECC security providers are automatically registered.
+    * 
+    * @return Returns an instance of the PDF-AS API.
+    * @throws IllegalArgumentException
+    *           Thrown, if the work directory doesn't exist within the user's home directory.
+    * @throws PdfAsException
+    *           Thrown, if the work directory does not meet its requirements, or
+    *           if the config file is invalid.
+    * @see PdfAS#USERHOME_CONFIG_FOLDER          
+    */
+	@Deprecated
+   public static PdfAs createPdfAs() throws PdfAsException
+   {
+      return createPdfAs(new File(System.getProperty("user.home") + "/.pdfas/"));
+   }
+   
+   /**
+    * Creates a PDF-AS API instance assuming that the configuration is located within the user's
+    * home directory.
+    * 
+    * WARNING registerProvider is IGNORED as ov Version 4.0
+    * 
+    * @return Returns an instance of the PDF-AS API.
+    * @param registerProvider <code>true</code>: automatically registers IAIK JCE and ECC Provider;
+    * <code>false</code>: providers will NOT be automatically registered, providers
+    * needed have to be registered by the API user 
+    * @throws IllegalArgumentException
+    *           Thrown, if the work directory doesn't exist within the user's home directory.
+    * @throws PdfAsException
+    *           Thrown, if the work directory does not meet its requirements, or
+    *           if the config file is invalid.
+    * @see PdfAS#USERHOME_CONFIG_FOLDER          
+    */
+	@Deprecated
+   public static PdfAs createPdfAs(boolean registerProvider) throws PdfAsException
+   {
+     return createPdfAs(null, registerProvider);
+   }
+
+}
diff --git a/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/PdfAs.java b/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/PdfAs.java
index 505360c1..f876a80a 100644
--- a/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/PdfAs.java
+++ b/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/PdfAs.java
@@ -1,302 +1,325 @@
-/**

- * <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;

-

-import java.util.List;

-

-import at.gv.egiz.pdfas.api.analyze.AnalyzeParameters;

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

-import at.gv.egiz.pdfas.api.commons.DynamicSignatureLifetimeEnum;

-import at.gv.egiz.pdfas.api.commons.DynamicSignatureProfile;

-import at.gv.egiz.pdfas.api.commons.SignatureProfile;

-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;

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

-import at.gv.egiz.pdfas.api.verify.VerifyResults;

-import at.gv.egiz.pdfas.api.xmldsig.ReconstructXMLDsigAfterAnalysisParameters;

-import at.gv.egiz.pdfas.api.xmldsig.ReconstructXMLDsigParameters;

-import at.gv.egiz.pdfas.api.xmldsig.ReconstructXMLDsigResult;

-

-/**

- * The PDF-AS API main interface.

- * 

- * <p>

- * Create an Object implementing this interface using the proper factory.

- * </p>

- * 

- * @author wprinz

- * @author exthex

- */

-@Deprecated

-public interface PdfAs

-{

-// 23.11.2010 changed by exthex - added:

-// reconstructXMLDSIG(ReconstructXMLDsigParameters reconstructXMLDsigParameters)

-// reconstructXMLDSIG(ReconstructXMLDsigAfterAnalysisParameters reconstructXMLDsigParameters)

-// verify(VerifyAfterReconstructXMLDsigParameters verifyAfterReconstructXMLDsigParameters)

-

-// 16.12.2010 changed by exthex - added:

-// prepareSign(SignParameters signParameters)

-// sign(SignParameters signParameters, SignatureDetailInformation signatureDetailInformation)

-// finishSign(SignParameters signParameters, SignatureDetailInformation signatureDetailInformation)

-

-  /**

-   * Signs a PDF document using PDF-AS.

-   * 

-   * @param signParameters

-   *          The sign parameters.

-   * @return Returns the signed document plus additional information.

-   * @throws PdfAsException

-   *           Thrown, if an error occurs.

-   * 

-   * @see SignParameters

-   * @see SignResult

-   */

-	@Deprecated

-  public SignResult sign(SignParameters signParameters) throws PdfAsException;

-

-  /**

-   * Signs a PDF document using PDF-AS.<br/>

-   * This uses the {@link SignatorInformation} which was obtained by a call to {@link PdfAs#prepareSign(SignParameters)}

-   * 

-   * @param signParameters

-   *          The sign parameters.

-   * @param signatureDetailInformation

-   *          The signature information which was previously obtained by a call to {@link PdfAs#prepareSign(SignParameters)}

-   * @return Returns the signed document plus additional information.

-   * @throws PdfAsException

-   *           Thrown, if an error occurs.

-   * 

-   * @see SignParameters

-   * @see SignResult

-   */

-	@Deprecated

-  public SignResult sign(SignParameters signParameters, SignatureDetailInformation signatureDetailInformation) throws PdfAsException;

-

-  /**

-   * Verifies a document with (potentially multiple) PDF-AS signatures.

-   * 

-   * @param verifyParameters

-   *          The verify parameters.

-   * @return Returns the verification results.

-   * @throws PdfAsException

-   *           Thrown, if an error occurs.

-   * 

-   * @see VerifyParameters

-   * @see VerifyResults

-   * @see VerifyResult

-   */

-	@Deprecated

-  public VerifyResults verify(VerifyParameters verifyParameters) throws PdfAsException;

-

-  /**

-   * Analyzes a document for signatures and returns a verify-able list of such.

-   * 

-   * @param analyzeParameters

-   *          The analyzation parameters.

-   * @return Returns a list of verify-able signatures that were found in the

-   *         document.

-   * @throws PdfAsException

-   *           Thrown on error.

-   * 

-   * @see AnalyzeParameters

-   * @see AnalyzeResult

-   * @see {@link #verify(AnalyzeResult)}

-   */

-	@Deprecated

-  public AnalyzeResult analyze(AnalyzeParameters analyzeParameters) throws PdfAsException;

-

-  /**

-   * Reconstruct the <xmldsig:Signature> from the given parameters.

-   * 

-   * @param reconstructXMLDsigParameters

-   *         The data from which to reconstruct the xmldsig

-   * @return a list of xmldsigs, one for each signature in the document

-   * @throws PdfAsException if the reconstruction fails

-   */

-	@Deprecated

-  public ReconstructXMLDsigResult reconstructXMLDSIG(ReconstructXMLDsigParameters reconstructXMLDsigParameters) throws PdfAsException;

-

-  /**

-   * Reconstruct the <xmldsig:Signature> from the given parameters.

-   * 

-   * @param reconstructXMLDsigParameters

-   *         The data from which to reconstruct the xmldsigs

-   * @return a list of xmldsigs, one for each signature in the document

-   * @throws PdfAsException

-   */

-	@Deprecated

-  public ReconstructXMLDsigResult reconstructXMLDSIG(ReconstructXMLDsigAfterAnalysisParameters reconstructXMLDsigParameters) throws PdfAsException;

-  

-  /**

-   * Verifies a list of signatures that have been analyzed previously.

-   * 

-   * @param verifyAfterAnalysisParameters The parameters.

-   * 

-   * @return Returns the verification results.

-   * @throws PdfAsException

-   *           Thrown on error.

-   * 

-   * @see AnalyzeResult

-   * @see VerifyAfterAnalysisParameters

-   * @see VerifyResults

-   * @see VerifyResult

-   * @see {@link #analyze(AnalyzeParameters)}

-   */

-	@Deprecated

-  public VerifyResults verify(VerifyAfterAnalysisParameters verifyAfterAnalysisParameters) throws PdfAsException;

-

-  /**

-   * Verifies a list of signatures that have been analyzed previously and the xmldsigs have been reconstructed.

-   * 

-   * @param verifyAfterReconstructXMLDsigParameters

-   *           The parameters.

-   * @return the verification results.

-   * @throws PdfAsException

-   *           Thrown on error.

-   */

-	@Deprecated

-  public VerifyResults verify(VerifyAfterReconstructXMLDsigParameters verifyAfterReconstructXMLDsigParameters) throws PdfAsException;

-  

-  /**

-   * Reloads the configuration from the work directory.

-   * 

-   * @throws PdfAsException

-   *           Thrown, if an error occurs.

-   */

-	@Deprecated

-  public void reloadConfig() throws PdfAsException;

-

-  /**

-   * Returns the list of information objects about activated profiles available in the

-   * configuration.

-   * 

-   * <p>

-   * Note: Currently the profile information consists of the profile Id and the

-   * MOA Key Id only.

-   * </p>

-   * <p>

-   * Note: In near future the profile management will be moved out of the config

-   * file into an API class representation of the profiles which may render this

-   * (and related) methods obsolete.

-   * </p>

-   * 

-   * @return Returns the list of {@link SignatureProfile} objects with

-   *         information about active profiles available in the configuration.

-   * @throws PdfAsException

-   *           Thrown on error.

-   * 

-   * @see SignatureProfile

-   */

-	@Deprecated

-  public List getProfileInformation() throws PdfAsException;

-

-  /**

-   * Create a signature profile dynamically. You have do apply() it for usage. See {@link SignatureProfile}.

-   * @param parentProfile a parent profile id to inherit all properties

-   * @param mode lifetime mode

-   * @return the created signature profile to work with.

-   */

-	@Deprecated

-  public DynamicSignatureProfile createDynamicSignatureProfile(String parentProfile, DynamicSignatureLifetimeEnum mode);

-

-  /**

-   * Create a signature profile dynamically. You have to provide a unique name and have do apply() it for usage. See {@link SignatureProfile}.

-   * It is recommended to use {@link #createDynamicSignatureProfile(String, DynamicSignatureLifetimeEnum)} that generates 

-   * a unique name on its own.

-   * @see DynamicSignatureProfile

-   * @param parentProfile a parent profile id to inherit all properties

-   * @param myUniqueName a unique name for the profile

-   * @param mode lifetime mode

-   * @return the created signature profile to work with.

-   */

-	@Deprecated

-  public DynamicSignatureProfile createDynamicSignatureProfile(String myUniqueName, String parentProfile, DynamicSignatureLifetimeEnum mode);

-  

-  /**

-   * Create a signature profile dynamically. You have fill it with properties and apply() it for usage. See {@link SignatureProfile}.

-   * <br> 

-   * It is recommended to use {@link #createDynamicSignatureProfile(String, DynamicSignatureLifetimeEnum)} that inherits from an 

-   * existing profile saving you a lot of work.

-   * @param mode lifetime mode

-   * @return the created signature profile to work with.

-   * @see DynamicSignatureProfile

-   */

-	@Deprecated

-  public DynamicSignatureProfile createEmptyDynamicSignatureProfile(DynamicSignatureLifetimeEnum mode);

-  

-  /**

-   * Create a signature profile dynamically. You have fill it with properties and apply() it for usage. See {@link SignatureProfile}.

-   * <br> 

-   * It is recommended to use {@link #createDynamicSignatureProfile(String, DynamicSignatureLifetimeEnum)} that inherits from an 

-   * existing profile saving you a lot of work.

-   * @param myUniqueName a unique name for the profile

-   * @param mode lifetime mode

-   * @return the created signature profile to work with.

-   */

-	@Deprecated

-  public DynamicSignatureProfile createEmptyDynamicSignatureProfile(String myUniqueName, DynamicSignatureLifetimeEnum mode);

-

-  /**

-   * Loads an existing dynamic signature profile by its name. Profiles are saved when they are applied 

-   * and it has {@link DynamicSignatureLifetimeEnum#MANUAL}

-   * @param profileName

-   * @return the signature profile or <code>null</code> if not found.

-   * @see DynamicSignatureProfile

-   */

-	@Deprecated

-  public DynamicSignatureProfile loadDynamicSignatureProfile(String profileName);

-  

-  /**

-   * Prepares the signature of the given PDF document. The table for the signature data is placed but not filled.<br/>

-   * Usually used for preview.

-   * 

-   * @param signParameters

-   *          The sign parameters.

-   * @return Only the {@link SignatureDetailInformation#getSignaturePosition()}, {@link SignatureDetailInformation#getNonTextualObjects()}, {@link SignatureDetailInformation#getSignatureData()} are filled.

-   * @throws PdfAsException if something goes wrong during the process

-   */

-	@Deprecated

-  public SignatureDetailInformation prepareSign(SignParameters signParameters) throws PdfAsException;

-  

-  /**

-   * Finish the signature process. The PDF is filled with the signature data.<br/>

-   * Usually used if some steps like the actual signing are to be performed externally.

-   * 

-   * @param signParameters

-   *          The sign parameters.

-   * @param signatureDetailInformation

-   *          The signature detail information.

-   * @return

-   * @throws PdfAsException

-   */

-	@Deprecated

-  public SignResult finishSign(SignParameters signParameters, SignatureDetailInformation signatureDetailInformation) throws PdfAsException;

-

-}

+/*******************************************************************************
+ * <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;
+
+import java.util.List;
+
+import at.gv.egiz.pdfas.api.analyze.AnalyzeParameters;
+import at.gv.egiz.pdfas.api.analyze.AnalyzeResult;
+import at.gv.egiz.pdfas.api.commons.DynamicSignatureLifetimeEnum;
+import at.gv.egiz.pdfas.api.commons.DynamicSignatureProfile;
+import at.gv.egiz.pdfas.api.commons.SignatureProfile;
+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;
+import at.gv.egiz.pdfas.api.verify.VerifyResult;
+import at.gv.egiz.pdfas.api.verify.VerifyResults;
+import at.gv.egiz.pdfas.api.xmldsig.ReconstructXMLDsigAfterAnalysisParameters;
+import at.gv.egiz.pdfas.api.xmldsig.ReconstructXMLDsigParameters;
+import at.gv.egiz.pdfas.api.xmldsig.ReconstructXMLDsigResult;
+
+/**
+ * The PDF-AS API main interface.
+ * 
+ * <p>
+ * Create an Object implementing this interface using the proper factory.
+ * </p>
+ * 
+ * @author wprinz
+ * @author exthex
+ */
+@Deprecated
+public interface PdfAs
+{
+// 23.11.2010 changed by exthex - added:
+// reconstructXMLDSIG(ReconstructXMLDsigParameters reconstructXMLDsigParameters)
+// reconstructXMLDSIG(ReconstructXMLDsigAfterAnalysisParameters reconstructXMLDsigParameters)
+// verify(VerifyAfterReconstructXMLDsigParameters verifyAfterReconstructXMLDsigParameters)
+
+// 16.12.2010 changed by exthex - added:
+// prepareSign(SignParameters signParameters)
+// sign(SignParameters signParameters, SignatureDetailInformation signatureDetailInformation)
+// finishSign(SignParameters signParameters, SignatureDetailInformation signatureDetailInformation)
+
+  /**
+   * Signs a PDF document using PDF-AS.
+   * 
+   * @param signParameters
+   *          The sign parameters.
+   * @return Returns the signed document plus additional information.
+   * @throws PdfAsException
+   *           Thrown, if an error occurs.
+   * 
+   * @see SignParameters
+   * @see SignResult
+   */
+	@Deprecated
+  public SignResult sign(SignParameters signParameters) throws PdfAsException;
+
+  /**
+   * Signs a PDF document using PDF-AS.<br/>
+   * This uses the {@link SignatorInformation} which was obtained by a call to {@link PdfAs#prepareSign(SignParameters)}
+   * 
+   * @param signParameters
+   *          The sign parameters.
+   * @param signatureDetailInformation
+   *          The signature information which was previously obtained by a call to {@link PdfAs#prepareSign(SignParameters)}
+   * @return Returns the signed document plus additional information.
+   * @throws PdfAsException
+   *           Thrown, if an error occurs.
+   * 
+   * @see SignParameters
+   * @see SignResult
+   */
+	@Deprecated
+  public SignResult sign(SignParameters signParameters, SignatureDetailInformation signatureDetailInformation) throws PdfAsException;
+
+  /**
+   * Verifies a document with (potentially multiple) PDF-AS signatures.
+   * 
+   * @param verifyParameters
+   *          The verify parameters.
+   * @return Returns the verification results.
+   * @throws PdfAsException
+   *           Thrown, if an error occurs.
+   * 
+   * @see VerifyParameters
+   * @see VerifyResults
+   * @see VerifyResult
+   */
+	@Deprecated
+  public VerifyResults verify(VerifyParameters verifyParameters) throws PdfAsException;
+
+  /**
+   * Analyzes a document for signatures and returns a verify-able list of such.
+   * 
+   * @param analyzeParameters
+   *          The analyzation parameters.
+   * @return Returns a list of verify-able signatures that were found in the
+   *         document.
+   * @throws PdfAsException
+   *           Thrown on error.
+   * 
+   * @see AnalyzeParameters
+   * @see AnalyzeResult
+   * @see {@link #verify(AnalyzeResult)}
+   */
+	@Deprecated
+  public AnalyzeResult analyze(AnalyzeParameters analyzeParameters) throws PdfAsException;
+
+  /**
+   * Reconstruct the <xmldsig:Signature> from the given parameters.
+   * 
+   * @param reconstructXMLDsigParameters
+   *         The data from which to reconstruct the xmldsig
+   * @return a list of xmldsigs, one for each signature in the document
+   * @throws PdfAsException if the reconstruction fails
+   */
+	@Deprecated
+  public ReconstructXMLDsigResult reconstructXMLDSIG(ReconstructXMLDsigParameters reconstructXMLDsigParameters) throws PdfAsException;
+
+  /**
+   * Reconstruct the <xmldsig:Signature> from the given parameters.
+   * 
+   * @param reconstructXMLDsigParameters
+   *         The data from which to reconstruct the xmldsigs
+   * @return a list of xmldsigs, one for each signature in the document
+   * @throws PdfAsException
+   */
+	@Deprecated
+  public ReconstructXMLDsigResult reconstructXMLDSIG(ReconstructXMLDsigAfterAnalysisParameters reconstructXMLDsigParameters) throws PdfAsException;
+  
+  /**
+   * Verifies a list of signatures that have been analyzed previously.
+   * 
+   * @param verifyAfterAnalysisParameters The parameters.
+   * 
+   * @return Returns the verification results.
+   * @throws PdfAsException
+   *           Thrown on error.
+   * 
+   * @see AnalyzeResult
+   * @see VerifyAfterAnalysisParameters
+   * @see VerifyResults
+   * @see VerifyResult
+   * @see {@link #analyze(AnalyzeParameters)}
+   */
+	@Deprecated
+  public VerifyResults verify(VerifyAfterAnalysisParameters verifyAfterAnalysisParameters) throws PdfAsException;
+
+  /**
+   * Verifies a list of signatures that have been analyzed previously and the xmldsigs have been reconstructed.
+   * 
+   * @param verifyAfterReconstructXMLDsigParameters
+   *           The parameters.
+   * @return the verification results.
+   * @throws PdfAsException
+   *           Thrown on error.
+   */
+	@Deprecated
+  public VerifyResults verify(VerifyAfterReconstructXMLDsigParameters verifyAfterReconstructXMLDsigParameters) throws PdfAsException;
+  
+  /**
+   * Reloads the configuration from the work directory.
+   * 
+   * @throws PdfAsException
+   *           Thrown, if an error occurs.
+   */
+	@Deprecated
+  public void reloadConfig() throws PdfAsException;
+
+  /**
+   * Returns the list of information objects about activated profiles available in the
+   * configuration.
+   * 
+   * <p>
+   * Note: Currently the profile information consists of the profile Id and the
+   * MOA Key Id only.
+   * </p>
+   * <p>
+   * Note: In near future the profile management will be moved out of the config
+   * file into an API class representation of the profiles which may render this
+   * (and related) methods obsolete.
+   * </p>
+   * 
+   * @return Returns the list of {@link SignatureProfile} objects with
+   *         information about active profiles available in the configuration.
+   * @throws PdfAsException
+   *           Thrown on error.
+   * 
+   * @see SignatureProfile
+   */
+	@Deprecated
+  public List getProfileInformation() throws PdfAsException;
+
+  /**
+   * Create a signature profile dynamically. You have do apply() it for usage. See {@link SignatureProfile}.
+   * @param parentProfile a parent profile id to inherit all properties
+   * @param mode lifetime mode
+   * @return the created signature profile to work with.
+   */
+	@Deprecated
+  public DynamicSignatureProfile createDynamicSignatureProfile(String parentProfile, DynamicSignatureLifetimeEnum mode);
+
+  /**
+   * Create a signature profile dynamically. You have to provide a unique name and have do apply() it for usage. See {@link SignatureProfile}.
+   * It is recommended to use {@link #createDynamicSignatureProfile(String, DynamicSignatureLifetimeEnum)} that generates 
+   * a unique name on its own.
+   * @see DynamicSignatureProfile
+   * @param parentProfile a parent profile id to inherit all properties
+   * @param myUniqueName a unique name for the profile
+   * @param mode lifetime mode
+   * @return the created signature profile to work with.
+   */
+	@Deprecated
+  public DynamicSignatureProfile createDynamicSignatureProfile(String myUniqueName, String parentProfile, DynamicSignatureLifetimeEnum mode);
+  
+  /**
+   * Create a signature profile dynamically. You have fill it with properties and apply() it for usage. See {@link SignatureProfile}.
+   * <br> 
+   * It is recommended to use {@link #createDynamicSignatureProfile(String, DynamicSignatureLifetimeEnum)} that inherits from an 
+   * existing profile saving you a lot of work.
+   * @param mode lifetime mode
+   * @return the created signature profile to work with.
+   * @see DynamicSignatureProfile
+   */
+	@Deprecated
+  public DynamicSignatureProfile createEmptyDynamicSignatureProfile(DynamicSignatureLifetimeEnum mode);
+  
+  /**
+   * Create a signature profile dynamically. You have fill it with properties and apply() it for usage. See {@link SignatureProfile}.
+   * <br> 
+   * It is recommended to use {@link #createDynamicSignatureProfile(String, DynamicSignatureLifetimeEnum)} that inherits from an 
+   * existing profile saving you a lot of work.
+   * @param myUniqueName a unique name for the profile
+   * @param mode lifetime mode
+   * @return the created signature profile to work with.
+   */
+	@Deprecated
+  public DynamicSignatureProfile createEmptyDynamicSignatureProfile(String myUniqueName, DynamicSignatureLifetimeEnum mode);
+
+  /**
+   * Loads an existing dynamic signature profile by its name. Profiles are saved when they are applied 
+   * and it has {@link DynamicSignatureLifetimeEnum#MANUAL}
+   * @param profileName
+   * @return the signature profile or <code>null</code> if not found.
+   * @see DynamicSignatureProfile
+   */
+	@Deprecated
+  public DynamicSignatureProfile loadDynamicSignatureProfile(String profileName);
+  
+  /**
+   * Prepares the signature of the given PDF document. The table for the signature data is placed but not filled.<br/>
+   * Usually used for preview.
+   * 
+   * @param signParameters
+   *          The sign parameters.
+   * @return Only the {@link SignatureDetailInformation#getSignaturePosition()}, {@link SignatureDetailInformation#getNonTextualObjects()}, {@link SignatureDetailInformation#getSignatureData()} are filled.
+   * @throws PdfAsException if something goes wrong during the process
+   */
+	@Deprecated
+  public SignatureDetailInformation prepareSign(SignParameters signParameters) throws PdfAsException;
+  
+  /**
+   * Finish the signature process. The PDF is filled with the signature data.<br/>
+   * Usually used if some steps like the actual signing are to be performed externally.
+   * 
+   * @param signParameters
+   *          The sign parameters.
+   * @param signatureDetailInformation
+   *          The signature detail information.
+   * @return
+   * @throws PdfAsException
+   */
+	@Deprecated
+  public SignResult finishSign(SignParameters signParameters, SignatureDetailInformation signatureDetailInformation) throws PdfAsException;
+
+}
diff --git a/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/analyze/AnalyzeParameters.java b/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/analyze/AnalyzeParameters.java
index 164aa464..ca782f81 100644
--- a/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/analyze/AnalyzeParameters.java
+++ b/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/analyze/AnalyzeParameters.java
@@ -1,108 +1,131 @@
-/**

- * <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.analyze;

-

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

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

-

-/**

- * Parameter object that holds the analyze parameters.

- * 

- * @author wprinz

- */

-@Deprecated

-public class AnalyzeParameters

-{

-

-  /**

-   * The document to be analyzed.

-   */

-  protected DataSource document = null;

-

-  /**

-   * 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;

-

-  protected boolean returnNonTextualObjects = false;

-  

-  protected boolean hasBeenCorrected = 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 verifyMode

-   */

-  public String getVerifyMode()

-  {

-    return this.verifyMode;

-  }

-

-  /**

-   * @param verifyMode the verifyMode to set

-   */

-  public void setVerifyMode(String verifyMode)

-  {

-    this.verifyMode = verifyMode;

-  }

-

-  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.analyze;
+
+import at.gv.egiz.pdfas.api.commons.Constants;
+import at.gv.egiz.pdfas.api.io.DataSource;
+
+/**
+ * Parameter object that holds the analyze parameters.
+ * 
+ * @author wprinz
+ */
+@Deprecated
+public class AnalyzeParameters
+{
+
+  /**
+   * The document to be analyzed.
+   */
+  protected DataSource document = null;
+
+  /**
+   * 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;
+
+  protected boolean returnNonTextualObjects = false;
+  
+  protected boolean hasBeenCorrected = 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 verifyMode
+   */
+  public String getVerifyMode()
+  {
+    return this.verifyMode;
+  }
+
+  /**
+   * @param verifyMode the verifyMode to set
+   */
+  public void setVerifyMode(String verifyMode)
+  {
+    this.verifyMode = verifyMode;
+  }
+
+  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/analyze/AnalyzeResult.java b/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/analyze/AnalyzeResult.java
index 43c23190..a371c21b 100644
--- a/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/analyze/AnalyzeResult.java
+++ b/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/analyze/AnalyzeResult.java
@@ -1,64 +1,87 @@
-/**

- * <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.analyze;

-

-import java.util.List;

-

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

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

-

-/**

- * The result of an analyze operation, which is a list of verifyable signatures.

- * 

- * @author wprinz

- * 

- */

-@Deprecated

-public interface AnalyzeResult

-{

-  /**

-   * Returns the list of found signatures.

-   * 

-   * @return Returns a list of {@link SignatureInformation} objects representing all

-   *         found signatures.

-   * @throws PdfAsException

-   *           Thrown on error.

-   * 

-   * @see SignatureInformation

-   */

-  public List getSignatures() throws PdfAsException;

-  

-  public List getNoSignatures();

-  

-  /**

-   * Tells if the document has been corrected before verification. The correction maybe done

-   * after a first failing parse to repair a document (if enabled in the configuration 

-   * <code>correct_document_on_verify_if_necessary</code>). The correction can only work for textual 

-   * signatures. Binary signatures are lost anyhow.

-   * @return

-   */

-  public boolean hasBeenCorrected();

-

-  

-}

+/*******************************************************************************
+ * <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.analyze;
+
+import java.util.List;
+
+import at.gv.egiz.pdfas.api.commons.SignatureInformation;
+import at.gv.egiz.pdfas.api.exceptions.PdfAsException;
+
+/**
+ * The result of an analyze operation, which is a list of verifyable signatures.
+ * 
+ * @author wprinz
+ * 
+ */
+@Deprecated
+public interface AnalyzeResult
+{
+  /**
+   * Returns the list of found signatures.
+   * 
+   * @return Returns a list of {@link SignatureInformation} objects representing all
+   *         found signatures.
+   * @throws PdfAsException
+   *           Thrown on error.
+   * 
+   * @see SignatureInformation
+   */
+  public List getSignatures() throws PdfAsException;
+  
+  public List getNoSignatures();
+  
+  /**
+   * Tells if the document has been corrected before verification. The correction maybe done
+   * after a first failing parse to repair a document (if enabled in the configuration 
+   * <code>correct_document_on_verify_if_necessary</code>). The correction can only work for textual 
+   * signatures. Binary signatures are lost anyhow.
+   * @return
+   */
+  public boolean hasBeenCorrected();
+
+  
+}
diff --git a/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/analyze/NonTextObjectInfo.java b/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/analyze/NonTextObjectInfo.java
index 311cff45..fdc5880b 100644
--- a/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/analyze/NonTextObjectInfo.java
+++ b/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/analyze/NonTextObjectInfo.java
@@ -1,100 +1,123 @@
-/**

- * <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.analyze;

-

-/**

- * Encapsulates information about non textual objects in a pdf document.

- * 

- * @author dferbas

- *

- */

-@Deprecated

-public class NonTextObjectInfo {

-   public static final String TYPE_IMAGE = "image";

-   public static final String TYPE_ANNOTATION = "annotation";

-   

-   private String objectType;

-   private String subType;

-   private String name;

-   private int pageNr;

-   private double width;

-   private double height;

-   

-   public String getObjectType() {

-      return this.objectType;

-   }

-   

-   public void setObjectType(String objectType) {

-      this.objectType = objectType;

-   }

-   

-   public String getName() {

-      return this.name;

-   }

-   

-   public void setName(String name) {

-      this.name = name;

-   }

-   

-   public int getPageNr() {

-      return this.pageNr;

-   }

-   

-   public void setPageNr(int pageNr) {

-      this.pageNr = pageNr;

-   }

-   

-   public double getWidth() {

-      return this.width;

-   }

-   

-   public void setWidth(double width) {

-      this.width = width;

-   }

-   

-   public double getHeight() {

-      return this.height;

-   }

-   

-   public void setHeight(double height) {

-      this.height = height;

-   }

-   

-   public String getSubType() {

-      return this.subType;

-   }

-

-   public void setSubType(String subType) {

-      this.subType = subType;

-   }

-   

-   

-

-   public String toString() {

-      return "NonTextObjectInfo [height=" + this.height + ", name=" + this.name + ", objectType="

-            + this.objectType + ", pageNr=" + this.pageNr + ", subType=" + this.subType

-            + ", width=" + this.width + "]";

-   }  

-

-}

+/*******************************************************************************
+ * <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.analyze;
+
+/**
+ * Encapsulates information about non textual objects in a pdf document.
+ * 
+ * @author dferbas
+ *
+ */
+@Deprecated
+public class NonTextObjectInfo {
+   public static final String TYPE_IMAGE = "image";
+   public static final String TYPE_ANNOTATION = "annotation";
+   
+   private String objectType;
+   private String subType;
+   private String name;
+   private int pageNr;
+   private double width;
+   private double height;
+   
+   public String getObjectType() {
+      return this.objectType;
+   }
+   
+   public void setObjectType(String objectType) {
+      this.objectType = objectType;
+   }
+   
+   public String getName() {
+      return this.name;
+   }
+   
+   public void setName(String name) {
+      this.name = name;
+   }
+   
+   public int getPageNr() {
+      return this.pageNr;
+   }
+   
+   public void setPageNr(int pageNr) {
+      this.pageNr = pageNr;
+   }
+   
+   public double getWidth() {
+      return this.width;
+   }
+   
+   public void setWidth(double width) {
+      this.width = width;
+   }
+   
+   public double getHeight() {
+      return this.height;
+   }
+   
+   public void setHeight(double height) {
+      this.height = height;
+   }
+   
+   public String getSubType() {
+      return this.subType;
+   }
+
+   public void setSubType(String subType) {
+      this.subType = subType;
+   }
+   
+   
+
+   public String toString() {
+      return "NonTextObjectInfo [height=" + this.height + ", name=" + this.name + ", objectType="
+            + this.objectType + ", pageNr=" + this.pageNr + ", subType=" + this.subType
+            + ", width=" + this.width + "]";
+   }  
+
+}
diff --git a/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/commons/Constants.java b/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/commons/Constants.java
index 568787b4..136e0d70 100644
--- a/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/commons/Constants.java
+++ b/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/commons/Constants.java
@@ -1,190 +1,213 @@
-/**

- * <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.commons;

-

-

-/**

- * Contains commonly used constants.

- *

- * @author wprinz

- */

-@Deprecated

-public final class Constants

-{

-

-  /**

-   * Hidden default constructor.

-   */

-  private Constants()

-  {

-    // empty

-  }

-

-  /**

-   * A binary signature.

-   * This value should not be modified due to external dependencies!

-   */

-  public static final String SIGNATURE_TYPE_BINARY = "binary";

-

-  /**

-   * A textual signature.

-   * This value should not be modified due to external dependencies!

-   */

-  public static final String SIGNATURE_TYPE_TEXTUAL = "textual";

-

-  /**

-   * The default signature type (one of "textual", "binary", "detachedtextual").

-   */

-  public static final String DEFAULT_SIGNATURE_TYPE = SIGNATURE_TYPE_BINARY;

-

-  /**

-   * A "detached" textual signature.

-   *

-   * <p>

-   * The document text is signed, but instead of returning the pdf with the signature block,

-   * the sign result XML of the connector is returned.

-   * </p>

-   */

-  public static final String SIGNATURE_TYPE_DETACHEDTEXTUAL = "detachedtextual";

-

-  /**

-   * The signature device moa.

-   * This value should not be modified due to external dependencies!

-   */

-  public static final String SIGNATURE_DEVICE_MOA = "moa";

-

-  /**

-   * The signature device bku.

-   * This value should not be modified due to external dependencies!

-   */

-  public static final String SIGNATURE_DEVICE_BKU = "bku";

-

-  /**

-   * The signature device a1.

-   * This value should not be modified due to external dependencies!

-   */

-  public static final String SIGNATURE_DEVICE_A1 = "a1";

-

-  /**

-   * The signature device MOCCA (online bku).

-   * This value should not be modified due to external dependencies!

-   */

-  public static final String SIGNATURE_DEVICE_MOC = "moc";

-

-  /**

-   * Added by rpiazzi

-   * The signature device MOBILE.

-   * This value should not be modified due to external dependencies!

-   */

-  public static final String SIGNATURE_DEVICE_MOBILE = "mobile";

-

-  /**

-   * Added by rpiazzi

-   * The signature device MOBILETEST for the test version of the MOBILE CCS.

-   * This value should not be modified due to external dependencies!

-   */

-  public static final String SIGNATURE_DEVICE_MOBILETEST = "mobiletest";

-

-  /**

-   * Only binary signatures are verified.

-   */

-  public static final String VERIFY_MODE_BINARY_ONLY = "binaryOnly";

-

-  /**

-   * Binary and textual signatures are verified with time optimization.

-   *

-   * <p>

-   * This mode of operation tries to minimize the numbers of text extractions,

-   * which are very time intensive, at the cost of some rare cases, in which some

-   * signatures may not be found.

-   * </p>

-   */

-  public static final String VERIFY_MODE_SEMI_CONSERVATIVE = "semiConservative";

-

-  /**

-   * Binary and textual signatures are verified.

-   */

-  public static final String VERIFY_MODE_FULL_CONSERVATIVE = "fullConservative";

-

-  /**

-   * All signatures are verified.

-   */

-  public static final int VERIFY_ALL = -1;

-

-  /**

-   * The system property that may be used to declare the pdf-as configuration folder.

-   */

-  public static final String CONFIG_DIR_SYSTEM_PROPERTY = "pdf-as.work-dir";

-

-  /**

-   * The zip file containing the default configuration.

-   */

-  public static final String DEFAULT_CONFIGURATION_ZIP_RESOURCE = "DefaultConfiguration.zip";

-

-  /**

-   * The configuration folder for pdf-as within the user's home folder.

-   */

-  public static final String USERHOME_CONFIG_FOLDER = "PDF-AS";

-

-  /**

-   * The name of the directory, where temporary files are stored.

-   */

-  public static final String TEMP_DIR_NAME = "pdfastmp";

-

-  public static final String BKU_HEADER_SIGNATURE_LAYOUT = "SignatureLayout";

-

-  public static final String ADOBE_SIG_FILTER = "Adobe.PDF-AS";

-

-  /**

-   * Strict matching mode for placeholder extraction.<br/>

-   * If the placeholder with the given id is not found in the document, an exception will be thrown.

-   */

-  public static final int PLACEHOLDER_MATCH_MODE_STRICT = 0;

-

-  /**

-   * A moderate matching mode for placeholder extraction.<br/>

-   * If the placeholder with the given id is not found in the document, the first placeholder without an id will be taken.<br/>

-   * If there is no such placeholder, the signature will be placed as usual, according to the pos parameter of the signature profile used.

-   */

-  public static final int PLACEHOLDER_MATCH_MODE_MODERATE = 1;

-

-  /**

-   * A more lenient matching mode for placeholder extraction.<br/>

-   * If the placeholder with the given id is not found in the document, the first found placeholder will be taken, regardless if it has an id set, or not.<br/>

-   * If there is no placeholder at all, the signature will be placed as usual, according to the pos parameter of the signature profile used.

-   */

-  public static final int PLACEHOLDER_MATCH_MODE_LENIENT = 2;

-

-  /**

-   * Identifier for QR based placeholders.

-   */

-  public static final String QR_PLACEHOLDER_IDENTIFIER = "PDF-AS-POS";

-

-  /**

-   * The name of a logger used for statistical logging.

-   */

-  public static final String STATISTIC_LOGGER_NAME = "statistic";

-

-}

-

+/*******************************************************************************
+ * <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.commons;
+
+
+/**
+ * Contains commonly used constants.
+ *
+ * @author wprinz
+ */
+@Deprecated
+public final class Constants
+{
+
+  /**
+   * Hidden default constructor.
+   */
+  private Constants()
+  {
+    // empty
+  }
+
+  /**
+   * A binary signature.
+   * This value should not be modified due to external dependencies!
+   */
+  public static final String SIGNATURE_TYPE_BINARY = "binary";
+
+  /**
+   * A textual signature.
+   * This value should not be modified due to external dependencies!
+   */
+  public static final String SIGNATURE_TYPE_TEXTUAL = "textual";
+
+  /**
+   * The default signature type (one of "textual", "binary", "detachedtextual").
+   */
+  public static final String DEFAULT_SIGNATURE_TYPE = SIGNATURE_TYPE_BINARY;
+
+  /**
+   * A "detached" textual signature.
+   *
+   * <p>
+   * The document text is signed, but instead of returning the pdf with the signature block,
+   * the sign result XML of the connector is returned.
+   * </p>
+   */
+  public static final String SIGNATURE_TYPE_DETACHEDTEXTUAL = "detachedtextual";
+
+  /**
+   * The signature device moa.
+   * This value should not be modified due to external dependencies!
+   */
+  public static final String SIGNATURE_DEVICE_MOA = "moa";
+
+  /**
+   * The signature device bku.
+   * This value should not be modified due to external dependencies!
+   */
+  public static final String SIGNATURE_DEVICE_BKU = "bku";
+
+  /**
+   * The signature device a1.
+   * This value should not be modified due to external dependencies!
+   */
+  public static final String SIGNATURE_DEVICE_A1 = "a1";
+
+  /**
+   * The signature device MOCCA (online bku).
+   * This value should not be modified due to external dependencies!
+   */
+  public static final String SIGNATURE_DEVICE_MOC = "moc";
+
+  /**
+   * Added by rpiazzi
+   * The signature device MOBILE.
+   * This value should not be modified due to external dependencies!
+   */
+  public static final String SIGNATURE_DEVICE_MOBILE = "mobile";
+
+  /**
+   * Added by rpiazzi
+   * The signature device MOBILETEST for the test version of the MOBILE CCS.
+   * This value should not be modified due to external dependencies!
+   */
+  public static final String SIGNATURE_DEVICE_MOBILETEST = "mobiletest";
+
+  /**
+   * Only binary signatures are verified.
+   */
+  public static final String VERIFY_MODE_BINARY_ONLY = "binaryOnly";
+
+  /**
+   * Binary and textual signatures are verified with time optimization.
+   *
+   * <p>
+   * This mode of operation tries to minimize the numbers of text extractions,
+   * which are very time intensive, at the cost of some rare cases, in which some
+   * signatures may not be found.
+   * </p>
+   */
+  public static final String VERIFY_MODE_SEMI_CONSERVATIVE = "semiConservative";
+
+  /**
+   * Binary and textual signatures are verified.
+   */
+  public static final String VERIFY_MODE_FULL_CONSERVATIVE = "fullConservative";
+
+  /**
+   * All signatures are verified.
+   */
+  public static final int VERIFY_ALL = -1;
+
+  /**
+   * The system property that may be used to declare the pdf-as configuration folder.
+   */
+  public static final String CONFIG_DIR_SYSTEM_PROPERTY = "pdf-as.work-dir";
+
+  /**
+   * The zip file containing the default configuration.
+   */
+  public static final String DEFAULT_CONFIGURATION_ZIP_RESOURCE = "DefaultConfiguration.zip";
+
+  /**
+   * The configuration folder for pdf-as within the user's home folder.
+   */
+  public static final String USERHOME_CONFIG_FOLDER = "PDF-AS";
+
+  /**
+   * The name of the directory, where temporary files are stored.
+   */
+  public static final String TEMP_DIR_NAME = "pdfastmp";
+
+  public static final String BKU_HEADER_SIGNATURE_LAYOUT = "SignatureLayout";
+
+  public static final String ADOBE_SIG_FILTER = "Adobe.PDF-AS";
+
+  /**
+   * Strict matching mode for placeholder extraction.<br/>
+   * If the placeholder with the given id is not found in the document, an exception will be thrown.
+   */
+  public static final int PLACEHOLDER_MATCH_MODE_STRICT = 0;
+
+  /**
+   * A moderate matching mode for placeholder extraction.<br/>
+   * If the placeholder with the given id is not found in the document, the first placeholder without an id will be taken.<br/>
+   * If there is no such placeholder, the signature will be placed as usual, according to the pos parameter of the signature profile used.
+   */
+  public static final int PLACEHOLDER_MATCH_MODE_MODERATE = 1;
+
+  /**
+   * A more lenient matching mode for placeholder extraction.<br/>
+   * If the placeholder with the given id is not found in the document, the first found placeholder will be taken, regardless if it has an id set, or not.<br/>
+   * If there is no placeholder at all, the signature will be placed as usual, according to the pos parameter of the signature profile used.
+   */
+  public static final int PLACEHOLDER_MATCH_MODE_LENIENT = 2;
+
+  /**
+   * Identifier for QR based placeholders.
+   */
+  public static final String QR_PLACEHOLDER_IDENTIFIER = "PDF-AS-POS";
+
+  /**
+   * The name of a logger used for statistical logging.
+   */
+  public static final String STATISTIC_LOGGER_NAME = "statistic";
+
+}
+
diff --git a/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/commons/DynamicSignatureLifetimeEnum.java b/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/commons/DynamicSignatureLifetimeEnum.java
index 369bff87..ff967077 100644
--- a/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/commons/DynamicSignatureLifetimeEnum.java
+++ b/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/commons/DynamicSignatureLifetimeEnum.java
@@ -1,73 +1,96 @@
-/**

- * <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.commons;

-

-import java.io.Serializable;

-

-/**

- * Pseudo enum defining lifetime models for {@link DynamicSignatureProfile}s.

- * 

- * @author exthex

- *

- */

-@Deprecated

-public final class DynamicSignatureLifetimeEnum implements Serializable {

-   private static final long serialVersionUID = 1L;

-   

-   private int value;

-   

-   /**

-    * Automatic lifetime bound to one sign process

-    */   

-   public static final DynamicSignatureLifetimeEnum AUTO = new DynamicSignatureLifetimeEnum(1);

-   

-   /**

-    * Manual lifetime making YOU responsible for calling {@link DynamicSignatureProfile#dispose()}.

-    */

-   public static final DynamicSignatureLifetimeEnum MANUAL = new DynamicSignatureLifetimeEnum(2);

-   

-   private DynamicSignatureLifetimeEnum(int val) {

-      this.value = val;      

-   }

-

-   public int hashCode() {

-      return value;

-   }

-

-   public boolean equals(Object obj) {

-      if (this == obj)

-         return true;

-      if (obj == null)

-         return false;

-      if (getClass() != obj.getClass())

-         return false;

-      DynamicSignatureLifetimeEnum other = (DynamicSignatureLifetimeEnum) obj;

-      if (value != other.value)

-         return false;

-      return true;

-   }

-   

-   

-

-}

+/*******************************************************************************
+ * <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.commons;
+
+import java.io.Serializable;
+
+/**
+ * Pseudo enum defining lifetime models for {@link DynamicSignatureProfile}s.
+ * 
+ * @author exthex
+ *
+ */
+@Deprecated
+public final class DynamicSignatureLifetimeEnum implements Serializable {
+   private static final long serialVersionUID = 1L;
+   
+   private int value;
+   
+   /**
+    * Automatic lifetime bound to one sign process
+    */   
+   public static final DynamicSignatureLifetimeEnum AUTO = new DynamicSignatureLifetimeEnum(1);
+   
+   /**
+    * Manual lifetime making YOU responsible for calling {@link DynamicSignatureProfile#dispose()}.
+    */
+   public static final DynamicSignatureLifetimeEnum MANUAL = new DynamicSignatureLifetimeEnum(2);
+   
+   private DynamicSignatureLifetimeEnum(int val) {
+      this.value = val;      
+   }
+
+   public int hashCode() {
+      return value;
+   }
+
+   public boolean equals(Object obj) {
+      if (this == obj)
+         return true;
+      if (obj == null)
+         return false;
+      if (getClass() != obj.getClass())
+         return false;
+      DynamicSignatureLifetimeEnum other = (DynamicSignatureLifetimeEnum) obj;
+      if (value != other.value)
+         return false;
+      return true;
+   }
+   
+   
+
+}
diff --git a/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/commons/DynamicSignatureProfile.java b/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/commons/DynamicSignatureProfile.java
index 9620d2fe..535ea18c 100644
--- a/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/commons/DynamicSignatureProfile.java
+++ b/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/commons/DynamicSignatureProfile.java
@@ -1,126 +1,149 @@
-/**

- * <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.commons;

-

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

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

-

-/**

- * A dynamic signature profile. It is used to define a signature profile like the ones from pdf-as/config.properties at runtime.

- * After creation via {@link PdfAs} you can set properties via {@link #setPropertyRaw(String, String)} 

- * or {@link #setFieldValue(String, String)}.<br>

- * You have to call {@link #apply()} to use the profile. The identifying name (e.g. for {@link SignParameters#setSignatureProfileId(String)}

- * can be obtained via {@link #getName()}.<br>

- * Depending on the {@link DynamicSignatureLifetimeEnum} the profile can be alive and usable till you {@link #dispose()} it manually.

- * <p>

- * Sample usage:<br>

- *  <pre>

-      SignParameters sp = new SignParameters();

-      . . .           

-      sp.setSignatureType(Constants.SIGNATURE_TYPE_TEXTUAL);

-      sp.setSignatureDevice(Constants.SIGNATURE_DEVICE_MOA);

-

-      // create a new dynamic profile based on SIGNATURBLOCK_DE (every property is copied) with manual lifetime

-      DynamicSignatureProfile dsp = pdfAs.createDynamicSignatureProfile("myUniqueName", "SIGNATURBLOCK_DE", 

-            DynamicSignatureLifetimeEnum.MANUAL);  

-            

-      // set something

-      dsp.setPropertyRaw("key.SIG_META", "Statement");

-      dsp.setPropertyRaw("value.SIG_META", "respect to the man in the icecream van ${subject.EMAIL}");

-      dsp.setPropertyRaw("value.SIG_LABEL", "./images/signatur-logo_en.png");

-      dsp.setPropertyRaw("table.main.Style.halign", "right");

-      

-      // mandatory: apply the profile, you have to apply again after changes (overriding your previous setting)

-      dsp.apply();                 

-      sp.setSignatureProfileId(dsp.getName());            

-      

-      // execute PDF-AS

-      pdfAs.sign(sp);              

-      

-      . . .

-                       

-     // your profile is saved and you can obtain it again anytime later:

-      dsp = pdfAs.loadDynamicSignatureProfile("myUniqueName");

-      // use it for another sign.

-      // dont forget to dispose() sometimes because it was manual lifetime

-      System.out.println(dsp.getName());

- *  </pre>

- *  </p>

- * 

- * @author exthex

- *

- */

-@Deprecated

-public interface DynamicSignatureProfile {

-

-   /**

-    * Get the name of the dynamic signature profile. Equals the <b>SignatureProfileId</b>

-    * @return

-    */

-   public abstract String getName();   

-

-   /**

-    * Set a field value for the profile. Use {@link #setPropertyRaw(String, String)} for setting any property.<br>

-    * For example to set <code>sig_obj.MEIN_DYN_SIGNATURBLOCK.value.SIG_META</code> just use <code>SIG_META</code> as fieldName. 

-    * @param fieldName the name of the field

-    * @param value the value to set

-    */

-   public abstract void setFieldValue(String fieldName, String value);

-

-   /**

-    * Get a field value from the profile. See {@link #setFieldValue(String, String)}

-    * @param fieldName

-    * @return

-    */

-   public abstract String getFieldValue(String fieldName);

-   

-   /**

-    * Set any property for the signature profile. 

-    * Uses the same keys as the property file without the "prefix" for the profile.

-    * For example to set <code>sig_obj.MEIN_DYN_SIGNATURBLOCK.key.SIG_META</code> use <code>key.SIG_META</code>

-    * @param key property key

-    * @param val property value

-    */

-   public void setPropertyRaw(String key, String val);

-

-   /**

-    * Get any property from the signature profile. See {@link #setPropertyRaw(String, String)} for details.

-    * @param key

-    * @return

-    */

-   public String getPropertyRaw(String key);      

-

-   /**

-    * Apply the signature profile. Call this after all properties are set and you want to use the profile. It is then added

-    * to the globally available signature profiles. Depending on the lifetime model {@link DynamicSignatureLifetimeEnum} you

-    * have to {@link #dispose()} it manually when not needed anymore.

-    */

-   public abstract void apply();

-

-   /**

-    * Disposes the signature profile from the global store. Call this for {@link DynamicSignatureLifetimeEnum#MANUAL} only. 

-    */

-   public abstract void dispose();

-  

-}
\ No newline at end of file
+/*******************************************************************************
+ * <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.commons;
+
+import at.gv.egiz.pdfas.api.PdfAs;
+import at.gv.egiz.pdfas.api.sign.SignParameters;
+
+/**
+ * A dynamic signature profile. It is used to define a signature profile like the ones from pdf-as/config.properties at runtime.
+ * After creation via {@link PdfAs} you can set properties via {@link #setPropertyRaw(String, String)} 
+ * or {@link #setFieldValue(String, String)}.<br>
+ * You have to call {@link #apply()} to use the profile. The identifying name (e.g. for {@link SignParameters#setSignatureProfileId(String)}
+ * can be obtained via {@link #getName()}.<br>
+ * Depending on the {@link DynamicSignatureLifetimeEnum} the profile can be alive and usable till you {@link #dispose()} it manually.
+ * <p>
+ * Sample usage:<br>
+ *  <pre>
+      SignParameters sp = new SignParameters();
+      . . .           
+      sp.setSignatureType(Constants.SIGNATURE_TYPE_TEXTUAL);
+      sp.setSignatureDevice(Constants.SIGNATURE_DEVICE_MOA);
+
+      // create a new dynamic profile based on SIGNATURBLOCK_DE (every property is copied) with manual lifetime
+      DynamicSignatureProfile dsp = pdfAs.createDynamicSignatureProfile("myUniqueName", "SIGNATURBLOCK_DE", 
+            DynamicSignatureLifetimeEnum.MANUAL);  
+            
+      // set something
+      dsp.setPropertyRaw("key.SIG_META", "Statement");
+      dsp.setPropertyRaw("value.SIG_META", "respect to the man in the icecream van ${subject.EMAIL}");
+      dsp.setPropertyRaw("value.SIG_LABEL", "./images/signatur-logo_en.png");
+      dsp.setPropertyRaw("table.main.Style.halign", "right");
+      
+      // mandatory: apply the profile, you have to apply again after changes (overriding your previous setting)
+      dsp.apply();                 
+      sp.setSignatureProfileId(dsp.getName());            
+      
+      // execute PDF-AS
+      pdfAs.sign(sp);              
+      
+      . . .
+                       
+     // your profile is saved and you can obtain it again anytime later:
+      dsp = pdfAs.loadDynamicSignatureProfile("myUniqueName");
+      // use it for another sign.
+      // dont forget to dispose() sometimes because it was manual lifetime
+      System.out.println(dsp.getName());
+ *  </pre>
+ *  </p>
+ * 
+ * @author exthex
+ *
+ */
+@Deprecated
+public interface DynamicSignatureProfile {
+
+   /**
+    * Get the name of the dynamic signature profile. Equals the <b>SignatureProfileId</b>
+    * @return
+    */
+   public abstract String getName();   
+
+   /**
+    * Set a field value for the profile. Use {@link #setPropertyRaw(String, String)} for setting any property.<br>
+    * For example to set <code>sig_obj.MEIN_DYN_SIGNATURBLOCK.value.SIG_META</code> just use <code>SIG_META</code> as fieldName. 
+    * @param fieldName the name of the field
+    * @param value the value to set
+    */
+   public abstract void setFieldValue(String fieldName, String value);
+
+   /**
+    * Get a field value from the profile. See {@link #setFieldValue(String, String)}
+    * @param fieldName
+    * @return
+    */
+   public abstract String getFieldValue(String fieldName);
+   
+   /**
+    * Set any property for the signature profile. 
+    * Uses the same keys as the property file without the "prefix" for the profile.
+    * For example to set <code>sig_obj.MEIN_DYN_SIGNATURBLOCK.key.SIG_META</code> use <code>key.SIG_META</code>
+    * @param key property key
+    * @param val property value
+    */
+   public void setPropertyRaw(String key, String val);
+
+   /**
+    * Get any property from the signature profile. See {@link #setPropertyRaw(String, String)} for details.
+    * @param key
+    * @return
+    */
+   public String getPropertyRaw(String key);      
+
+   /**
+    * Apply the signature profile. Call this after all properties are set and you want to use the profile. It is then added
+    * to the globally available signature profiles. Depending on the lifetime model {@link DynamicSignatureLifetimeEnum} you
+    * have to {@link #dispose()} it manually when not needed anymore.
+    */
+   public abstract void apply();
+
+   /**
+    * Disposes the signature profile from the global store. Call this for {@link DynamicSignatureLifetimeEnum#MANUAL} only. 
+    */
+   public abstract void dispose();
+  
+}
diff --git a/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/commons/DynamicSignatureProfileImpl.java b/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/commons/DynamicSignatureProfileImpl.java
index 71317a52..4bf896b6 100644
--- a/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/commons/DynamicSignatureProfileImpl.java
+++ b/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/commons/DynamicSignatureProfileImpl.java
@@ -1,228 +1,251 @@
-/**

- * <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.commons;

-

-import java.util.Enumeration;

-import java.util.HashMap;

-import java.util.Iterator;

-import java.util.Map;

-import java.util.Properties;

-

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

-import at.gv.egiz.pdfas.common.settings.ISettings;

-import at.gv.egiz.pdfas.lib.api.Configuration;

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

-

-// TODO exception types?

-/**

- * Implementation class of the {@link DynamicSignatureProfile}. Don't use this class directly. Use {@link PdfAs} to create and the 

- * {@link DynamicSignatureProfile} interface for manipulation.

- * @author exthex

- *

- */

-@Deprecated

-public class DynamicSignatureProfileImpl implements DynamicSignatureProfile {

-   private String name;   

-   private Properties newProps = new Properties();

-   private int dynamicTypeCounter = 0;   

-   private static Map<String, DynamicSignatureProfile> profiles = 

-		   new HashMap<String, DynamicSignatureProfile>();

-   private static ThreadLocal<DynamicSignatureProfile> localProfiles = new ThreadLocal<DynamicSignatureProfile>();

-   private DynamicSignatureLifetimeEnum lifeMode; 

-   private Configuration configuration;

-

-   private DynamicSignatureProfileImpl(DynamicSignatureLifetimeEnum mode, String name, 

-		   Configuration configuration) {

-      if (name != null) {

-         this.name = name;

-      } else {

-         this.name = createDynamicTypeName();

-      }

-      this.configuration = configuration;

-      this.lifeMode = mode;

-   }

-   

-   public static DynamicSignatureProfileImpl createFromParent(String myUniqueName, String parentProfile, 

-		   DynamicSignatureLifetimeEnum mode, Configuration configuration) {

-      DynamicSignatureProfileImpl res = new DynamicSignatureProfileImpl(mode, myUniqueName, configuration);

-      res.initFromParent(parentProfile);

-      return res;

-   }

-   

-   private void store() {

-      if (lifeMode.equals(DynamicSignatureLifetimeEnum.MANUAL)) {

-         profiles.put(this.getName(), this);

-      } else if (lifeMode.equals(DynamicSignatureLifetimeEnum.AUTO)) {

-         localProfiles.set(this);

-      }

-   }

-   

-   private void remove() {

-      if (lifeMode.equals(DynamicSignatureLifetimeEnum.MANUAL)) {

-         profiles.remove(this);

-      } else if (lifeMode.equals(DynamicSignatureLifetimeEnum.AUTO)) {

-         localProfiles.set(null);

-      }

-   }

-   

-   public static void disposeLocalProfile() {

-      DynamicSignatureProfileImpl profile = (DynamicSignatureProfileImpl) localProfiles.get();

-      if (profile != null) {       

-         profile.dispose();

-      }

-   }

-   

-   public static DynamicSignatureProfileImpl createEmptyProfile(String myUniqueName, DynamicSignatureLifetimeEnum mode,

-		   Configuration configuration) {

-      return new DynamicSignatureProfileImpl(mode, myUniqueName, configuration);      

-   }

-   

-   public static DynamicSignatureProfileImpl loadProfile(String name) {

-      return (DynamicSignatureProfileImpl) profiles.get(name);

-   }

-   

-   private synchronized String createDynamicTypeName() {

-      return "dynprofile__#" + this.dynamicTypeCounter++;     

-   }

-

-   /* (non-Javadoc)

-    * @see at.gv.egiz.pdfas.api.commons.DynamicSignatureProfile#getName()

-    */

-   public String getName() {

-      return name;

-   }

-   

-   /* (non-Javadoc)

-    * @see at.gv.egiz.pdfas.api.commons.DynamicSignatureProfile#setName(String)

-    */

-   public void setName(String uniqueName) {

-      this.name = uniqueName;

-   }

-

-   public void setPropertyRaw(String key, String val) {

-      this.newProps.setProperty(localPropName(key), val);

-   }

-   

-   public String getPropertyRaw(String key) {

-      return this.newProps.getProperty(localPropName(key));

-   }

-   

-   private void assertPropExists(String key) {

-      if (!this.newProps.containsKey(localPropName(key))) {

-         throw new RuntimeException("property '" + key + "'not existing, cannot add one");

-      }

-   }

-

-   private String localPropName(String key) {

-      return "sig_obj." + this.name + "." + key;

-   }

-   

-   /* (non-Javadoc)

-    * @see at.gv.egiz.pdfas.api.commons.DynamicSignatureProfile#setFieldValue(java.lang.String, java.lang.String)

-    */

-   public void setFieldValue(String fieldName, String value) {

-      if (SignatureTypes.isRequredSigTypeKey(fieldName)) {

-         throw new RuntimeException("cannot set value for pre defined signature field names");

-      }

-      

-      String key = "value." +fieldName;

-      assertPropExists(key);

-      setPropertyRaw(key, value);

-   }

-   

-   /* (non-Javadoc)

-    * @see at.gv.egiz.pdfas.api.commons.DynamicSignatureProfile#getFieldValue(java.lang.String)

-    */

-   public String getFieldValue(String fieldName) {

-      return getPropertyRaw("value."+fieldName);           

-   }

-

-   private void initFromParent(String parentProfile) {

-      try {

-         ISettings cfg = null;

-

-         cfg = (ISettings)configuration;         

-         String parentKey = "sig_obj." + parentProfile + ".";

-         Map<String, String> properties = cfg.getValuesPrefix(parentKey);

-         //Properties props = cfg.getProperties();

-         // DTI: props.keys() does not support default properties, therefore we should better use props.propertyNames()

-//         for (Enumeration e = props.keys(); e.hasMoreElements();) {

-         /*for (Enumeration e = props.propertyNames(); e.hasMoreElements();) {

-            String oldKey = (String) e.nextElement();

-            if (oldKey.startsWith("sig_obj." + parentProfile + ".")) {

-               String newKey = StringUtils.replace(oldKey, parentProfile, name);

-               String val = props.getProperty(oldKey);

-               this.newProps.put(newKey, val);

-            }

-         }*/

-         

-         Iterator<String> keyIt = properties.keySet().iterator();

-         

-         while(keyIt.hasNext()) {

-        	 String oldKey = keyIt.next();

-        	 String newKey = oldKey.replaceAll(parentProfile, name);

-             String val = properties.get(oldKey);

-             this.newProps.put(newKey, val);

-         }

-         

-         this.newProps.put("sig_obj.types." + name, "on");

-      } catch (Exception e) {

-         throw new RuntimeException(e);

-      }

-   }

-   

-   /* (non-Javadoc)

-    * @see at.gv.egiz.pdfas.api.commons.DynamicSignatureProfile#register()

-    */

-   public synchronized void apply() {

-      try {

-    	  Configuration cfg = this.configuration;

-         for (Enumeration<Object> e = newProps.keys(); e.hasMoreElements();) {

-            String key = (String) e.nextElement();

-            cfg.setValue(key, newProps.getProperty(key));

-         }

-     

-         store();

-      } catch (Exception e) {

-         throw new RuntimeException(e);

-      }

-   }

-   

-   /* (non-Javadoc)

-    * @see at.gv.egiz.pdfas.api.commons.DynamicSignatureProfile#dispose()

-    */

-   public synchronized void dispose() {

-      try {

-    	  Configuration cfg = this.configuration;

-    	  for (Enumeration<Object> e = newProps.keys(); e.hasMoreElements();) {

-              String key = (String) e.nextElement();

-              cfg.setValue(key, null);

-           }

-         remove();

-      } catch (Exception e) {

-         throw new RuntimeException(e);

-      }

-   }

-   

-}

+/*******************************************************************************
+ * <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.commons;
+
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Properties;
+
+import at.gv.egiz.pdfas.api.PdfAs;
+import at.gv.egiz.pdfas.common.settings.ISettings;
+import at.gv.egiz.pdfas.lib.api.Configuration;
+import at.knowcenter.wag.egov.egiz.sig.SignatureTypes;
+
+// TODO exception types?
+/**
+ * Implementation class of the {@link DynamicSignatureProfile}. Don't use this class directly. Use {@link PdfAs} to create and the 
+ * {@link DynamicSignatureProfile} interface for manipulation.
+ * @author exthex
+ *
+ */
+@Deprecated
+public class DynamicSignatureProfileImpl implements DynamicSignatureProfile {
+   private String name;   
+   private Properties newProps = new Properties();
+   private int dynamicTypeCounter = 0;   
+   private static Map<String, DynamicSignatureProfile> profiles = 
+		   new HashMap<String, DynamicSignatureProfile>();
+   private static ThreadLocal<DynamicSignatureProfile> localProfiles = new ThreadLocal<DynamicSignatureProfile>();
+   private DynamicSignatureLifetimeEnum lifeMode; 
+   private Configuration configuration;
+
+   private DynamicSignatureProfileImpl(DynamicSignatureLifetimeEnum mode, String name, 
+		   Configuration configuration) {
+      if (name != null) {
+         this.name = name;
+      } else {
+         this.name = createDynamicTypeName();
+      }
+      this.configuration = configuration;
+      this.lifeMode = mode;
+   }
+   
+   public static DynamicSignatureProfileImpl createFromParent(String myUniqueName, String parentProfile, 
+		   DynamicSignatureLifetimeEnum mode, Configuration configuration) {
+      DynamicSignatureProfileImpl res = new DynamicSignatureProfileImpl(mode, myUniqueName, configuration);
+      res.initFromParent(parentProfile);
+      return res;
+   }
+   
+   private void store() {
+      if (lifeMode.equals(DynamicSignatureLifetimeEnum.MANUAL)) {
+         profiles.put(this.getName(), this);
+      } else if (lifeMode.equals(DynamicSignatureLifetimeEnum.AUTO)) {
+         localProfiles.set(this);
+      }
+   }
+   
+   private void remove() {
+      if (lifeMode.equals(DynamicSignatureLifetimeEnum.MANUAL)) {
+         profiles.remove(this);
+      } else if (lifeMode.equals(DynamicSignatureLifetimeEnum.AUTO)) {
+         localProfiles.set(null);
+      }
+   }
+   
+   public static void disposeLocalProfile() {
+      DynamicSignatureProfileImpl profile = (DynamicSignatureProfileImpl) localProfiles.get();
+      if (profile != null) {       
+         profile.dispose();
+      }
+   }
+   
+   public static DynamicSignatureProfileImpl createEmptyProfile(String myUniqueName, DynamicSignatureLifetimeEnum mode,
+		   Configuration configuration) {
+      return new DynamicSignatureProfileImpl(mode, myUniqueName, configuration);      
+   }
+   
+   public static DynamicSignatureProfileImpl loadProfile(String name) {
+      return (DynamicSignatureProfileImpl) profiles.get(name);
+   }
+   
+   private synchronized String createDynamicTypeName() {
+      return "dynprofile__#" + this.dynamicTypeCounter++;     
+   }
+
+   /* (non-Javadoc)
+    * @see at.gv.egiz.pdfas.api.commons.DynamicSignatureProfile#getName()
+    */
+   public String getName() {
+      return name;
+   }
+   
+   /* (non-Javadoc)
+    * @see at.gv.egiz.pdfas.api.commons.DynamicSignatureProfile#setName(String)
+    */
+   public void setName(String uniqueName) {
+      this.name = uniqueName;
+   }
+
+   public void setPropertyRaw(String key, String val) {
+      this.newProps.setProperty(localPropName(key), val);
+   }
+   
+   public String getPropertyRaw(String key) {
+      return this.newProps.getProperty(localPropName(key));
+   }
+   
+   private void assertPropExists(String key) {
+      if (!this.newProps.containsKey(localPropName(key))) {
+         throw new RuntimeException("property '" + key + "'not existing, cannot add one");
+      }
+   }
+
+   private String localPropName(String key) {
+      return "sig_obj." + this.name + "." + key;
+   }
+   
+   /* (non-Javadoc)
+    * @see at.gv.egiz.pdfas.api.commons.DynamicSignatureProfile#setFieldValue(java.lang.String, java.lang.String)
+    */
+   public void setFieldValue(String fieldName, String value) {
+      if (SignatureTypes.isRequredSigTypeKey(fieldName)) {
+         throw new RuntimeException("cannot set value for pre defined signature field names");
+      }
+      
+      String key = "value." +fieldName;
+      assertPropExists(key);
+      setPropertyRaw(key, value);
+   }
+   
+   /* (non-Javadoc)
+    * @see at.gv.egiz.pdfas.api.commons.DynamicSignatureProfile#getFieldValue(java.lang.String)
+    */
+   public String getFieldValue(String fieldName) {
+      return getPropertyRaw("value."+fieldName);           
+   }
+
+   private void initFromParent(String parentProfile) {
+      try {
+         ISettings cfg = null;
+
+         cfg = (ISettings)configuration;         
+         String parentKey = "sig_obj." + parentProfile + ".";
+         Map<String, String> properties = cfg.getValuesPrefix(parentKey);
+         //Properties props = cfg.getProperties();
+         // DTI: props.keys() does not support default properties, therefore we should better use props.propertyNames()
+//         for (Enumeration e = props.keys(); e.hasMoreElements();) {
+         /*for (Enumeration e = props.propertyNames(); e.hasMoreElements();) {
+            String oldKey = (String) e.nextElement();
+            if (oldKey.startsWith("sig_obj." + parentProfile + ".")) {
+               String newKey = StringUtils.replace(oldKey, parentProfile, name);
+               String val = props.getProperty(oldKey);
+               this.newProps.put(newKey, val);
+            }
+         }*/
+         
+         Iterator<String> keyIt = properties.keySet().iterator();
+         
+         while(keyIt.hasNext()) {
+        	 String oldKey = keyIt.next();
+        	 String newKey = oldKey.replaceAll(parentProfile, name);
+             String val = properties.get(oldKey);
+             this.newProps.put(newKey, val);
+         }
+         
+         this.newProps.put("sig_obj.types." + name, "on");
+      } catch (Exception e) {
+         throw new RuntimeException(e);
+      }
+   }
+   
+   /* (non-Javadoc)
+    * @see at.gv.egiz.pdfas.api.commons.DynamicSignatureProfile#register()
+    */
+   public synchronized void apply() {
+      try {
+    	  Configuration cfg = this.configuration;
+         for (Enumeration<Object> e = newProps.keys(); e.hasMoreElements();) {
+            String key = (String) e.nextElement();
+            cfg.setValue(key, newProps.getProperty(key));
+         }
+     
+         store();
+      } catch (Exception e) {
+         throw new RuntimeException(e);
+      }
+   }
+   
+   /* (non-Javadoc)
+    * @see at.gv.egiz.pdfas.api.commons.DynamicSignatureProfile#dispose()
+    */
+   public synchronized void dispose() {
+      try {
+    	  Configuration cfg = this.configuration;
+    	  for (Enumeration<Object> e = newProps.keys(); e.hasMoreElements();) {
+              String key = (String) e.nextElement();
+              cfg.setValue(key, null);
+           }
+         remove();
+      } catch (Exception e) {
+         throw new RuntimeException(e);
+      }
+   }
+   
+}
diff --git a/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/commons/SignatureInformation.java b/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/commons/SignatureInformation.java
index 2f5c7d97..413be0ad 100644
--- a/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/commons/SignatureInformation.java
+++ b/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/commons/SignatureInformation.java
@@ -1,130 +1,153 @@
-/**

- * <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.

- *

- * $Id: SignatureHolder.java,v 1.3 2006/10/11 07:57:58 wprinz Exp $

- */

-package at.gv.egiz.pdfas.api.commons;

-

-import java.security.cert.X509Certificate;

-import java.util.Date;

-import java.util.List;

-

-import at.gv.egiz.pdfas.api.analyze.NonTextObjectInfo;

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

-

-/**

- * Holds the information of one found signature block, which is the signed data

- * and the corresponding signature information.

- * 

- * @author wprinz

- */

-@Deprecated

-public interface SignatureInformation

-{

-  /**

-   * Returns the type of this signature (binary/textual).

-   * 

-   * <p>

-   * May be {@link Constants#SIGNATURE_TYPE_BINARY} or

-   * {@link Constants#SIGNATURE_TYPE_TEXTUAL}.

-   * </p>

-   * 

-   * @return Returns the type of this signature (binary/textual).

-   */

-  public String getSignatureType();

-

-  /**

-   * Returns the DataSource providing the data that was signed.

-   * 

-   * <p>

-   * Note that this is the signed data as sent to the verification device by

-   * PDF-AS. The verification device (e.g. MOA) may perform several other

-   * transformations on the data before feeding it to the signature hash

-   * function. To get the actual hashed data use the ReturnHashInputData mechanism (which is very slow).

-   * </p>

-   * 

-   * @return Returns the DataSource providing the data that was signed.

-   * 

-   * @see at.gv.egiz.pdfas.api.verify.VerifyParameters#setReturnHashInputData(boolean)

-   * @see at.gv.egiz.pdfas.api.verify.VerifyResult#getHashInputData()

-   * 

-   */

-  public DataSource getSignedData();

-

-  /**

-   * Returns the certificate of the signer.

-   * 

-   * <p>

-   * Information like subject name, issuer name or serial number can be

-   * retrieved form this certificate.

-   * </p>

-   * 

-   * @return Returns the certificate of the signer.

-   */

-  public X509Certificate getSignerCertificate();

-

-  /**

-   * Returns the signing time, which is the time when the signature was created.

-   * 

-   * @return Returns the signing time, which is the time when the signature was

-   *         created.

-   */

-  public Date getSigningTime();

-

-  /**

-   * Returns additional, internal information about the found signature.

-   * 

-   * <p>

-   * Note that this provides a way for developers to gather core information

-   * about the signature. What information is returned strongly depends on the

-   * core implementation.

-   * </p>

-   * 

-   * @return Returns additional, internal information about the signature. Null

-   *         means that no additional information is available.

-   */

-  public Object getInternalSignatureInformation();

-  

-  /**

-   * Returns the embedded /TimeStamp value (b64 encoded) from the signature if available.

-   * @return 

-   */

-  public String getTimeStampValue();

-  

-  /**

-   * Returns a list<{@link NonTextObjectInfo}> of non textual objects in the pdf document.

-   * Only available for textual signatures. Show this to the user who signed the textual content only! 

-   * @return  List<{@link NonTextObjectInfo} or <tt>null</tt> of not available (binary signature)

-   */

-  public List getNonTextualObjects();

-  

-  public void setNonTextualObjects(List nonTextualObjects);

-

-  /**

-   * Returns <code>true</code> if non textual objects have been found, <code>false</code> if not.

-   * @return <code>true</code> if non textual objects have been found, <code>false</code> if not.

-   */

-  public boolean hasNonTextualObjects();

-

-

-}
\ No newline at end of file
+/*******************************************************************************
+ * <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.
+ *
+ * $Id: SignatureHolder.java,v 1.3 2006/10/11 07:57:58 wprinz Exp $
+ */
+package at.gv.egiz.pdfas.api.commons;
+
+import java.security.cert.X509Certificate;
+import java.util.Date;
+import java.util.List;
+
+import at.gv.egiz.pdfas.api.analyze.NonTextObjectInfo;
+import at.gv.egiz.pdfas.api.io.DataSource;
+
+/**
+ * Holds the information of one found signature block, which is the signed data
+ * and the corresponding signature information.
+ * 
+ * @author wprinz
+ */
+@Deprecated
+public interface SignatureInformation
+{
+  /**
+   * Returns the type of this signature (binary/textual).
+   * 
+   * <p>
+   * May be {@link Constants#SIGNATURE_TYPE_BINARY} or
+   * {@link Constants#SIGNATURE_TYPE_TEXTUAL}.
+   * </p>
+   * 
+   * @return Returns the type of this signature (binary/textual).
+   */
+  public String getSignatureType();
+
+  /**
+   * Returns the DataSource providing the data that was signed.
+   * 
+   * <p>
+   * Note that this is the signed data as sent to the verification device by
+   * PDF-AS. The verification device (e.g. MOA) may perform several other
+   * transformations on the data before feeding it to the signature hash
+   * function. To get the actual hashed data use the ReturnHashInputData mechanism (which is very slow).
+   * </p>
+   * 
+   * @return Returns the DataSource providing the data that was signed.
+   * 
+   * @see at.gv.egiz.pdfas.api.verify.VerifyParameters#setReturnHashInputData(boolean)
+   * @see at.gv.egiz.pdfas.api.verify.VerifyResult#getHashInputData()
+   * 
+   */
+  public DataSource getSignedData();
+
+  /**
+   * Returns the certificate of the signer.
+   * 
+   * <p>
+   * Information like subject name, issuer name or serial number can be
+   * retrieved form this certificate.
+   * </p>
+   * 
+   * @return Returns the certificate of the signer.
+   */
+  public X509Certificate getSignerCertificate();
+
+  /**
+   * Returns the signing time, which is the time when the signature was created.
+   * 
+   * @return Returns the signing time, which is the time when the signature was
+   *         created.
+   */
+  public Date getSigningTime();
+
+  /**
+   * Returns additional, internal information about the found signature.
+   * 
+   * <p>
+   * Note that this provides a way for developers to gather core information
+   * about the signature. What information is returned strongly depends on the
+   * core implementation.
+   * </p>
+   * 
+   * @return Returns additional, internal information about the signature. Null
+   *         means that no additional information is available.
+   */
+  public Object getInternalSignatureInformation();
+  
+  /**
+   * Returns the embedded /TimeStamp value (b64 encoded) from the signature if available.
+   * @return 
+   */
+  public String getTimeStampValue();
+  
+  /**
+   * Returns a list<{@link NonTextObjectInfo}> of non textual objects in the pdf document.
+   * Only available for textual signatures. Show this to the user who signed the textual content only! 
+   * @return  List<{@link NonTextObjectInfo} or <tt>null</tt> of not available (binary signature)
+   */
+  public List getNonTextualObjects();
+  
+  public void setNonTextualObjects(List nonTextualObjects);
+
+  /**
+   * Returns <code>true</code> if non textual objects have been found, <code>false</code> if not.
+   * @return <code>true</code> if non textual objects have been found, <code>false</code> if not.
+   */
+  public boolean hasNonTextualObjects();
+
+
+}
diff --git a/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/commons/SignatureProfile.java b/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/commons/SignatureProfile.java
index def2d820..f23ce5a0 100644
--- a/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/commons/SignatureProfile.java
+++ b/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/commons/SignatureProfile.java
@@ -1,88 +1,111 @@
-/**

- * <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.commons;

-

-import java.util.Properties;

-

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

-

-/**

- * Definition of a signature profile.

- * 

- * @author wprinz

- */

-@Deprecated

-public interface SignatureProfile {

-

-   // TODO: implement full profile support

-

-   /**

-    * Returns the profile id.

-    * 

-    * @return Returns the profile id.

-    */

-   public String getProfileId();

-

-   /**

-    * Returns the MOA KeyIdentifier.

-    * 

-    * @return Returns the MOA KeyIdentifier.

-    */

-   public String getMOAKeyIdentifier();

-

-   /**

-    * Returns the entries relevant to the search algorithm for signature blocks.<br/>

-    * e.g. properties starting with <code>sig_obj.PROFILE.key.</code> and

-    * properties of the form <code>sig_obj.PROFILE.table.TABLENAME.NUMBER</code>

-    * where <code>PROFILE</code> is the name of the current profile,

-    * <code>TABLENAME</code> is the name of a table and <code>NUMBER</code>

-    * is the number of the specific row within the table <code>TABLENAME</code>.

-    * 

-    * @return The entries relevant to the signature block search algorithm as

-    *         Java properties.

-    */

-   public Properties getSignatureBlockEntries();

-

-   /**

-    * Returns the profile description.

-    * 

-    * @return The profile description.

-    */

-   public String getProfileDescription();

-

-   /**

-    * True only if this is the default profile according to config.

-    * @return

-    */

-   public boolean isDefault();

-   

-	/**

-	 * Returns the state of the signature profile. Signature profiles may be restricted to signature (

-	 * {@link State#SIGN_ONLY}) or to verification ({@link State#VERIFY_ONLY}).

-	 * 

-	 * @return The state of the profile.

-	 */

-	public State getState();

-   

-}

+/*******************************************************************************
+ * <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.commons;
+
+import java.util.Properties;
+
+import at.knowcenter.wag.egov.egiz.sig.SignatureTypes.State;
+
+/**
+ * Definition of a signature profile.
+ * 
+ * @author wprinz
+ */
+@Deprecated
+public interface SignatureProfile {
+
+   // TODO: implement full profile support
+
+   /**
+    * Returns the profile id.
+    * 
+    * @return Returns the profile id.
+    */
+   public String getProfileId();
+
+   /**
+    * Returns the MOA KeyIdentifier.
+    * 
+    * @return Returns the MOA KeyIdentifier.
+    */
+   public String getMOAKeyIdentifier();
+
+   /**
+    * Returns the entries relevant to the search algorithm for signature blocks.<br/>
+    * e.g. properties starting with <code>sig_obj.PROFILE.key.</code> and
+    * properties of the form <code>sig_obj.PROFILE.table.TABLENAME.NUMBER</code>
+    * where <code>PROFILE</code> is the name of the current profile,
+    * <code>TABLENAME</code> is the name of a table and <code>NUMBER</code>
+    * is the number of the specific row within the table <code>TABLENAME</code>.
+    * 
+    * @return The entries relevant to the signature block search algorithm as
+    *         Java properties.
+    */
+   public Properties getSignatureBlockEntries();
+
+   /**
+    * Returns the profile description.
+    * 
+    * @return The profile description.
+    */
+   public String getProfileDescription();
+
+   /**
+    * True only if this is the default profile according to config.
+    * @return
+    */
+   public boolean isDefault();
+   
+	/**
+	 * Returns the state of the signature profile. Signature profiles may be restricted to signature (
+	 * {@link State#SIGN_ONLY}) or to verification ({@link State#VERIFY_ONLY}).
+	 * 
+	 * @return The state of the profile.
+	 */
+	public State getState();
+   
+}
diff --git a/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/exceptions/ConfigUtilsException.java b/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/exceptions/ConfigUtilsException.java
index f8059d16..d130c354 100644
--- a/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/exceptions/ConfigUtilsException.java
+++ b/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/exceptions/ConfigUtilsException.java
@@ -1,123 +1,146 @@
-/**

- * <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.exceptions;

-

-/**

- * @author <a href="mailto:thomas.knall@egiz.gv.at">Thomas Knall</a>

- */

-@Deprecated

-public class ConfigUtilsException extends Exception {

-

-   /**

-    * Marker for serialization.

-    */

-   private static final long serialVersionUID = 1L;

-

-   /**

-    * The underlying exception.

-    */

-   private Exception wrappedException;

-

-   /**

-    * Returns the underlying exception.

-    *

-    * @return The underlying exception.

-    */

-   public Exception getException() {

-      return this.wrappedException;

-   }

-

-   /**

-    * Returns the message of the wrapped exception.

-    *

-    * @return The message of the wrapped exception.

-    */

-   public String getMessage() {

-      String message = super.getMessage();

-      if (message == null && this.wrappedException != null) {

-         return this.wrappedException.getMessage();

-      } else {

-         return message;

-      }

-   }

-

-   /**

-    * Instantiation of a new exception based on a message and another (wrapped)

-    * exception.

-    *

-    * @param message

-    *           The exception message.

-    * @param exception

-    *           Another exception.

-    */

-   public ConfigUtilsException(final String message, final Exception exception) {

-      super(message);

-      this.wrappedException = exception;

-   }

-

-   /**

-    * Instantiated a new exception based on a message.

-    *

-    * @param message

-    *           The message of the new exception.

-    */

-   public ConfigUtilsException(final String message) {

-      super(message);

-      this.wrappedException = null;

-   }

-

-   /**

-    * Instantiates a new exception based on another (wrapped) exception.

-    *

-    * @param exception

-    *           The wrapped exception.

-    */

-   public ConfigUtilsException(final Exception exception) {

-      super();

-      this.wrappedException = exception;

-   }

-

-   /**

-    * Instantiates a new (unspecified) exception.

-    */

-   public ConfigUtilsException() {

-      super();

-      this.wrappedException = null;

-

-   }

-

-   /**

-    * Returns the text representation of this instance.

-    *

-    * @return The text representation of this instance.

-    */

-   public String toString() {

-      if (this.wrappedException != null) {

-         return this.wrappedException.toString();

-      } else {

-         return super.toString();

-      }

-   }

-

-}

+/*******************************************************************************
+ * <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.exceptions;
+
+/**
+ * @author <a href="mailto:thomas.knall@egiz.gv.at">Thomas Knall</a>
+ */
+@Deprecated
+public class ConfigUtilsException extends Exception {
+
+   /**
+    * Marker for serialization.
+    */
+   private static final long serialVersionUID = 1L;
+
+   /**
+    * The underlying exception.
+    */
+   private Exception wrappedException;
+
+   /**
+    * Returns the underlying exception.
+    *
+    * @return The underlying exception.
+    */
+   public Exception getException() {
+      return this.wrappedException;
+   }
+
+   /**
+    * Returns the message of the wrapped exception.
+    *
+    * @return The message of the wrapped exception.
+    */
+   public String getMessage() {
+      String message = super.getMessage();
+      if (message == null && this.wrappedException != null) {
+         return this.wrappedException.getMessage();
+      } else {
+         return message;
+      }
+   }
+
+   /**
+    * Instantiation of a new exception based on a message and another (wrapped)
+    * exception.
+    *
+    * @param message
+    *           The exception message.
+    * @param exception
+    *           Another exception.
+    */
+   public ConfigUtilsException(final String message, final Exception exception) {
+      super(message);
+      this.wrappedException = exception;
+   }
+
+   /**
+    * Instantiated a new exception based on a message.
+    *
+    * @param message
+    *           The message of the new exception.
+    */
+   public ConfigUtilsException(final String message) {
+      super(message);
+      this.wrappedException = null;
+   }
+
+   /**
+    * Instantiates a new exception based on another (wrapped) exception.
+    *
+    * @param exception
+    *           The wrapped exception.
+    */
+   public ConfigUtilsException(final Exception exception) {
+      super();
+      this.wrappedException = exception;
+   }
+
+   /**
+    * Instantiates a new (unspecified) exception.
+    */
+   public ConfigUtilsException() {
+      super();
+      this.wrappedException = null;
+
+   }
+
+   /**
+    * Returns the text representation of this instance.
+    *
+    * @return The text representation of this instance.
+    */
+   public String toString() {
+      if (this.wrappedException != null) {
+         return this.wrappedException.toString();
+      } else {
+         return super.toString();
+      }
+   }
+
+}
diff --git a/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/exceptions/ErrorCode.java b/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/exceptions/ErrorCode.java
index c5364abc..557b33dc 100644
--- a/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/exceptions/ErrorCode.java
+++ b/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/exceptions/ErrorCode.java
@@ -1,116 +1,139 @@
-/**

- * <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.exceptions;

-

-/**

- * Contains constants for the error codes.

- * 

- * <p>

- * In Java 1.5 this would be an enum.

- * </p>

- * 

- * @author wprinz

- */

-@Deprecated

-public final class ErrorCode

-{

-  public static final int EXTERNAL_ERROR = 0;

-  public static final int UNKNOWN_ERROR = 6;

-  public static final int OUT_OF_MEMORY_ERROR = 7;

-

-  public static final int SETTING_NOT_FOUND = 100;

-  public static final int SETTINGS_EXCEPTION = 101;

-  public static final int KZ_SETTING_NOT_FOUND = 102;

-  public static final int NO_EMBEDABLE_TTF_CONFIGURED_FOR_PDFA = 103;

-  public static final int INVALID_SIGNATURE_LAYOUT_IMPL_CONFIGURED = 104;

-  public static final int MISSING_HEADER_SERVER_USER_AGENT = 105;

-  public static final int CIRCULAR_INCLUDE_INSTRUCTION_DETECTED = 106;

-  public static final int UNABLE_TO_LOAD_DEFAULT_CONFIG = 107;

-

-  public static final int DOCUMENT_CANNOT_BE_READ = 201;

-  public static final int TEXT_EXTRACTION_EXCEPTION = 202;

-  public static final int CANNOT_WRITE_PDF = 205;

-  public static final int DOCUMENT_NOT_SIGNED = 206;

-  public static final int SIGNATURE_TYPES_EXCEPTION = 223;

-  public static final int FONT_NOT_FOUND = 230;

-  public static final int DOCUMENT_IS_PROTECTED = 231;

-  public static final int INVALID_SIGNATURE_DICTIONARY = 232;

-//23.11.2010 changed by exthex - added error code for failed extraction

-  public static final int SIGNATURE_PLACEHOLDER_EXTRACTION_FAILED = 233;

-  

-	/**

-	 * Error code for {@code SignatureException}s occurring when trying to sign with a certain signature profile that

-	 * is not allowed to be used for signature, e.g. because ist has been set to

-	 * <p/>

-	 * {@code sig_obj.types.<PROFILE_ID> = verify_only}

-	 * @author Datentechnik Innovation GmbH

-	 */

-  public static final int SIGNATURE_PROFILE_IS_NOT_ALLOWED_FOR_SIGNATURE = 234;

-  

-  public static final int INVALID_SIGNATURE_POSITION = 224;

-  public static final int NO_TEXTUAL_CONTENT = 251;

-

-  public static final int SIGNATURE_COULDNT_BE_CREATED = 300;

-  public static final int SIGNED_TEXT_EMPTY = 301;

-  public static final int PROFILE_NOT_DEFINED = 302;

-  public static final int SERIAL_NUMBER_INVALID = 303;

-  public static final int SIG_CERTIFICATE_CANNOT_BE_READ = 304;

-  public static final int PROFILE_NOT_USABLE_FOR_TEXT = 305;

-  

-  public static final int COULDNT_VERIFY = 310;

-  

-  public static final int CERTIFICATE_NOT_FOUND = 313;

-  public static final int NOT_SEMANTICALLY_EQUAL = 314;

-

-  public static final int MODIFIED_AFTER_SIGNATION = 316;

-  public static final int NON_BINARY_SIGNATURES_PRESENT = 317;  

-  

-  public static final int UNSUPPORTED_REPLACES_NAME = 318;

-  public static final int UNSUPPORTED_SIGNATURE = 319;

-

-  public static final int DETACHED_SIGNATURE_NOT_SUPPORTED = 370;

-  

-  public static final int SIGNATURE_VERIFICATION_NOT_SUPPORTED = 371;  

-  public static final int INVALID_SIGNING_TIME = 372;

-

-  public static final int BKU_NOT_SUPPORTED = 373;

-  

-  public static final int WEB_EXCEPTION = 330;

-  public static final int UNABLE_TO_RECEIVE_SUITABLE_RESPONSE = 340;

-

-  

-  public static final int NORMALIZER_EXCEPTION = 400;

-  

-  public static final int SESSION_EXPIRED = 600;

-  

-  public static final int PLACEHOLDER_EXCEPTION = 700;

-  public static final int CAPTION_NOT_FOUND_EXCEPTION = 701;

-

-  public static final int UNABLE_TO_PARSE_ID = 800;

-  public static final int CORRECTOR_EXCEPTION = 801;

-  public static final int EXTERNAL_CORRECTOR_TIMEOUT_REACHED = 802;  

-

-  public static final int WRAPPED_ERROR_CODE = 998;

-  public static final int FUNCTION_NOT_AVAILABLE = 999;

-}

+/*******************************************************************************
+ * <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.exceptions;
+
+/**
+ * Contains constants for the error codes.
+ * 
+ * <p>
+ * In Java 1.5 this would be an enum.
+ * </p>
+ * 
+ * @author wprinz
+ */
+@Deprecated
+public final class ErrorCode
+{
+  public static final int EXTERNAL_ERROR = 0;
+  public static final int UNKNOWN_ERROR = 6;
+  public static final int OUT_OF_MEMORY_ERROR = 7;
+
+  public static final int SETTING_NOT_FOUND = 100;
+  public static final int SETTINGS_EXCEPTION = 101;
+  public static final int KZ_SETTING_NOT_FOUND = 102;
+  public static final int NO_EMBEDABLE_TTF_CONFIGURED_FOR_PDFA = 103;
+  public static final int INVALID_SIGNATURE_LAYOUT_IMPL_CONFIGURED = 104;
+  public static final int MISSING_HEADER_SERVER_USER_AGENT = 105;
+  public static final int CIRCULAR_INCLUDE_INSTRUCTION_DETECTED = 106;
+  public static final int UNABLE_TO_LOAD_DEFAULT_CONFIG = 107;
+
+  public static final int DOCUMENT_CANNOT_BE_READ = 201;
+  public static final int TEXT_EXTRACTION_EXCEPTION = 202;
+  public static final int CANNOT_WRITE_PDF = 205;
+  public static final int DOCUMENT_NOT_SIGNED = 206;
+  public static final int SIGNATURE_TYPES_EXCEPTION = 223;
+  public static final int FONT_NOT_FOUND = 230;
+  public static final int DOCUMENT_IS_PROTECTED = 231;
+  public static final int INVALID_SIGNATURE_DICTIONARY = 232;
+//23.11.2010 changed by exthex - added error code for failed extraction
+  public static final int SIGNATURE_PLACEHOLDER_EXTRACTION_FAILED = 233;
+  
+	/**
+	 * Error code for {@code SignatureException}s occurring when trying to sign with a certain signature profile that
+	 * is not allowed to be used for signature, e.g. because ist has been set to
+	 * <p/>
+	 * {@code sig_obj.types.<PROFILE_ID> = verify_only}
+	 * @author Datentechnik Innovation GmbH
+	 */
+  public static final int SIGNATURE_PROFILE_IS_NOT_ALLOWED_FOR_SIGNATURE = 234;
+  
+  public static final int INVALID_SIGNATURE_POSITION = 224;
+  public static final int NO_TEXTUAL_CONTENT = 251;
+
+  public static final int SIGNATURE_COULDNT_BE_CREATED = 300;
+  public static final int SIGNED_TEXT_EMPTY = 301;
+  public static final int PROFILE_NOT_DEFINED = 302;
+  public static final int SERIAL_NUMBER_INVALID = 303;
+  public static final int SIG_CERTIFICATE_CANNOT_BE_READ = 304;
+  public static final int PROFILE_NOT_USABLE_FOR_TEXT = 305;
+  
+  public static final int COULDNT_VERIFY = 310;
+  
+  public static final int CERTIFICATE_NOT_FOUND = 313;
+  public static final int NOT_SEMANTICALLY_EQUAL = 314;
+
+  public static final int MODIFIED_AFTER_SIGNATION = 316;
+  public static final int NON_BINARY_SIGNATURES_PRESENT = 317;  
+  
+  public static final int UNSUPPORTED_REPLACES_NAME = 318;
+  public static final int UNSUPPORTED_SIGNATURE = 319;
+
+  public static final int DETACHED_SIGNATURE_NOT_SUPPORTED = 370;
+  
+  public static final int SIGNATURE_VERIFICATION_NOT_SUPPORTED = 371;  
+  public static final int INVALID_SIGNING_TIME = 372;
+
+  public static final int BKU_NOT_SUPPORTED = 373;
+  
+  public static final int WEB_EXCEPTION = 330;
+  public static final int UNABLE_TO_RECEIVE_SUITABLE_RESPONSE = 340;
+
+  
+  public static final int NORMALIZER_EXCEPTION = 400;
+  
+  public static final int SESSION_EXPIRED = 600;
+  
+  public static final int PLACEHOLDER_EXCEPTION = 700;
+  public static final int CAPTION_NOT_FOUND_EXCEPTION = 701;
+
+  public static final int UNABLE_TO_PARSE_ID = 800;
+  public static final int CORRECTOR_EXCEPTION = 801;
+  public static final int EXTERNAL_CORRECTOR_TIMEOUT_REACHED = 802;  
+
+  public static final int WRAPPED_ERROR_CODE = 998;
+  public static final int FUNCTION_NOT_AVAILABLE = 999;
+}
diff --git a/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/exceptions/PdfAsException.java b/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/exceptions/PdfAsException.java
index fb602934..e20301e5 100644
--- a/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/exceptions/PdfAsException.java
+++ b/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/exceptions/PdfAsException.java
@@ -1,99 +1,122 @@
-/**

- * <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.exceptions;

-

-/**

- * This exception is the base for all PDF-AS exceptions.

- * 

- * <p>

- * Every PDF-AS Exception has an error code.

- * </p>

- * 

- * @author wprinz

- */

-@Deprecated

-public class PdfAsException extends Exception

-{

-  /**

-   * The error code.

-   */

-  protected int errorCode = -1;

-

-  /**

-   * Constructor.

-   * 

-   * @param errorCode

-   *          The error code.

-   * @param message

-   *          The detail message.

-   */

-  public PdfAsException(int errorCode, String message)

-  {

-    super(message);

-

-    this.errorCode = errorCode;

-  }

-

-  /**

-   * Constructor.

-   * 

-   * @param errorCode

-   *          The error code.

-   * @param message

-   *          The detail message.

-   * @param cause

-   *          The cause.

-   */

-  public PdfAsException(int errorCode, String message, Throwable cause)

-  {

-    super(message, cause);

-

-    this.errorCode = errorCode;

-  }

-

-  /**

-   * Constructor.

-   * 

-   * @param errorCode

-   *          The error code.

-   * @param cause

-   *          The cause.

-   */

-  public PdfAsException(int errorCode, Throwable cause)

-  {

-    super(cause);

-

-    this.errorCode = errorCode;

-  }

-

-  /**

-   * Returns the error code of this exception.

-   * 

-   * @return Returns the error code of this exception.

-   */

-  public int getErrorCode()

-  {

-    return this.errorCode;

-  }

-}

+/*******************************************************************************
+ * <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.exceptions;
+
+/**
+ * This exception is the base for all PDF-AS exceptions.
+ * 
+ * <p>
+ * Every PDF-AS Exception has an error code.
+ * </p>
+ * 
+ * @author wprinz
+ */
+@Deprecated
+public class PdfAsException extends Exception
+{
+  /**
+   * The error code.
+   */
+  protected int errorCode = -1;
+
+  /**
+   * Constructor.
+   * 
+   * @param errorCode
+   *          The error code.
+   * @param message
+   *          The detail message.
+   */
+  public PdfAsException(int errorCode, String message)
+  {
+    super(message);
+
+    this.errorCode = errorCode;
+  }
+
+  /**
+   * Constructor.
+   * 
+   * @param errorCode
+   *          The error code.
+   * @param message
+   *          The detail message.
+   * @param cause
+   *          The cause.
+   */
+  public PdfAsException(int errorCode, String message, Throwable cause)
+  {
+    super(message, cause);
+
+    this.errorCode = errorCode;
+  }
+
+  /**
+   * Constructor.
+   * 
+   * @param errorCode
+   *          The error code.
+   * @param cause
+   *          The cause.
+   */
+  public PdfAsException(int errorCode, Throwable cause)
+  {
+    super(cause);
+
+    this.errorCode = errorCode;
+  }
+
+  /**
+   * Returns the error code of this exception.
+   * 
+   * @return Returns the error code of this exception.
+   */
+  public int getErrorCode()
+  {
+    return this.errorCode;
+  }
+}
diff --git a/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/exceptions/PdfAsWrappedException.java b/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/exceptions/PdfAsWrappedException.java
index c5fb3fd3..d8ea2825 100644
--- a/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/exceptions/PdfAsWrappedException.java
+++ b/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/exceptions/PdfAsWrappedException.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.
+ ******************************************************************************/
 package at.gv.egiz.pdfas.api.exceptions;
 
 @Deprecated
diff --git a/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/io/DataSink.java b/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/io/DataSink.java
index 5163822d..9c0b6b09 100644
--- a/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/io/DataSink.java
+++ b/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/io/DataSink.java
@@ -1,99 +1,122 @@
-/**

- * <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.io;

-

-import java.io.IOException;

-import java.io.OutputStream;

-

-/**

- * Output document data sink.

- * 

- * <p>

- * Actually, the DataSink can be seen as a factory for creating OutputStreams

- * with mime type and character encoding provided. This allows the API user to

- * decide how data is to be stored (e.g. in a file, in a byte array, etc.).

- * </p>

- * 

- * @author wprinz

- */

-@Deprecated

-public interface DataSink

-{

-  /**

-   * Creates an OutputStream for binary data.

-   * 

-   * <p>

-   * Note that the stream may be written only once. Creating another stream

-   * overwrites the existing one.

-   * </p>

-   * 

-   * @param mimeType

-   *          The mime type of the output data.

-   * @return Returns the created output stream.

-   * @throws IOException

-   *           Thrown if the stream cannot be created.

-   */

-  public OutputStream createOutputStream(String mimeType) throws IOException;

-

-  /**

-   * Creates an OutputStream for character data.

-   * 

-   * <p>

-   * This is basically the same as {@link #createOutputStream(String)}, but

-   * allows to specify the character encoding.

-   * </p>

-   * 

-   * @param mimeType

-   *          The mime type of the output data.

-   * @param characterEncoding

-   *          The character encoding of the data.

-   * @return Returns the created output stream.

-   * @throws IOException

-   *           Thrown if the stream cannot be created.

-   */

-  public OutputStream createOutputStream(String mimeType, String characterEncoding) throws IOException;

-

-  /**

-   * Returns the mime type of the data stream.

-   * 

-   * <p>

-   * This is only valid after a stream has been created.

-   * </p>

-   * 

-   * @return Returns the mime type of the data stream.

-   */

-  public String getMimeType();

-

-  /**

-   * Returns the character encoding of the data stream.

-   * 

-   * <p>

-   * This is only valid after a stream has been created. Null means that no

-   * character encoding was specified for the data (e.g. if the data is binary).

-   * </p>

-   * 

-   * @return Returns the character encoding of the data stream.

-   */

-  public String getCharacterEncoding();

-}

+/*******************************************************************************
+ * <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.io;
+
+import java.io.IOException;
+import java.io.OutputStream;
+
+/**
+ * Output document data sink.
+ * 
+ * <p>
+ * Actually, the DataSink can be seen as a factory for creating OutputStreams
+ * with mime type and character encoding provided. This allows the API user to
+ * decide how data is to be stored (e.g. in a file, in a byte array, etc.).
+ * </p>
+ * 
+ * @author wprinz
+ */
+@Deprecated
+public interface DataSink
+{
+  /**
+   * Creates an OutputStream for binary data.
+   * 
+   * <p>
+   * Note that the stream may be written only once. Creating another stream
+   * overwrites the existing one.
+   * </p>
+   * 
+   * @param mimeType
+   *          The mime type of the output data.
+   * @return Returns the created output stream.
+   * @throws IOException
+   *           Thrown if the stream cannot be created.
+   */
+  public OutputStream createOutputStream(String mimeType) throws IOException;
+
+  /**
+   * Creates an OutputStream for character data.
+   * 
+   * <p>
+   * This is basically the same as {@link #createOutputStream(String)}, but
+   * allows to specify the character encoding.
+   * </p>
+   * 
+   * @param mimeType
+   *          The mime type of the output data.
+   * @param characterEncoding
+   *          The character encoding of the data.
+   * @return Returns the created output stream.
+   * @throws IOException
+   *           Thrown if the stream cannot be created.
+   */
+  public OutputStream createOutputStream(String mimeType, String characterEncoding) throws IOException;
+
+  /**
+   * Returns the mime type of the data stream.
+   * 
+   * <p>
+   * This is only valid after a stream has been created.
+   * </p>
+   * 
+   * @return Returns the mime type of the data stream.
+   */
+  public String getMimeType();
+
+  /**
+   * Returns the character encoding of the data stream.
+   * 
+   * <p>
+   * This is only valid after a stream has been created. Null means that no
+   * character encoding was specified for the data (e.g. if the data is binary).
+   * </p>
+   * 
+   * @return Returns the character encoding of the data stream.
+   */
+  public String getCharacterEncoding();
+}
diff --git a/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/io/DataSource.java b/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/io/DataSource.java
index dfeb6261..0bd8966a 100644
--- a/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/io/DataSource.java
+++ b/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/io/DataSource.java
@@ -1,95 +1,118 @@
-/**

- * <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.io;

-

-import java.io.InputStream;

-

-/**

- * Input document data source.

- * 

- * <p>

- * This allows the holder of the data to decide how the data is to be stored (e.g. in a File or in a byte array).

- * </p>

- * 

- * @author wprinz

- * 

- */

-@Deprecated

-public interface DataSource

-{

-  /**

-   * Creates a new InputStream that allows to read out the document's binary

-   * data from the beginning.

-   * 

-   * @return Returns the InputStream with the binary data.

-   */

-  public InputStream createInputStream();

-

-  /**

-   * Returns the length (number of bytes) of the stream.

-   * 

-   * @return Returns the length (number of bytes) of the stream.

-   */

-  public int getLength();

-

-  /**

-   * Returns the data of this DataSource as a byte array for random read only access.

-   * 

-   * <p>

-   * Calling this method indicates that you need a byte array for random

-   * <strong>read only</strong> access. The DataSource implementation should of

-   * course cache this byte array to avoid too much memory usage.

-   * </p>

-   * <p>

-   * Performance analysis has shown that the libraries internally convert the

-   * streams to byte arrays and that file system access is very slow.

-   * </p>

-   * <p>

-   * Never write to this byte array!

-   * </p>

-   * 

-   * @return Returns the data of this DataSource as a byte array for random read only access.

-   */

-  public byte[] getAsByteArray();

-

-  /**

-   * Returns the mime type of the data.

-   * 

-   * @return Returns the mime type of the data.

-   */

-  public String getMimeType();

-

-  /**

-   * Returns the character encoding of the data.

-   * 

-   * <p>

-   * This makes only sense for character based mime types.

-   * </p>

-   * 

-   * @return Returns the character encoding of the data or null if no encoding

-   *         is applicable (e.g. if the data is binary).

-   */

-  public String getCharacterEncoding();

-

-}

+/*******************************************************************************
+ * <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.io;
+
+import java.io.InputStream;
+
+/**
+ * Input document data source.
+ * 
+ * <p>
+ * This allows the holder of the data to decide how the data is to be stored (e.g. in a File or in a byte array).
+ * </p>
+ * 
+ * @author wprinz
+ * 
+ */
+@Deprecated
+public interface DataSource
+{
+  /**
+   * Creates a new InputStream that allows to read out the document's binary
+   * data from the beginning.
+   * 
+   * @return Returns the InputStream with the binary data.
+   */
+  public InputStream createInputStream();
+
+  /**
+   * Returns the length (number of bytes) of the stream.
+   * 
+   * @return Returns the length (number of bytes) of the stream.
+   */
+  public int getLength();
+
+  /**
+   * Returns the data of this DataSource as a byte array for random read only access.
+   * 
+   * <p>
+   * Calling this method indicates that you need a byte array for random
+   * <strong>read only</strong> access. The DataSource implementation should of
+   * course cache this byte array to avoid too much memory usage.
+   * </p>
+   * <p>
+   * Performance analysis has shown that the libraries internally convert the
+   * streams to byte arrays and that file system access is very slow.
+   * </p>
+   * <p>
+   * Never write to this byte array!
+   * </p>
+   * 
+   * @return Returns the data of this DataSource as a byte array for random read only access.
+   */
+  public byte[] getAsByteArray();
+
+  /**
+   * Returns the mime type of the data.
+   * 
+   * @return Returns the mime type of the data.
+   */
+  public String getMimeType();
+
+  /**
+   * Returns the character encoding of the data.
+   * 
+   * <p>
+   * This makes only sense for character based mime types.
+   * </p>
+   * 
+   * @return Returns the character encoding of the data or null if no encoding
+   *         is applicable (e.g. if the data is binary).
+   */
+  public String getCharacterEncoding();
+
+}
diff --git a/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/io/FileBased.java b/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/io/FileBased.java
index c09f480b..c2a7b25f 100644
--- a/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/io/FileBased.java
+++ b/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/io/FileBased.java
@@ -1,52 +1,75 @@
-/**

- * <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.io;

-

-import java.io.File;

-

-/**

- * Tells that the IO element (DataSink or DataSource) is backed by a file in the local file system.

- * 

- * <p>

- * This is a hint that may be used by PDF-AS to optimize data access.

- * </p>

- * 

- * @author wprinz

- */

-@Deprecated

-public interface FileBased

-{

-  

-  /**

-   * Returns the File "behind" this io element.

-   * 

-   * <p>

-   * This is usually used to determine the file name itself.

-   * </p>

-   * 

-   * @return Returns the File "behind" this io element.

-   */

-  public File getFile ();

-

-}

+/*******************************************************************************
+ * <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.io;
+
+import java.io.File;
+
+/**
+ * Tells that the IO element (DataSink or DataSource) is backed by a file in the local file system.
+ * 
+ * <p>
+ * This is a hint that may be used by PDF-AS to optimize data access.
+ * </p>
+ * 
+ * @author wprinz
+ */
+@Deprecated
+public interface FileBased
+{
+  
+  /**
+   * Returns the File "behind" this io element.
+   * 
+   * <p>
+   * This is usually used to determine the file name itself.
+   * </p>
+   * 
+   * @return Returns the File "behind" this io element.
+   */
+  public File getFile ();
+
+}
diff --git a/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/io/TextBased.java b/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/io/TextBased.java
index 9e3987ba..fadd8bbf 100644
--- a/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/io/TextBased.java
+++ b/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/io/TextBased.java
@@ -1,51 +1,74 @@
-/**

- * <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.io;

-

-/**

- * Tells, that the IO Element (DataSink - but mostly DataSource) is based upon

- * character data.

- * 

- * <p>

- * This can be used to retrieve the character text directly with the correct

- * encoding etc.

- * </p>

- * <p>

- * This makes most sense for text DataSources.

- * </p>

- * 

- * @author wprinz

- */

-@Deprecated

-public interface TextBased

-{

-

-  /**

-   * Returns the text.

-   * 

-   * @return Returns the text.

-   */

-  public String getText();

-

-}

+/*******************************************************************************
+ * <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.io;
+
+/**
+ * Tells, that the IO Element (DataSink - but mostly DataSource) is based upon
+ * character data.
+ * 
+ * <p>
+ * This can be used to retrieve the character text directly with the correct
+ * encoding etc.
+ * </p>
+ * <p>
+ * This makes most sense for text DataSources.
+ * </p>
+ * 
+ * @author wprinz
+ */
+@Deprecated
+public interface TextBased
+{
+
+  /**
+   * Returns the text.
+   * 
+   * @return Returns the text.
+   */
+  public String getText();
+
+}
diff --git a/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/sign/SignParameters.java b/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/sign/SignParameters.java
index 62b48227..5466d596 100644
--- a/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/sign/SignParameters.java
+++ b/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/sign/SignParameters.java
@@ -1,394 +1,417 @@
-/**

- * <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.sign;

-

-import java.util.Properties;

-

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

-import at.gv.egiz.pdfas.api.io.DataSink;

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

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

-import at.gv.egiz.pdfas.api.timestamp.TimeStamper;

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

-

-/**

- * Parameter object that holds the sign parameters.

- *

- * @author wprinz

- */

-@Deprecated

-public class SignParameters

-{

-// 23.11.2010 changed by exthex - added parameters for placeholder handling

-

-  /**

-   * The document to be signed.

-   *

-   * <p>

-   * The DataSource implementation encapsulates the actual representaion of the

-   * data. E.g. the DataSource may be File based or byte array based. See

-   * package at.gv.egiz.pdfas.framework.input and at.gv.pdfas.impl.input

-   * </p>

-   */

-  protected DataSource document = null;

-

-  /**

-   * The type of the signature.

-   *

-   * <p>

-   * May be {@link Constants#SIGNATURE_TYPE_BINARY} or

-   * {@link Constants#SIGNATURE_TYPE_TEXTUAL}.

-   * </p>

-   */

-  protected String signatureType = Constants.DEFAULT_SIGNATURE_TYPE;

-

-  /**

-   * 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 signature profile identifier identifying the profile to be used in the

-   * config file.

-   *

-   * <p>

-   * Note: In near future it will be possible to provide a full specified

-   * profile here instead of the profile id.

-   * </p>

-   */

-  protected String signatureProfileId = null;

-

-  /**

-   * The signature key identifier specifying which signature key should be used

-   * by the signature device to perform the signature.

-   *

-   * <p>

-   * Providing a null value (default) means that no explicit signature key

-   * identifier is provided. The selected signature device will then use its

-   * default mechanism for retrieving this information (which is usually to read

-   * the key from the provided signature profile).

-   * </p>

-   * <p>

-   * Note that not all signature devices may support this parameter.

-   * If a signature device doesn't support this parameter the value should be null.

-   * </p>

-   * <p>

-   * This key is usually passed straight through to the signature device and

-   * thereby has to contain an appropriate value for the signature device

-   * chosen.

-   * </p>

-   * <p>

-   * Currently, only the {@link Constants#SIGNATURE_DEVICE_MOA} signature device

-   * evaluates this parameter and passes the provided String to MOA as the MOA

-   * key group identifier. If null is provided, the MOA signature device will

-   * determine the signature key identifier to be used from the provided profile

-   * and, if not specified there either, from the MOA default configuration.

-   * </p>

-   */

-  protected String signatureKeyIdentifier = null;

-

-  /**

-   * The signature position. Consult the PDF-AS documentation section

-   * Commandline.

-   */

-  protected SignaturePositioning signaturePositioning = null;

-

-  /**

-   * The output DataSink that will receive the signed document.

-   */

-  protected DataSink output = null;

-

-  protected TimeStamper timeStamperImpl;

-

-  /**

-   * The flag to de-/activate placeholder search

-   */

-  protected Boolean checkForPlaceholder = null;

-

-  /**

-   * The id of the placeholder which should be replaced.

-   */

-  protected String placeholderId;

-

-  /**

-   * The matching mode for placeholder extraction.<br/>

-   * If a {@link SignParameters#placeholderId} is set, the match mode determines what is to be done, if no matching placeholder is found in the document.

-   * <br/>

-   * Defaults to {@link Constants#PLACEHOLDER_MATCH_MODE_MODERATE}.

-   */

-  protected int placeholderMatchMode = Constants.PLACEHOLDER_MATCH_MODE_MODERATE;

-

-  protected Properties overrideProps = new Properties();

-

-

-

-

-

-  /**

-   * {@link #setTimeStamperImpl(TimeStamper)}

-   * @return

-   */

-  public TimeStamper getTimeStamperImpl() {

-     return this.timeStamperImpl;

-  }

-

-  /**

-   * Set a {@link TimeStamper} to create a timestamp on the signature value. Will be

-   * called after sign. For binary signatures only. Timestamp will be embedded in egiz dict /TimeStamp.

-   * @param timeStamperImpl

-   */

-  public void setTimeStamperImpl(TimeStamper timeStamperImpl) {

-     this.timeStamperImpl = timeStamperImpl;

-  }

-

-/**

-   * @return the document

-   */

-  public DataSource getDocument()

-  {

-    return document;

-  }

-

-  /**

-   * @param document

-   *          the document to set

-   */

-  public void setDocument(DataSource document)

-  {

-    this.document = document;

-  }

-

-  /**

-   * @return the signatureType

-   */

-  public String getSignatureType()

-  {

-    return signatureType;

-  }

-

-  /**

-   * @param signatureType

-   *          the signatureType to set

-   */

-  public void setSignatureType(String signatureType)

-  {

-    this.signatureType = signatureType;

-  }

-

-  /**

-   * @return the signatureDevice

-   */

-  public String getSignatureDevice()

-  {

-    return signatureDevice;

-  }

-

-  /**

-   * @param signatureDevice

-   *          the signatureDevice to set

-   */

-  public void setSignatureDevice(String signatureDevice)

-  {

-    this.signatureDevice = signatureDevice;

-  }

-

-  /**

-   * @return the signatureProfileId

-   */

-  public String getSignatureProfileId()

-  {

-    return signatureProfileId;

-  }

-

-  /**

-   * @param signatureProfileId

-   *          the signatureProfileId to set

-   */

-  public void setSignatureProfileId(String signatureProfileId)

-  {

-    this.signatureProfileId = signatureProfileId;

-  }

-

-  /**

-   * @return the signaturePositioning

-   */

-  public SignaturePositioning getSignaturePositioning()

-  {

-    return this.signaturePositioning;

-  }

-

-  /**

-   * @param signaturePositioning

-   *          the signaturePositioning to set

-   */

-  public void setSignaturePositioning(SignaturePositioning signaturePositioning)

-  {

-    this.signaturePositioning = signaturePositioning;

-  }

-

-  /**

-   * @return the output

-   */

-  public DataSink getOutput()

-  {

-    return output;

-  }

-

-  /**

-   * @param output

-   *          the output to set

-   */

-  public void setOutput(DataSink output)

-  {

-    this.output = output;

-  }

-

-  /**

-   * @return the signatureKeyIdentifier

-   */

-  public String getSignatureKeyIdentifier()

-  {

-    return this.signatureKeyIdentifier;

-  }

-

-  /**

-   * @param signatureKeyIdentifier the signatureKeyIdentifier to set

-   */

-  public void setSignatureKeyIdentifier(String signatureKeyIdentifier)

-  {

-    this.signatureKeyIdentifier = signatureKeyIdentifier;

-  }

-

-  /**

-   * Override user defined values from the used signature profile like "value.SIG_META".

-   * You cannot override pre defined values like SIG_VALUE, SIG_DATE {@link SignatureTypes#REQUIRED_SIG_KEYS}.

-   * The override values are bound to the {@link SignParameters} instance.

-   * <p>

-   * Sample usage:

-   * <pre>

-      SignParameters sp = new SignParameters();

-      . . .

-

-      sp.setSignatureProfileId("SIGNATURBLOCK_DE");

-

-      // expressions do not work on binary signature fields without phlength setting!!

-      sp.setProfileOverrideValue("SIG_META", "It's nice to be important, but it is more important to be nice ${subject.L}");;

-      sp.setProfileOverrideValue("SIG_LABEL", "./images/signatur-logo_en.png");

-

-      // execute sign using the overrides

-      pdfAs.sign(sp);

-  </pre>

-   * </p>

-   * @param key the name of the setting to override e.g. "SIG_META"

-   * @param value The new value

-   */

-   public void setProfileOverrideValue(String key, String value) {

-      if (SignatureTypes.isRequredSigTypeKey(key)) {

-         throw new RuntimeException("cannot set value for pre defined signature field names");

-      }

-      this.overrideProps.put(key, value);

-   }

-

-   /**

-    * Get override values created via {@link #setProfileOverrideValue(String, String)}

-    * @return

-    */

-   public Properties getProfileOverrideProperties() {

-      return this.overrideProps;

-

-   }

-

-  /**

-   * Get the value of the checkForPlaceholder flag.

-   *

-   * @return

-   */

-  public Boolean isCheckForPlaceholder() {

-    return this.checkForPlaceholder;

-  }

-

-  /**

-   * Set this to true, if you want a search for placeholder images to be performed and

-   * appropriate images to be replaced.

-   * If this is not set, a search will only be performed if the configuration property "enable_placeholder_search" is set to true.

-   *

-   * @param check

-   */

-  public void setCheckForPlaceholder(Boolean searchForPlaceHolder) {

-    this.checkForPlaceholder = searchForPlaceHolder;

-  }

-

-  /**

-   * Set an explicit placeholder id.

-   * Only placeholder images that have a matching ID property embedded will be considered for replacement.

-   *

-   * @param placeholderId

-   */

-  public void setPlaceholderId(String placeholderId) {

-    this.placeholderId = placeholderId;

-  }

-

-  /**

-   * The id of the placeholder to replace.

-   *

-   * @return the placeholderId

-   */

-  public String getPlaceholderId() {

-    return placeholderId;

-  }

-

-  /**

-   * Set the behavior if no exactly matching placeholder could be found.<br/>

-   * Exactly matching meaning:<br/>

-   * <ul><li>If a placeholderId is set: a placeholder which has exactly this id embedded</li>

-   * <li>If no placeholderId is set: a placeholder without an embedded id is found</li></ul>

-   *

-   * @see Constants#PLACEHOLDER_MATCH_MODE_LENIENT

-   * @see Constants#PLACEHOLDER_MATCH_MODE_MODERATE

-   * @see Constants#PLACEHOLDER_MATCH_MODE_STRICT

-   *

-   * Defaults to {@link Constants#PLACEHOLDER_MATCH_MODE_MODERATE}.

-   *

-   * @param placeholderMatchMode

-   */

-  public void setPlaceholderMatchMode(int placeholderMatchMode) {

-    this.placeholderMatchMode = placeholderMatchMode;

-  }

-

-  /**

-   * Get the placeholder matching mode.

-   *

-   * @see SignParameters#getPlaceholderMatchMode()

-   * @return the placeholderMatchMode

-   */

-  public int getPlaceholderMatchMode() {

-    return this.placeholderMatchMode;

-  }

-

-}

+/*******************************************************************************
+ * <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.sign;
+
+import java.util.Properties;
+
+import at.gv.egiz.pdfas.api.commons.Constants;
+import at.gv.egiz.pdfas.api.io.DataSink;
+import at.gv.egiz.pdfas.api.io.DataSource;
+import at.gv.egiz.pdfas.api.sign.pos.SignaturePositioning;
+import at.gv.egiz.pdfas.api.timestamp.TimeStamper;
+import at.knowcenter.wag.egov.egiz.sig.SignatureTypes;
+
+/**
+ * Parameter object that holds the sign parameters.
+ *
+ * @author wprinz
+ */
+@Deprecated
+public class SignParameters
+{
+// 23.11.2010 changed by exthex - added parameters for placeholder handling
+
+  /**
+   * The document to be signed.
+   *
+   * <p>
+   * The DataSource implementation encapsulates the actual representaion of the
+   * data. E.g. the DataSource may be File based or byte array based. See
+   * package at.gv.egiz.pdfas.framework.input and at.gv.pdfas.impl.input
+   * </p>
+   */
+  protected DataSource document = null;
+
+  /**
+   * The type of the signature.
+   *
+   * <p>
+   * May be {@link Constants#SIGNATURE_TYPE_BINARY} or
+   * {@link Constants#SIGNATURE_TYPE_TEXTUAL}.
+   * </p>
+   */
+  protected String signatureType = Constants.DEFAULT_SIGNATURE_TYPE;
+
+  /**
+   * 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 signature profile identifier identifying the profile to be used in the
+   * config file.
+   *
+   * <p>
+   * Note: In near future it will be possible to provide a full specified
+   * profile here instead of the profile id.
+   * </p>
+   */
+  protected String signatureProfileId = null;
+
+  /**
+   * The signature key identifier specifying which signature key should be used
+   * by the signature device to perform the signature.
+   *
+   * <p>
+   * Providing a null value (default) means that no explicit signature key
+   * identifier is provided. The selected signature device will then use its
+   * default mechanism for retrieving this information (which is usually to read
+   * the key from the provided signature profile).
+   * </p>
+   * <p>
+   * Note that not all signature devices may support this parameter.
+   * If a signature device doesn't support this parameter the value should be null.
+   * </p>
+   * <p>
+   * This key is usually passed straight through to the signature device and
+   * thereby has to contain an appropriate value for the signature device
+   * chosen.
+   * </p>
+   * <p>
+   * Currently, only the {@link Constants#SIGNATURE_DEVICE_MOA} signature device
+   * evaluates this parameter and passes the provided String to MOA as the MOA
+   * key group identifier. If null is provided, the MOA signature device will
+   * determine the signature key identifier to be used from the provided profile
+   * and, if not specified there either, from the MOA default configuration.
+   * </p>
+   */
+  protected String signatureKeyIdentifier = null;
+
+  /**
+   * The signature position. Consult the PDF-AS documentation section
+   * Commandline.
+   */
+  protected SignaturePositioning signaturePositioning = null;
+
+  /**
+   * The output DataSink that will receive the signed document.
+   */
+  protected DataSink output = null;
+
+  protected TimeStamper timeStamperImpl;
+
+  /**
+   * The flag to de-/activate placeholder search
+   */
+  protected Boolean checkForPlaceholder = null;
+
+  /**
+   * The id of the placeholder which should be replaced.
+   */
+  protected String placeholderId;
+
+  /**
+   * The matching mode for placeholder extraction.<br/>
+   * If a {@link SignParameters#placeholderId} is set, the match mode determines what is to be done, if no matching placeholder is found in the document.
+   * <br/>
+   * Defaults to {@link Constants#PLACEHOLDER_MATCH_MODE_MODERATE}.
+   */
+  protected int placeholderMatchMode = Constants.PLACEHOLDER_MATCH_MODE_MODERATE;
+
+  protected Properties overrideProps = new Properties();
+
+
+
+
+
+  /**
+   * {@link #setTimeStamperImpl(TimeStamper)}
+   * @return
+   */
+  public TimeStamper getTimeStamperImpl() {
+     return this.timeStamperImpl;
+  }
+
+  /**
+   * Set a {@link TimeStamper} to create a timestamp on the signature value. Will be
+   * called after sign. For binary signatures only. Timestamp will be embedded in egiz dict /TimeStamp.
+   * @param timeStamperImpl
+   */
+  public void setTimeStamperImpl(TimeStamper timeStamperImpl) {
+     this.timeStamperImpl = timeStamperImpl;
+  }
+
+/**
+   * @return the document
+   */
+  public DataSource getDocument()
+  {
+    return document;
+  }
+
+  /**
+   * @param document
+   *          the document to set
+   */
+  public void setDocument(DataSource document)
+  {
+    this.document = document;
+  }
+
+  /**
+   * @return the signatureType
+   */
+  public String getSignatureType()
+  {
+    return signatureType;
+  }
+
+  /**
+   * @param signatureType
+   *          the signatureType to set
+   */
+  public void setSignatureType(String signatureType)
+  {
+    this.signatureType = signatureType;
+  }
+
+  /**
+   * @return the signatureDevice
+   */
+  public String getSignatureDevice()
+  {
+    return signatureDevice;
+  }
+
+  /**
+   * @param signatureDevice
+   *          the signatureDevice to set
+   */
+  public void setSignatureDevice(String signatureDevice)
+  {
+    this.signatureDevice = signatureDevice;
+  }
+
+  /**
+   * @return the signatureProfileId
+   */
+  public String getSignatureProfileId()
+  {
+    return signatureProfileId;
+  }
+
+  /**
+   * @param signatureProfileId
+   *          the signatureProfileId to set
+   */
+  public void setSignatureProfileId(String signatureProfileId)
+  {
+    this.signatureProfileId = signatureProfileId;
+  }
+
+  /**
+   * @return the signaturePositioning
+   */
+  public SignaturePositioning getSignaturePositioning()
+  {
+    return this.signaturePositioning;
+  }
+
+  /**
+   * @param signaturePositioning
+   *          the signaturePositioning to set
+   */
+  public void setSignaturePositioning(SignaturePositioning signaturePositioning)
+  {
+    this.signaturePositioning = signaturePositioning;
+  }
+
+  /**
+   * @return the output
+   */
+  public DataSink getOutput()
+  {
+    return output;
+  }
+
+  /**
+   * @param output
+   *          the output to set
+   */
+  public void setOutput(DataSink output)
+  {
+    this.output = output;
+  }
+
+  /**
+   * @return the signatureKeyIdentifier
+   */
+  public String getSignatureKeyIdentifier()
+  {
+    return this.signatureKeyIdentifier;
+  }
+
+  /**
+   * @param signatureKeyIdentifier the signatureKeyIdentifier to set
+   */
+  public void setSignatureKeyIdentifier(String signatureKeyIdentifier)
+  {
+    this.signatureKeyIdentifier = signatureKeyIdentifier;
+  }
+
+  /**
+   * Override user defined values from the used signature profile like "value.SIG_META".
+   * You cannot override pre defined values like SIG_VALUE, SIG_DATE {@link SignatureTypes#REQUIRED_SIG_KEYS}.
+   * The override values are bound to the {@link SignParameters} instance.
+   * <p>
+   * Sample usage:
+   * <pre>
+      SignParameters sp = new SignParameters();
+      . . .
+
+      sp.setSignatureProfileId("SIGNATURBLOCK_DE");
+
+      // expressions do not work on binary signature fields without phlength setting!!
+      sp.setProfileOverrideValue("SIG_META", "It's nice to be important, but it is more important to be nice ${subject.L}");;
+      sp.setProfileOverrideValue("SIG_LABEL", "./images/signatur-logo_en.png");
+
+      // execute sign using the overrides
+      pdfAs.sign(sp);
+  </pre>
+   * </p>
+   * @param key the name of the setting to override e.g. "SIG_META"
+   * @param value The new value
+   */
+   public void setProfileOverrideValue(String key, String value) {
+      if (SignatureTypes.isRequredSigTypeKey(key)) {
+         throw new RuntimeException("cannot set value for pre defined signature field names");
+      }
+      this.overrideProps.put(key, value);
+   }
+
+   /**
+    * Get override values created via {@link #setProfileOverrideValue(String, String)}
+    * @return
+    */
+   public Properties getProfileOverrideProperties() {
+      return this.overrideProps;
+
+   }
+
+  /**
+   * Get the value of the checkForPlaceholder flag.
+   *
+   * @return
+   */
+  public Boolean isCheckForPlaceholder() {
+    return this.checkForPlaceholder;
+  }
+
+  /**
+   * Set this to true, if you want a search for placeholder images to be performed and
+   * appropriate images to be replaced.
+   * If this is not set, a search will only be performed if the configuration property "enable_placeholder_search" is set to true.
+   *
+   * @param check
+   */
+  public void setCheckForPlaceholder(Boolean searchForPlaceHolder) {
+    this.checkForPlaceholder = searchForPlaceHolder;
+  }
+
+  /**
+   * Set an explicit placeholder id.
+   * Only placeholder images that have a matching ID property embedded will be considered for replacement.
+   *
+   * @param placeholderId
+   */
+  public void setPlaceholderId(String placeholderId) {
+    this.placeholderId = placeholderId;
+  }
+
+  /**
+   * The id of the placeholder to replace.
+   *
+   * @return the placeholderId
+   */
+  public String getPlaceholderId() {
+    return placeholderId;
+  }
+
+  /**
+   * Set the behavior if no exactly matching placeholder could be found.<br/>
+   * Exactly matching meaning:<br/>
+   * <ul><li>If a placeholderId is set: a placeholder which has exactly this id embedded</li>
+   * <li>If no placeholderId is set: a placeholder without an embedded id is found</li></ul>
+   *
+   * @see Constants#PLACEHOLDER_MATCH_MODE_LENIENT
+   * @see Constants#PLACEHOLDER_MATCH_MODE_MODERATE
+   * @see Constants#PLACEHOLDER_MATCH_MODE_STRICT
+   *
+   * Defaults to {@link Constants#PLACEHOLDER_MATCH_MODE_MODERATE}.
+   *
+   * @param placeholderMatchMode
+   */
+  public void setPlaceholderMatchMode(int placeholderMatchMode) {
+    this.placeholderMatchMode = placeholderMatchMode;
+  }
+
+  /**
+   * Get the placeholder matching mode.
+   *
+   * @see SignParameters#getPlaceholderMatchMode()
+   * @return the placeholderMatchMode
+   */
+  public int getPlaceholderMatchMode() {
+    return this.placeholderMatchMode;
+  }
+
+}
diff --git a/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/sign/SignResult.java b/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/sign/SignResult.java
index ad9b6cf8..e18d8105 100644
--- a/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/sign/SignResult.java
+++ b/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/sign/SignResult.java
@@ -1,85 +1,108 @@
-/**

- * <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.sign;

-

-import java.security.cert.X509Certificate;

-import java.util.List;

-

-import at.gv.egiz.pdfas.api.analyze.NonTextObjectInfo;

-import at.gv.egiz.pdfas.api.io.DataSink;

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

-

-/**

- * The result of a sign operation.

- * 

- * @author wprinz

- */

-@Deprecated

-public interface SignResult

-{

-

-  /**

-   * Returns the filled output data sink.

-   * 

-   * @return Returns the filled output data sink.

-   */

-  public DataSink getOutputDocument();

-

-  /**

-   * Returns the certificate of the signer.

-   * 

-   * @return Returns the certificate of the signer.

-   */

-  public X509Certificate getSignerCertificate();

-

-  /**

-   * Returns the position where the signature is finally placed.

-   * 

-   * <p>

-   * This information can be useful for post-processing the document.

-   * </p>

-   * 

-   * <p>

-   * Consult the PDF-AS documentation section Commandline for further

-   * information about positioning.

-   * </p>

-   * 

-   * @return Returns the position where the signature is finally placed. May

-   *         return null if no position information is available.

-   */

-  public SignaturePosition getSignaturePosition();

-  

-  /**

-   * Returns a list<{@link NonTextObjectInfo} of non textual objects in the pdf document.

-   * Only available for textual signatures. Show this to the user who signed the textual content only! 

-   * @return  List<{@link NonTextObjectInfo} or <tt>null</tt> of not available (binary signature)

-   */

-  public List getNonTextualObjects();

-  

-  /**

-   * Returns if pdf has non textual objects (only for textual signature available).

-   * @return

-   */

-  public boolean hasNonTextualObjects();

-}

+/*******************************************************************************
+ * <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.sign;
+
+import java.security.cert.X509Certificate;
+import java.util.List;
+
+import at.gv.egiz.pdfas.api.analyze.NonTextObjectInfo;
+import at.gv.egiz.pdfas.api.io.DataSink;
+import at.gv.egiz.pdfas.api.sign.pos.SignaturePosition;
+
+/**
+ * The result of a sign operation.
+ * 
+ * @author wprinz
+ */
+@Deprecated
+public interface SignResult
+{
+
+  /**
+   * Returns the filled output data sink.
+   * 
+   * @return Returns the filled output data sink.
+   */
+  public DataSink getOutputDocument();
+
+  /**
+   * Returns the certificate of the signer.
+   * 
+   * @return Returns the certificate of the signer.
+   */
+  public X509Certificate getSignerCertificate();
+
+  /**
+   * Returns the position where the signature is finally placed.
+   * 
+   * <p>
+   * This information can be useful for post-processing the document.
+   * </p>
+   * 
+   * <p>
+   * Consult the PDF-AS documentation section Commandline for further
+   * information about positioning.
+   * </p>
+   * 
+   * @return Returns the position where the signature is finally placed. May
+   *         return null if no position information is available.
+   */
+  public SignaturePosition getSignaturePosition();
+  
+  /**
+   * Returns a list<{@link NonTextObjectInfo} of non textual objects in the pdf document.
+   * Only available for textual signatures. Show this to the user who signed the textual content only! 
+   * @return  List<{@link NonTextObjectInfo} or <tt>null</tt> of not available (binary signature)
+   */
+  public List getNonTextualObjects();
+  
+  /**
+   * Returns if pdf has non textual objects (only for textual signature available).
+   * @return
+   */
+  public boolean hasNonTextualObjects();
+}
diff --git a/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/sign/SignatureDetailInformation.java b/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/sign/SignatureDetailInformation.java
index b4bba9a3..11b063ed 100644
--- a/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/sign/SignatureDetailInformation.java
+++ b/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/sign/SignatureDetailInformation.java
@@ -1,148 +1,171 @@
-/**

- * <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.sign;

-

-import java.security.cert.X509Certificate;

-import java.util.Date;

-import java.util.List;

-import java.util.Map;

-

-import at.gv.egiz.pdfas.api.analyze.NonTextObjectInfo;

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

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

-

-/**

- * A container for all relevant signature related data.

- * 

- * @author exthex

- */

-@Deprecated

-public interface SignatureDetailInformation

-{

-  public DataSource getSignatureData();

-

-  /**

-   * Returns the position where the signature table was actually placed.

-   * 

-   * @return Returns the position where the signature table was actually placed.

-   */

-  public SignaturePosition getSignaturePosition();

-  

-  /**

-   * Returns a list<{@link NonTextObjectInfo} of non textual objects in the pdf document.

-   * Only available for textual signatures. Show this to the user who signed the textual content only! 

-   * @return  List<{@link NonTextObjectInfo} or <tt>null</tt> of not available (binary signature)

-   */

-  public List getNonTextualObjects();

-  

-  /**

-   * Returns the date of signature extracted from the signature.

-   * @return

-   */

-  public Date getSignDate();

-  

-  /**

-   * Get the name of the issuer. 

-   * Short for {@link SignatureDetailInformation#getX509Certificate()#getIssuer()#getName()}

-   * 

-   * @return

-   */

-  public String getIssuer();

-

-  /**

-   * Short for {@link SignatureDetailInformation#getX509Certificate()#getIssuerDNMap()}

-   * 

-   * @return

-   */

-  public Map getIssuerDNMap();

-  

-  /**

-   * Short for {@link SignatureDetailInformation#getX509Certificate()#getSubjectName()#toString()}

-   * 

-   * @return

-   */

-  public String getSubjectName();

-  

-  /**

-   * Short for {@link SignatureDetailInformation#getX509Certificate()#getSerialNumber()#toString()}

-   * 

-   * @return

-   */

-  public String getSerialNumber();

-  

-  /**

-   * Get the algorithm the signature was created with.

-   * @return

-   */

-  public String getSigAlgorithm();

-  

-  /**

-   * 

-   * @return the signature id.

-   */

-  public String getSigID();

-  

-  /**

-   * 

-   * @return the signature method.

-   */

-  public String getSigKZ();

-  

-  /**

-   * 

-   * @return the signature value.

-   */

-  public String getSignatureValue();

-  

-  /**

-   * 

-   * @return the signature time stamp.

-   */

-  public String getSigTimeStamp();

-  

-  /**

-   * Short for {@link SignatureDetailInformation#getX509Certificate()#getSubjectDNMap()}

-   * 

-   * @return

-   */

-  public Map getSubjectDNMap();

-

-  /**

-   * 

-   * @return the certificate used for signature.

-   */

-  public X509Certificate getX509Certificate();

-  

-  /**

-   * 

-   * @return true if the signature is textual, false otherwise.

-   */

-  public boolean isTextual();

-  

-  /**

-   * 

-   * @return true if this signature is binary, false otherwise.

-   */

-  public boolean isBinary();

-}

+/*******************************************************************************
+ * <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.sign;
+
+import java.security.cert.X509Certificate;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+import at.gv.egiz.pdfas.api.analyze.NonTextObjectInfo;
+import at.gv.egiz.pdfas.api.io.DataSource;
+import at.gv.egiz.pdfas.api.sign.pos.SignaturePosition;
+
+/**
+ * A container for all relevant signature related data.
+ * 
+ * @author exthex
+ */
+@Deprecated
+public interface SignatureDetailInformation
+{
+  public DataSource getSignatureData();
+
+  /**
+   * Returns the position where the signature table was actually placed.
+   * 
+   * @return Returns the position where the signature table was actually placed.
+   */
+  public SignaturePosition getSignaturePosition();
+  
+  /**
+   * Returns a list<{@link NonTextObjectInfo} of non textual objects in the pdf document.
+   * Only available for textual signatures. Show this to the user who signed the textual content only! 
+   * @return  List<{@link NonTextObjectInfo} or <tt>null</tt> of not available (binary signature)
+   */
+  public List getNonTextualObjects();
+  
+  /**
+   * Returns the date of signature extracted from the signature.
+   * @return
+   */
+  public Date getSignDate();
+  
+  /**
+   * Get the name of the issuer. 
+   * Short for {@link SignatureDetailInformation#getX509Certificate()#getIssuer()#getName()}
+   * 
+   * @return
+   */
+  public String getIssuer();
+
+  /**
+   * Short for {@link SignatureDetailInformation#getX509Certificate()#getIssuerDNMap()}
+   * 
+   * @return
+   */
+  public Map getIssuerDNMap();
+  
+  /**
+   * Short for {@link SignatureDetailInformation#getX509Certificate()#getSubjectName()#toString()}
+   * 
+   * @return
+   */
+  public String getSubjectName();
+  
+  /**
+   * Short for {@link SignatureDetailInformation#getX509Certificate()#getSerialNumber()#toString()}
+   * 
+   * @return
+   */
+  public String getSerialNumber();
+  
+  /**
+   * Get the algorithm the signature was created with.
+   * @return
+   */
+  public String getSigAlgorithm();
+  
+  /**
+   * 
+   * @return the signature id.
+   */
+  public String getSigID();
+  
+  /**
+   * 
+   * @return the signature method.
+   */
+  public String getSigKZ();
+  
+  /**
+   * 
+   * @return the signature value.
+   */
+  public String getSignatureValue();
+  
+  /**
+   * 
+   * @return the signature time stamp.
+   */
+  public String getSigTimeStamp();
+  
+  /**
+   * Short for {@link SignatureDetailInformation#getX509Certificate()#getSubjectDNMap()}
+   * 
+   * @return
+   */
+  public Map getSubjectDNMap();
+
+  /**
+   * 
+   * @return the certificate used for signature.
+   */
+  public X509Certificate getX509Certificate();
+  
+  /**
+   * 
+   * @return true if the signature is textual, false otherwise.
+   */
+  public boolean isTextual();
+  
+  /**
+   * 
+   * @return true if this signature is binary, false otherwise.
+   */
+  public boolean isBinary();
+}
diff --git a/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/sign/pos/SignaturePosition.java b/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/sign/pos/SignaturePosition.java
index f16d2ffb..ce73039f 100644
--- a/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/sign/pos/SignaturePosition.java
+++ b/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/sign/pos/SignaturePosition.java
@@ -1,73 +1,96 @@
-/**

- * <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.sign.pos;

-

-/**

- * Holds the actual, absolute signature position where a signature was placed.

- * 

- * <p>

- * This is usually returned after signing.

- * </p>

- * 

- * @author wprinz

- */

-@Deprecated

-public interface SignaturePosition

-{

-  /**

-   * Returns the page on which the signature was placed.

-   * 

-   * @return Returns the page on which the signature was placed.

-   */

-  public int getPage();

-

-  /**

-   * Returns the x position.

-   * 

-   * @return Returns the x position.

-   */

-  public float getX();

-

-  /**

-   * Returns the y position.

-   * 

-   * @return Returns the y position.

-   */

-  public float getY();

-

-  /**

-   * Returns the width of the signature.

-   * 

-   * @return Returns the width of the signature.

-   */

-  public float getWidth();

-

-  /**

-   * Returns the height of the signature.

-   * 

-   * @return Returns the height of the signature.

-   */

-  public float getHeight();

-

-}

+/*******************************************************************************
+ * <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.sign.pos;
+
+/**
+ * Holds the actual, absolute signature position where a signature was placed.
+ * 
+ * <p>
+ * This is usually returned after signing.
+ * </p>
+ * 
+ * @author wprinz
+ */
+@Deprecated
+public interface SignaturePosition
+{
+  /**
+   * Returns the page on which the signature was placed.
+   * 
+   * @return Returns the page on which the signature was placed.
+   */
+  public int getPage();
+
+  /**
+   * Returns the x position.
+   * 
+   * @return Returns the x position.
+   */
+  public float getX();
+
+  /**
+   * Returns the y position.
+   * 
+   * @return Returns the y position.
+   */
+  public float getY();
+
+  /**
+   * Returns the width of the signature.
+   * 
+   * @return Returns the width of the signature.
+   */
+  public float getWidth();
+
+  /**
+   * Returns the height of the signature.
+   * 
+   * @return Returns the height of the signature.
+   */
+  public float getHeight();
+
+}
diff --git a/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/sign/pos/SignaturePositioning.java b/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/sign/pos/SignaturePositioning.java
index 029d9022..ab5bb652 100644
--- a/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/sign/pos/SignaturePositioning.java
+++ b/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/sign/pos/SignaturePositioning.java
@@ -1,337 +1,360 @@
-/**

- * <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.sign.pos;

-

-import java.io.Serializable;

-import java.util.StringTokenizer;

-

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

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

-import at.gv.egiz.pdfas.api.sign.pos.axis.AbsoluteAxisAlgorithm;

-import at.gv.egiz.pdfas.api.sign.pos.axis.AutoAxisAlgorithm;

-import at.gv.egiz.pdfas.api.sign.pos.axis.AxisAlgorithm;

-import at.gv.egiz.pdfas.api.sign.pos.page.AbsolutePageAlgorithm;

-import at.gv.egiz.pdfas.api.sign.pos.page.AutoPageAlgorithm;

-import at.gv.egiz.pdfas.api.sign.pos.page.NewPageAlgorithm;

-import at.gv.egiz.pdfas.api.sign.pos.page.PageAlgorithm;

-

-/**

- * Defines how the signature positioning is to be performed.

- * 

- * <p>

- * This positioning allows to select the location where the signature block is

- * placed in the document.

- * </p>

- * 

- * @author wprinz

- */

-public class SignaturePositioning implements Serializable

-{

-  

-  /**

-    * 

-    */

-  private static final long serialVersionUID = 1L;

-

-  /**

-   * The x axis algorithm.

-   * 

-   * <p>

-   * May be {@link AutoAxisAlgorithm} or {@link AbsoluteAxisAlgorithm}

-   * </p>

-   */

-  protected AxisAlgorithm xAlgorithm = new AutoAxisAlgorithm();

-

-  /**

-   * The y axis algorithm.

-   * 

-   * <p>

-   * May be {@link AutoAxisAlgorithm} or {@link AbsoluteAxisAlgorithm}

-   * </p>

-   */

-  protected AxisAlgorithm yAlgorithm = new AutoAxisAlgorithm();

-

-  /**

-   * The width algorithm.

-   * 

-   * <p>

-   * May be {@link AutoAxisAlgorithm} or {@link AbsoluteAxisAlgorithm}

-   * </p>

-   */

-  protected AxisAlgorithm widthAlgorithm = new AutoAxisAlgorithm();

-

-  /**

-   * The page algorithm.

-   * 

-   * <p>

-   * May be {@link AutoPageAlgorithm}, {@link AbsolutePageAlgorithm} or

-   * {@link NewPageAlgorithm}

-   * </p>

-   */

-  protected PageAlgorithm pageAlgorithm = new AutoPageAlgorithm();

-

-  /**

-   * Provides the position of the footline.

-   * 

-   * <p>

-   * Only used if the pageAlgorithm is {@link AutoPageAlgorithm} and the

-   * yAlgorithm is {@link AutoAxisAlgorithm}

-   * </p>

-   */

-  protected float footerLine = 0.0f;

-

-  protected void checkAxisAlgorithm(AxisAlgorithm algorithm)

-  {

-    if (algorithm == null)

-    {

-      throw new IllegalArgumentException("The algorithm must not be null.");

-    }

-    if (!(algorithm instanceof AutoAxisAlgorithm) && !(algorithm instanceof AbsoluteAxisAlgorithm))

-    {

-      throw new IllegalArgumentException("The algorithm must be either Auto or Absolute.");

-    }

-  }

-

-  protected void checkPageAlgorithm(PageAlgorithm algorithm)

-  {

-    if (algorithm == null)

-    {

-      throw new IllegalArgumentException("The algorithm must not be null.");

-    }

-    if (!(algorithm instanceof AutoPageAlgorithm) && !(algorithm instanceof AbsolutePageAlgorithm) && !(algorithm instanceof NewPageAlgorithm))

-    {

-      throw new IllegalArgumentException("The algorithm must be either Auto or Absolute.");

-    }

-

-  }

-

-  /**

-   * @return the xAlgorithm

-   */

-  public AxisAlgorithm getXAlgorithm()

-  {

-    return this.xAlgorithm;

-  }

-

-  /**

-   * @param algorithm

-   *          the xAlgorithm to set

-   */

-  public void setXAlgorithm(AxisAlgorithm algorithm)

-  {

-    checkAxisAlgorithm(algorithm);

-    xAlgorithm = algorithm;

-  }

-

-  /**

-   * @return the yAlgorithm

-   */

-  public AxisAlgorithm getYAlgorithm()

-  {

-    return this.yAlgorithm;

-  }

-

-  /**

-   * @param algorithm

-   *          the yAlgorithm to set

-   */

-  public void setYAlgorithm(AxisAlgorithm algorithm)

-  {

-    checkAxisAlgorithm(algorithm);

-

-    yAlgorithm = algorithm;

-  }

-

-  /**

-   * @return the widthAlgorithm

-   */

-  public AxisAlgorithm getWidthAlgorithm()

-  {

-    return this.widthAlgorithm;

-  }

-

-  /**

-   * @param widthAlgorithm

-   *          the widthAlgorithm to set

-   */

-  public void setWidthAlgorithm(AxisAlgorithm widthAlgorithm)

-  {

-    checkAxisAlgorithm(widthAlgorithm);

-

-    this.widthAlgorithm = widthAlgorithm;

-  }

-

-  /**

-   * @return the pageAlgorithm

-   */

-  public PageAlgorithm getPageAlgorithm()

-  {

-    return this.pageAlgorithm;

-  }

-

-  /**

-   * @param pageAlgorithm

-   *          the pageAlgorithm to set

-   */

-  public void setPageAlgorithm(PageAlgorithm pageAlgorithm)

-  {

-    checkPageAlgorithm(pageAlgorithm);

-    this.pageAlgorithm = pageAlgorithm;

-  }

-

-  /**

-   * @return the footerLine

-   */

-  public float getFooterLine()

-  {

-    return this.footerLine;

-  }

-

-  /**

-   * @param footerLine

-   *          the footerLine to set

-   */

-  public void setFooterLine(float footerLine)

-  {

-    this.footerLine = footerLine;

-  }

-

-   public SignaturePositioning() {

-   }

-   

-   public SignaturePositioning(String position) throws PdfAsException {

-      if (position != null) {

-         StringTokenizer tokenizer = new StringTokenizer(position, ";");

-         while (tokenizer.hasMoreTokens()) {

-            String token = tokenizer.nextToken().replaceAll(" ", "");

-            String[] sToken = token.split(":");

-            if (sToken == null || sToken.length != 2 || sToken[0].length() != 1) {

-               throw new PdfAsException(ErrorCode.INVALID_SIGNATURE_POSITION, "Invalid signature position element: " + token);               

-            }

-            char cmd = sToken[0].toLowerCase().charAt(0);

-            String value = sToken[1];

-            switch (cmd) {

-            case 'x':

-               if ("auto".equalsIgnoreCase(value)) {

-                  this.setXAlgorithm(new AutoAxisAlgorithm());

-               } else {

-                  try {

-                     this.setXAlgorithm(new AbsoluteAxisAlgorithm(Float.parseFloat(value)));

-                  } catch (NumberFormatException e) {

-                     throw new PdfAsException(ErrorCode.INVALID_SIGNATURE_POSITION, "Invalid signature position element: " + token);               

-                  }

-               }

-               break;

-            case 'y':

-               if ("auto".equalsIgnoreCase(value)) {

-                  this.setYAlgorithm(new AutoAxisAlgorithm());

-               } else {

-                  try {

-                     this.setYAlgorithm(new AbsoluteAxisAlgorithm(Float.parseFloat(value)));

-                  } catch (NumberFormatException e) {

-                     throw new PdfAsException(ErrorCode.INVALID_SIGNATURE_POSITION, "Invalid signature position element: " + token);               

-                  }

-               }

-               break;

-            case 'w':

-               if ("auto".equalsIgnoreCase(value)) {

-                  this.setWidthAlgorithm(new AutoAxisAlgorithm());

-               } else {

-                  try {

-                     this.setWidthAlgorithm(new AbsoluteAxisAlgorithm(Float.parseFloat(value)));

-                  } catch (NumberFormatException e) {

-                     throw new PdfAsException(ErrorCode.INVALID_SIGNATURE_POSITION, "Invalid signature position element: " + token);               

-                  }

-               }

-               break;

-            case 'p':

-               if ("auto".equalsIgnoreCase(value)) {

-                  this.setPageAlgorithm(new AutoPageAlgorithm());

-               } else if ("new".equalsIgnoreCase(value)) {

-                     this.setPageAlgorithm(new NewPageAlgorithm());

-               } else {

-                  try {

-                     this.setPageAlgorithm(new AbsolutePageAlgorithm(Integer.parseInt(value)));

-                  } catch (NumberFormatException e) {

-                     throw new PdfAsException(ErrorCode.INVALID_SIGNATURE_POSITION, "Invalid signature position element: " + token);               

-                  }

-               }

-               break;

-            case 'f':

-               try {

-                  this.setFooterLine(Float.parseFloat(value));

-               } catch (NumberFormatException e) {

-                  throw new PdfAsException(ErrorCode.INVALID_SIGNATURE_POSITION, "Invalid signature position element: " + token);               

-               }

-               break;

-            default:

-               throw new PdfAsException(ErrorCode.INVALID_SIGNATURE_POSITION, "Invalid signature position element: " + token);               

-            }

-         }

-      }

-   }

-   

-   public String getPositionString() {

-	   StringBuilder sb = new StringBuilder();

-	   AxisAlgorithm xAlgo = getXAlgorithm();

-	   

-	   if(xAlgo instanceof AutoAxisAlgorithm) {

-		   sb.append("x:auto;");

-	   } else if(xAlgo instanceof AbsoluteAxisAlgorithm) {

-		   sb.append("x:" + ((AbsoluteAxisAlgorithm)xAlgo).getAbsoluteValue() + ";");

-	   }

-	   

-	   AxisAlgorithm yAlgo = getXAlgorithm();

-	   

-	   if(yAlgo instanceof AutoAxisAlgorithm) {

-		   sb.append("y:auto;");

-	   } else if(yAlgo instanceof AbsoluteAxisAlgorithm) {

-		   sb.append("y:" + ((AbsoluteAxisAlgorithm)yAlgo).getAbsoluteValue() + ";");

-	   }

-	   

-	   AxisAlgorithm wAlgo = getWidthAlgorithm();

-	   

-	   if(wAlgo instanceof AutoAxisAlgorithm) {

-		   sb.append("w:auto;");

-	   } else if(wAlgo instanceof AbsoluteAxisAlgorithm) {

-		   sb.append("w:" + ((AbsoluteAxisAlgorithm)wAlgo).getAbsoluteValue() + ";");

-	   }

-	   

-	   PageAlgorithm pAlgo = getPageAlgorithm();

-	   

-	   if(pAlgo instanceof AutoPageAlgorithm) {

-		   sb.append("p:auto;");

-	   } else if(pAlgo instanceof NewPageAlgorithm) {

-		   sb.append("p:new;");

-	   }

-	   

-	   float footerLine = getFooterLine();

-	   

-	   sb.append("f:" + + footerLine);

-	   

-	   return sb.toString();

-   }

-  

-

-}

+/*******************************************************************************
+ * <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.sign.pos;
+
+import java.io.Serializable;
+import java.util.StringTokenizer;
+
+import at.gv.egiz.pdfas.api.exceptions.ErrorCode;
+import at.gv.egiz.pdfas.api.exceptions.PdfAsException;
+import at.gv.egiz.pdfas.api.sign.pos.axis.AbsoluteAxisAlgorithm;
+import at.gv.egiz.pdfas.api.sign.pos.axis.AutoAxisAlgorithm;
+import at.gv.egiz.pdfas.api.sign.pos.axis.AxisAlgorithm;
+import at.gv.egiz.pdfas.api.sign.pos.page.AbsolutePageAlgorithm;
+import at.gv.egiz.pdfas.api.sign.pos.page.AutoPageAlgorithm;
+import at.gv.egiz.pdfas.api.sign.pos.page.NewPageAlgorithm;
+import at.gv.egiz.pdfas.api.sign.pos.page.PageAlgorithm;
+
+/**
+ * Defines how the signature positioning is to be performed.
+ * 
+ * <p>
+ * This positioning allows to select the location where the signature block is
+ * placed in the document.
+ * </p>
+ * 
+ * @author wprinz
+ */
+public class SignaturePositioning implements Serializable
+{
+  
+  /**
+    * 
+    */
+  private static final long serialVersionUID = 1L;
+
+  /**
+   * The x axis algorithm.
+   * 
+   * <p>
+   * May be {@link AutoAxisAlgorithm} or {@link AbsoluteAxisAlgorithm}
+   * </p>
+   */
+  protected AxisAlgorithm xAlgorithm = new AutoAxisAlgorithm();
+
+  /**
+   * The y axis algorithm.
+   * 
+   * <p>
+   * May be {@link AutoAxisAlgorithm} or {@link AbsoluteAxisAlgorithm}
+   * </p>
+   */
+  protected AxisAlgorithm yAlgorithm = new AutoAxisAlgorithm();
+
+  /**
+   * The width algorithm.
+   * 
+   * <p>
+   * May be {@link AutoAxisAlgorithm} or {@link AbsoluteAxisAlgorithm}
+   * </p>
+   */
+  protected AxisAlgorithm widthAlgorithm = new AutoAxisAlgorithm();
+
+  /**
+   * The page algorithm.
+   * 
+   * <p>
+   * May be {@link AutoPageAlgorithm}, {@link AbsolutePageAlgorithm} or
+   * {@link NewPageAlgorithm}
+   * </p>
+   */
+  protected PageAlgorithm pageAlgorithm = new AutoPageAlgorithm();
+
+  /**
+   * Provides the position of the footline.
+   * 
+   * <p>
+   * Only used if the pageAlgorithm is {@link AutoPageAlgorithm} and the
+   * yAlgorithm is {@link AutoAxisAlgorithm}
+   * </p>
+   */
+  protected float footerLine = 0.0f;
+
+  protected void checkAxisAlgorithm(AxisAlgorithm algorithm)
+  {
+    if (algorithm == null)
+    {
+      throw new IllegalArgumentException("The algorithm must not be null.");
+    }
+    if (!(algorithm instanceof AutoAxisAlgorithm) && !(algorithm instanceof AbsoluteAxisAlgorithm))
+    {
+      throw new IllegalArgumentException("The algorithm must be either Auto or Absolute.");
+    }
+  }
+
+  protected void checkPageAlgorithm(PageAlgorithm algorithm)
+  {
+    if (algorithm == null)
+    {
+      throw new IllegalArgumentException("The algorithm must not be null.");
+    }
+    if (!(algorithm instanceof AutoPageAlgorithm) && !(algorithm instanceof AbsolutePageAlgorithm) && !(algorithm instanceof NewPageAlgorithm))
+    {
+      throw new IllegalArgumentException("The algorithm must be either Auto or Absolute.");
+    }
+
+  }
+
+  /**
+   * @return the xAlgorithm
+   */
+  public AxisAlgorithm getXAlgorithm()
+  {
+    return this.xAlgorithm;
+  }
+
+  /**
+   * @param algorithm
+   *          the xAlgorithm to set
+   */
+  public void setXAlgorithm(AxisAlgorithm algorithm)
+  {
+    checkAxisAlgorithm(algorithm);
+    xAlgorithm = algorithm;
+  }
+
+  /**
+   * @return the yAlgorithm
+   */
+  public AxisAlgorithm getYAlgorithm()
+  {
+    return this.yAlgorithm;
+  }
+
+  /**
+   * @param algorithm
+   *          the yAlgorithm to set
+   */
+  public void setYAlgorithm(AxisAlgorithm algorithm)
+  {
+    checkAxisAlgorithm(algorithm);
+
+    yAlgorithm = algorithm;
+  }
+
+  /**
+   * @return the widthAlgorithm
+   */
+  public AxisAlgorithm getWidthAlgorithm()
+  {
+    return this.widthAlgorithm;
+  }
+
+  /**
+   * @param widthAlgorithm
+   *          the widthAlgorithm to set
+   */
+  public void setWidthAlgorithm(AxisAlgorithm widthAlgorithm)
+  {
+    checkAxisAlgorithm(widthAlgorithm);
+
+    this.widthAlgorithm = widthAlgorithm;
+  }
+
+  /**
+   * @return the pageAlgorithm
+   */
+  public PageAlgorithm getPageAlgorithm()
+  {
+    return this.pageAlgorithm;
+  }
+
+  /**
+   * @param pageAlgorithm
+   *          the pageAlgorithm to set
+   */
+  public void setPageAlgorithm(PageAlgorithm pageAlgorithm)
+  {
+    checkPageAlgorithm(pageAlgorithm);
+    this.pageAlgorithm = pageAlgorithm;
+  }
+
+  /**
+   * @return the footerLine
+   */
+  public float getFooterLine()
+  {
+    return this.footerLine;
+  }
+
+  /**
+   * @param footerLine
+   *          the footerLine to set
+   */
+  public void setFooterLine(float footerLine)
+  {
+    this.footerLine = footerLine;
+  }
+
+   public SignaturePositioning() {
+   }
+   
+   public SignaturePositioning(String position) throws PdfAsException {
+      if (position != null) {
+         StringTokenizer tokenizer = new StringTokenizer(position, ";");
+         while (tokenizer.hasMoreTokens()) {
+            String token = tokenizer.nextToken().replaceAll(" ", "");
+            String[] sToken = token.split(":");
+            if (sToken == null || sToken.length != 2 || sToken[0].length() != 1) {
+               throw new PdfAsException(ErrorCode.INVALID_SIGNATURE_POSITION, "Invalid signature position element: " + token);               
+            }
+            char cmd = sToken[0].toLowerCase().charAt(0);
+            String value = sToken[1];
+            switch (cmd) {
+            case 'x':
+               if ("auto".equalsIgnoreCase(value)) {
+                  this.setXAlgorithm(new AutoAxisAlgorithm());
+               } else {
+                  try {
+                     this.setXAlgorithm(new AbsoluteAxisAlgorithm(Float.parseFloat(value)));
+                  } catch (NumberFormatException e) {
+                     throw new PdfAsException(ErrorCode.INVALID_SIGNATURE_POSITION, "Invalid signature position element: " + token);               
+                  }
+               }
+               break;
+            case 'y':
+               if ("auto".equalsIgnoreCase(value)) {
+                  this.setYAlgorithm(new AutoAxisAlgorithm());
+               } else {
+                  try {
+                     this.setYAlgorithm(new AbsoluteAxisAlgorithm(Float.parseFloat(value)));
+                  } catch (NumberFormatException e) {
+                     throw new PdfAsException(ErrorCode.INVALID_SIGNATURE_POSITION, "Invalid signature position element: " + token);               
+                  }
+               }
+               break;
+            case 'w':
+               if ("auto".equalsIgnoreCase(value)) {
+                  this.setWidthAlgorithm(new AutoAxisAlgorithm());
+               } else {
+                  try {
+                     this.setWidthAlgorithm(new AbsoluteAxisAlgorithm(Float.parseFloat(value)));
+                  } catch (NumberFormatException e) {
+                     throw new PdfAsException(ErrorCode.INVALID_SIGNATURE_POSITION, "Invalid signature position element: " + token);               
+                  }
+               }
+               break;
+            case 'p':
+               if ("auto".equalsIgnoreCase(value)) {
+                  this.setPageAlgorithm(new AutoPageAlgorithm());
+               } else if ("new".equalsIgnoreCase(value)) {
+                     this.setPageAlgorithm(new NewPageAlgorithm());
+               } else {
+                  try {
+                     this.setPageAlgorithm(new AbsolutePageAlgorithm(Integer.parseInt(value)));
+                  } catch (NumberFormatException e) {
+                     throw new PdfAsException(ErrorCode.INVALID_SIGNATURE_POSITION, "Invalid signature position element: " + token);               
+                  }
+               }
+               break;
+            case 'f':
+               try {
+                  this.setFooterLine(Float.parseFloat(value));
+               } catch (NumberFormatException e) {
+                  throw new PdfAsException(ErrorCode.INVALID_SIGNATURE_POSITION, "Invalid signature position element: " + token);               
+               }
+               break;
+            default:
+               throw new PdfAsException(ErrorCode.INVALID_SIGNATURE_POSITION, "Invalid signature position element: " + token);               
+            }
+         }
+      }
+   }
+   
+   public String getPositionString() {
+	   StringBuilder sb = new StringBuilder();
+	   AxisAlgorithm xAlgo = getXAlgorithm();
+	   
+	   if(xAlgo instanceof AutoAxisAlgorithm) {
+		   sb.append("x:auto;");
+	   } else if(xAlgo instanceof AbsoluteAxisAlgorithm) {
+		   sb.append("x:" + ((AbsoluteAxisAlgorithm)xAlgo).getAbsoluteValue() + ";");
+	   }
+	   
+	   AxisAlgorithm yAlgo = getXAlgorithm();
+	   
+	   if(yAlgo instanceof AutoAxisAlgorithm) {
+		   sb.append("y:auto;");
+	   } else if(yAlgo instanceof AbsoluteAxisAlgorithm) {
+		   sb.append("y:" + ((AbsoluteAxisAlgorithm)yAlgo).getAbsoluteValue() + ";");
+	   }
+	   
+	   AxisAlgorithm wAlgo = getWidthAlgorithm();
+	   
+	   if(wAlgo instanceof AutoAxisAlgorithm) {
+		   sb.append("w:auto;");
+	   } else if(wAlgo instanceof AbsoluteAxisAlgorithm) {
+		   sb.append("w:" + ((AbsoluteAxisAlgorithm)wAlgo).getAbsoluteValue() + ";");
+	   }
+	   
+	   PageAlgorithm pAlgo = getPageAlgorithm();
+	   
+	   if(pAlgo instanceof AutoPageAlgorithm) {
+		   sb.append("p:auto;");
+	   } else if(pAlgo instanceof NewPageAlgorithm) {
+		   sb.append("p:new;");
+	   }
+	   
+	   float footerLine = getFooterLine();
+	   
+	   sb.append("f:" + + footerLine);
+	   
+	   return sb.toString();
+   }
+  
+
+}
diff --git a/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/sign/pos/axis/AbsoluteAxisAlgorithm.java b/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/sign/pos/axis/AbsoluteAxisAlgorithm.java
index ea2143dd..7d550ddc 100644
--- a/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/sign/pos/axis/AbsoluteAxisAlgorithm.java
+++ b/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/sign/pos/axis/AbsoluteAxisAlgorithm.java
@@ -1,62 +1,85 @@
-/**

- * <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.sign.pos.axis;

-

-import java.io.Serializable;

-

-/**

- * An absolute positioned element.

- * @author wprinz

- */

-public class AbsoluteAxisAlgorithm extends AxisAlgorithm implements Serializable

-{

-

-  /**

-    * 

-    */

-   private static final long serialVersionUID = 1L;

-   

-  /**

-   * The absolute positioning value on the axis.

-   */

-  protected float absoluteValue = 0.0f;

-  

-  /**

-   * Constructor.

-   * @param absoluteValue The absolute positioning value on the axis.

-   */

-  public AbsoluteAxisAlgorithm (float absoluteValue)

-  {

-    this.absoluteValue = absoluteValue;

-  }

-

-  /**

-   * Returns absolute positioning value on the axis.

-   * @return the absoluteValue Returns absolute positioning value on the axis.

-   */

-  public float getAbsoluteValue()

-  {

-    return this.absoluteValue;

-  }

-}

+/*******************************************************************************
+ * <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.sign.pos.axis;
+
+import java.io.Serializable;
+
+/**
+ * An absolute positioned element.
+ * @author wprinz
+ */
+public class AbsoluteAxisAlgorithm extends AxisAlgorithm implements Serializable
+{
+
+  /**
+    * 
+    */
+   private static final long serialVersionUID = 1L;
+   
+  /**
+   * The absolute positioning value on the axis.
+   */
+  protected float absoluteValue = 0.0f;
+  
+  /**
+   * Constructor.
+   * @param absoluteValue The absolute positioning value on the axis.
+   */
+  public AbsoluteAxisAlgorithm (float absoluteValue)
+  {
+    this.absoluteValue = absoluteValue;
+  }
+
+  /**
+   * Returns absolute positioning value on the axis.
+   * @return the absoluteValue Returns absolute positioning value on the axis.
+   */
+  public float getAbsoluteValue()
+  {
+    return this.absoluteValue;
+  }
+}
diff --git a/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/sign/pos/axis/AutoAxisAlgorithm.java b/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/sign/pos/axis/AutoAxisAlgorithm.java
index a9857b42..e0fa101d 100644
--- a/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/sign/pos/axis/AutoAxisAlgorithm.java
+++ b/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/sign/pos/axis/AutoAxisAlgorithm.java
@@ -1,41 +1,64 @@
-/**

- * <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.sign.pos.axis;

-

-import java.io.Serializable;

-

-/**

- * Auto positioning for this element.

- * 

- * @author wprinz

- */

-public class AutoAxisAlgorithm extends AxisAlgorithm implements Serializable

-{

-

-   /**

-    * 

-    */

-   private static final long serialVersionUID = 1L;

-// empty

-}

+/*******************************************************************************
+ * <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.sign.pos.axis;
+
+import java.io.Serializable;
+
+/**
+ * Auto positioning for this element.
+ * 
+ * @author wprinz
+ */
+public class AutoAxisAlgorithm extends AxisAlgorithm implements Serializable
+{
+
+   /**
+    * 
+    */
+   private static final long serialVersionUID = 1L;
+// empty
+}
diff --git a/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/sign/pos/axis/AxisAlgorithm.java b/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/sign/pos/axis/AxisAlgorithm.java
index dd1d1700..c43bca89 100644
--- a/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/sign/pos/axis/AxisAlgorithm.java
+++ b/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/sign/pos/axis/AxisAlgorithm.java
@@ -1,41 +1,64 @@
-/**

- * <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.sign.pos.axis;

-

-import java.io.Serializable;

-

-/**

- * Determines how a certain position is chosen on the axis (x, y, width).

- * 

- * @author wprinz

- */

-public abstract class AxisAlgorithm implements Serializable

-{

-

-   /**

-    * 

-    */

-   private static final long serialVersionUID = 1L;

-// base class

-}

+/*******************************************************************************
+ * <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.sign.pos.axis;
+
+import java.io.Serializable;
+
+/**
+ * Determines how a certain position is chosen on the axis (x, y, width).
+ * 
+ * @author wprinz
+ */
+public abstract class AxisAlgorithm implements Serializable
+{
+
+   /**
+    * 
+    */
+   private static final long serialVersionUID = 1L;
+// base class
+}
diff --git a/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/sign/pos/axis/package-info.java b/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/sign/pos/axis/package-info.java
index c4f24440..8703b27d 100644
--- a/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/sign/pos/axis/package-info.java
+++ b/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/sign/pos/axis/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.sign.pos.axis;
\ No newline at end of file
+package at.gv.egiz.pdfas.api.sign.pos.axis;
diff --git a/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/sign/pos/package-info.java b/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/sign/pos/package-info.java
index 80914293..1dbd22eb 100644
--- a/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/sign/pos/package-info.java
+++ b/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/sign/pos/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.sign.pos;
\ No newline at end of file
+package at.gv.egiz.pdfas.api.sign.pos;
diff --git a/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/sign/pos/page/AbsolutePageAlgorithm.java b/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/sign/pos/page/AbsolutePageAlgorithm.java
index 434c20c4..ed17954f 100644
--- a/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/sign/pos/page/AbsolutePageAlgorithm.java
+++ b/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/sign/pos/page/AbsolutePageAlgorithm.java
@@ -1,64 +1,87 @@
-/**

- * <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.sign.pos.page;

-

-import java.io.Serializable;

-

-/**

- * The page is selected absolutely by giving the page number directly.

- * 

- * @author wprinz

- */

-public class AbsolutePageAlgorithm extends PageAlgorithm implements Serializable

-{

-  /**

-    * 

-    */

-   private static final long serialVersionUID = 1L;

-

-  /**

-   * The page.

-   */

-  protected int page = -1;

-

-  /**

-   * Constructor.

-   * 

-   * @param page

-   *          The page.

-   */

-  public AbsolutePageAlgorithm(int page)

-  {

-    this.page = page;

-  }

-

-  /**

-   * @return the page

-   */

-  public int getPage()

-  {

-    return this.page;

-  }

-

-}

+/*******************************************************************************
+ * <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.sign.pos.page;
+
+import java.io.Serializable;
+
+/**
+ * The page is selected absolutely by giving the page number directly.
+ * 
+ * @author wprinz
+ */
+public class AbsolutePageAlgorithm extends PageAlgorithm implements Serializable
+{
+  /**
+    * 
+    */
+   private static final long serialVersionUID = 1L;
+
+  /**
+   * The page.
+   */
+  protected int page = -1;
+
+  /**
+   * Constructor.
+   * 
+   * @param page
+   *          The page.
+   */
+  public AbsolutePageAlgorithm(int page)
+  {
+    this.page = page;
+  }
+
+  /**
+   * @return the page
+   */
+  public int getPage()
+  {
+    return this.page;
+  }
+
+}
diff --git a/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/sign/pos/page/AutoPageAlgorithm.java b/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/sign/pos/page/AutoPageAlgorithm.java
index fffcbad0..54365613 100644
--- a/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/sign/pos/page/AutoPageAlgorithm.java
+++ b/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/sign/pos/page/AutoPageAlgorithm.java
@@ -1,47 +1,70 @@
-/**

- * <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.sign.pos.page;

-

-import java.io.Serializable;

-

-/**

- * The page for placing the signature is selected automatically.

- * 

- * <p>

- * The algorithm first tries to place the signature on the free space of the

- * last page (considering the footer). If there is not enough space on the last

- * page, a new page is appended and the signature is placed there.

- * </p>

- * 

- * @author wprinz

- */

-public class AutoPageAlgorithm extends PageAlgorithm implements Serializable

-{

-

-   /**

-    * 

-    */

-   private static final long serialVersionUID = 1L;

-// empty

-}

+/*******************************************************************************
+ * <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.sign.pos.page;
+
+import java.io.Serializable;
+
+/**
+ * The page for placing the signature is selected automatically.
+ * 
+ * <p>
+ * The algorithm first tries to place the signature on the free space of the
+ * last page (considering the footer). If there is not enough space on the last
+ * page, a new page is appended and the signature is placed there.
+ * </p>
+ * 
+ * @author wprinz
+ */
+public class AutoPageAlgorithm extends PageAlgorithm implements Serializable
+{
+
+   /**
+    * 
+    */
+   private static final long serialVersionUID = 1L;
+// empty
+}
diff --git a/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/sign/pos/page/NewPageAlgorithm.java b/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/sign/pos/page/NewPageAlgorithm.java
index ded9f618..e3f4b9cc 100644
--- a/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/sign/pos/page/NewPageAlgorithm.java
+++ b/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/sign/pos/page/NewPageAlgorithm.java
@@ -1,41 +1,64 @@
-/**

- * <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.sign.pos.page;

-

-import java.io.Serializable;

-

-/**

- * Places the signature on a new Page.

- * 

- * @author wprinz

- */

-public class NewPageAlgorithm extends PageAlgorithm implements Serializable

-{

-

-   /**

-    * 

-    */

-   private static final long serialVersionUID = 1L;

-  // empty block

-}

+/*******************************************************************************
+ * <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.sign.pos.page;
+
+import java.io.Serializable;
+
+/**
+ * Places the signature on a new Page.
+ * 
+ * @author wprinz
+ */
+public class NewPageAlgorithm extends PageAlgorithm implements Serializable
+{
+
+   /**
+    * 
+    */
+   private static final long serialVersionUID = 1L;
+  // empty block
+}
diff --git a/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/sign/pos/page/PageAlgorithm.java b/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/sign/pos/page/PageAlgorithm.java
index 16aa72ca..64840d90 100644
--- a/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/sign/pos/page/PageAlgorithm.java
+++ b/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/sign/pos/page/PageAlgorithm.java
@@ -1,41 +1,64 @@
-/**

- * <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.sign.pos.page;

-

-import java.io.Serializable;

-

-/**

- * Determines how the page on which the signature is to be placed is selected.

- * 

- * @author wprinz

- */

-public abstract class PageAlgorithm implements Serializable

-{

-

-   /**

-    * 

-    */

-   private static final long serialVersionUID = 1L;

-  // empty

-}

+/*******************************************************************************
+ * <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.sign.pos.page;
+
+import java.io.Serializable;
+
+/**
+ * Determines how the page on which the signature is to be placed is selected.
+ * 
+ * @author wprinz
+ */
+public abstract class PageAlgorithm implements Serializable
+{
+
+   /**
+    * 
+    */
+   private static final long serialVersionUID = 1L;
+  // empty
+}
diff --git a/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/sign/pos/page/package-info.java b/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/sign/pos/page/package-info.java
index fec6dbea..9ac906ec 100644
--- a/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/sign/pos/page/package-info.java
+++ b/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/sign/pos/page/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.sign.pos.page;
\ No newline at end of file
+package at.gv.egiz.pdfas.api.sign.pos.page;
diff --git a/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/timestamp/DummyTimeStamper.java b/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/timestamp/DummyTimeStamper.java
index 0245a7ca..ffad7790 100644
--- a/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/timestamp/DummyTimeStamper.java
+++ b/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/timestamp/DummyTimeStamper.java
@@ -1,63 +1,86 @@
-/**

- * <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.timestamp;

-

-import java.text.SimpleDateFormat;

-import java.util.Date;

-

-import org.apache.commons.codec.binary.Base64;

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

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

-

-/**

- * Dummy/test implementation of the timestamper. Logs and stores test-timestamp for assertion {@link #getLastTimeStamp()}

- * 

- * @author dferbas

- *

- */

-public class DummyTimeStamper implements TimeStamper {

-   private static Log log = LogFactory.getLog(DummyTimeStamper.class);

-   

-   private String lastTimeStamp;

-

-   public String applyTimeStamp(String b64SignatureValue) {

-      log.debug("Applying dummy timestamp on signature value: " + b64SignatureValue);

-      SimpleDateFormat formater = new SimpleDateFormat("yyyy-MM-dd'T'hh:mm:ss.SSSZ");

-      String ts = formater.format(new Date());

-      log.debug("Timestamp: " + ts);

-      ts = new String(Base64.encodeBase64(ts.getBytes()));

-      log.debug("Timestamp value (base64): " + ts);

-      this.lastTimeStamp  = ts;

-      return ts;

-   }

-

-   public String getLastTimeStamp() {

-      return this.lastTimeStamp;

-   }

-

-   public void setLastTimeStamp(String lastTimeStamp) {

-      this.lastTimeStamp = lastTimeStamp;

-   }

-   

-}

+/*******************************************************************************
+ * <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.timestamp;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import org.apache.commons.codec.binary.Base64;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * Dummy/test implementation of the timestamper. Logs and stores test-timestamp for assertion {@link #getLastTimeStamp()}
+ * 
+ * @author dferbas
+ *
+ */
+public class DummyTimeStamper implements TimeStamper {
+   private static Log log = LogFactory.getLog(DummyTimeStamper.class);
+   
+   private String lastTimeStamp;
+
+   public String applyTimeStamp(String b64SignatureValue) {
+      log.debug("Applying dummy timestamp on signature value: " + b64SignatureValue);
+      SimpleDateFormat formater = new SimpleDateFormat("yyyy-MM-dd'T'hh:mm:ss.SSSZ");
+      String ts = formater.format(new Date());
+      log.debug("Timestamp: " + ts);
+      ts = new String(Base64.encodeBase64(ts.getBytes()));
+      log.debug("Timestamp value (base64): " + ts);
+      this.lastTimeStamp  = ts;
+      return ts;
+   }
+
+   public String getLastTimeStamp() {
+      return this.lastTimeStamp;
+   }
+
+   public void setLastTimeStamp(String lastTimeStamp) {
+      this.lastTimeStamp = lastTimeStamp;
+   }
+   
+}
diff --git a/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/timestamp/TimeStamper.java b/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/timestamp/TimeStamper.java
index 99bda3a7..b8cb3974 100644
--- a/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/timestamp/TimeStamper.java
+++ b/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/timestamp/TimeStamper.java
@@ -1,41 +1,64 @@
-/**

- * <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.timestamp;

-

-/**

- * Interface for timestamper implementations/handlers

- * 

- * @author dferbas

- *

- */

-public interface TimeStamper {

-   

-   /**

-    * Implement timestamp in this method. 

-    * @param b64SignatureValue signature value, base64 encoded

-    * @return timestamp to be embedded in egiz dictionary base64 encoded (following RFC3161).

-    */

-   public String applyTimeStamp(String b64SignatureValue);

-

-}

+/*******************************************************************************
+ * <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.timestamp;
+
+/**
+ * Interface for timestamper implementations/handlers
+ * 
+ * @author dferbas
+ *
+ */
+public interface TimeStamper {
+   
+   /**
+    * Implement timestamp in this method. 
+    * @param b64SignatureValue signature value, base64 encoded
+    * @return timestamp to be embedded in egiz dictionary base64 encoded (following RFC3161).
+    */
+   public String applyTimeStamp(String b64SignatureValue);
+
+}
diff --git a/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/timestamp/package-info.java b/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/timestamp/package-info.java
index 30b76e0c..32c3fe67 100644
--- a/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/timestamp/package-info.java
+++ b/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/timestamp/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.timestamp;
\ No newline at end of file
+package at.gv.egiz.pdfas.api.timestamp;
diff --git a/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/verify/SignatureCheck.java b/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/verify/SignatureCheck.java
index c1690774..2b38819a 100644
--- a/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/verify/SignatureCheck.java
+++ b/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/verify/SignatureCheck.java
@@ -1,51 +1,74 @@
-/**

- * <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.verify;

-

-/**

- * The result of a signature check performed by a verification device.

- * 

- * @see VerifyResult

- * 

- * @author wprinz

- */

-public interface SignatureCheck

-{

-  /**

-   * Returns the response code of the check.

-   * 

-   * @return Returns the response code of the check.

-   */

-  public int getCode();

-

-  /**

-   * Returns the textual response message of the check (corresponding to the

-   * code).

-   * 

-   * @return Returns the textual response message of the check (corresponding to

-   *         the code).

-   */

-  public String getMessage();

-

-}

+/*******************************************************************************
+ * <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.verify;
+
+/**
+ * The result of a signature check performed by a verification device.
+ * 
+ * @see VerifyResult
+ * 
+ * @author wprinz
+ */
+public interface SignatureCheck
+{
+  /**
+   * Returns the response code of the check.
+   * 
+   * @return Returns the response code of the check.
+   */
+  public int getCode();
+
+  /**
+   * Returns the textual response message of the check (corresponding to the
+   * code).
+   * 
+   * @return Returns the textual response message of the check (corresponding to
+   *         the code).
+   */
+  public String getMessage();
+
+}
diff --git a/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/verify/VerifyAfterAnalysisParameters.java b/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/verify/VerifyAfterAnalysisParameters.java
index 8b9e2c6a..62b7e7e4 100644
--- a/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/verify/VerifyAfterAnalysisParameters.java
+++ b/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/verify/VerifyAfterAnalysisParameters.java
@@ -1,166 +1,189 @@
-/**

- * <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.verify;

-

-import java.util.Date;

-

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

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

-

-/**

- * Parameter object that holds the verify after analysis parameters.

- * 

- * @author wprinz

- */

-public class VerifyAfterAnalysisParameters

-{

-

-  /**

-   * 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;

-

-  /**

-   * Allows to pass a VerificationTime to the signature device.

-   */

-  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;

-

-  /**

-   * The index of the signature to be verified. A value < 0 indicates to verify all signatures.

-   */

-  protected int verifySignatureIndex = -1;

-

-  /**

-   * @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;

-  }

-

-  /**

-   * @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;

-  }

-

-  /**

-   * Set the index of the signature to verify (index starting at 0). A value < 0 indicates to verify all values.

-   * @param verify_which

-   */

-  public void setVerifySignatureIndex(int verify_which) {

-    this.verifySignatureIndex  = verify_which;

-  }

-

-  public int getVerifySignatureIndex() {

-     return verifySignatureIndex;

-  }

-

-  /**

-   * @see VerifyParameters#setSuppressVerifyExceptions(boolean)

-   * @param suppress

-   */

-  public void setSuppressVerifyExceptions(boolean suppress) {

-     VerifyParameters.setSuppressVerify(suppress);

-  }

-

-  public boolean isSuppressVerifyExceptions() {

-     return VerifyParameters.isSuppressVerifyExceptions();

-  }

-

-}

+/*******************************************************************************
+ * <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.verify;
+
+import java.util.Date;
+
+import at.gv.egiz.pdfas.api.analyze.AnalyzeResult;
+import at.gv.egiz.pdfas.api.commons.Constants;
+
+/**
+ * Parameter object that holds the verify after analysis parameters.
+ * 
+ * @author wprinz
+ */
+public class VerifyAfterAnalysisParameters
+{
+
+  /**
+   * 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;
+
+  /**
+   * Allows to pass a VerificationTime to the signature device.
+   */
+  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;
+
+  /**
+   * The index of the signature to be verified. A value < 0 indicates to verify all signatures.
+   */
+  protected int verifySignatureIndex = -1;
+
+  /**
+   * @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;
+  }
+
+  /**
+   * @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;
+  }
+
+  /**
+   * Set the index of the signature to verify (index starting at 0). A value < 0 indicates to verify all values.
+   * @param verify_which
+   */
+  public void setVerifySignatureIndex(int verify_which) {
+    this.verifySignatureIndex  = verify_which;
+  }
+
+  public int getVerifySignatureIndex() {
+     return verifySignatureIndex;
+  }
+
+  /**
+   * @see VerifyParameters#setSuppressVerifyExceptions(boolean)
+   * @param suppress
+   */
+  public void setSuppressVerifyExceptions(boolean suppress) {
+     VerifyParameters.setSuppressVerify(suppress);
+  }
+
+  public boolean isSuppressVerifyExceptions() {
+     return VerifyParameters.isSuppressVerifyExceptions();
+  }
+
+}
diff --git a/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/verify/VerifyAfterReconstructXMLDsigParameters.java b/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/verify/VerifyAfterReconstructXMLDsigParameters.java
index 8f8d17c7..d5b04e43 100644
--- a/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/verify/VerifyAfterReconstructXMLDsigParameters.java
+++ b/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/verify/VerifyAfterReconstructXMLDsigParameters.java
@@ -1,169 +1,192 @@
-/**

- * <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.verify;

-

-import java.util.Date;

-

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

-import at.gv.egiz.pdfas.api.xmldsig.ReconstructXMLDsigResult;

-

-/**

- * This class represents the parameters needed for verify after reconstructXMLDsig has already been executed. 

- * 

- * @author exthex

- *

- */

-public class VerifyAfterReconstructXMLDsigParameters {

-

-   /**

-    * The list of signatures to be verified.

-    */

-   protected ReconstructXMLDsigResult reconstructXMLDsigResult = 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;

-

-   /**

-    * Allows to pass a VerificationTime to the signature device.

-    */

-   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;

-

-   /**

-    * The index of the signature to be verified. A value < 0 indicates to verify all signatures.

-    */

-   protected int verifySignatureIndex = -1;

-

-   /**

-    * @return the reconstructXMLDsigResult

-    */

-   public ReconstructXMLDsigResult getReconstructXMLDsigResult()

-   {

-     return this.reconstructXMLDsigResult;

-   }

-

-   /**

-    * @param reconstructXMLDsigResult

-    *          the reconstructXMLDsigResult to set

-    */

-   public void setReconstructXMLDsigResult(ReconstructXMLDsigResult reconstructXMLDsigResult)

-   {

-     this.reconstructXMLDsigResult = reconstructXMLDsigResult;

-   }

-

-   /**

-    * @return the signatureDevice

-    */

-   public String getSignatureDevice()

-   {

-     return this.signatureDevice;

-   }

-

-   /**

-    * Set the signature device to use for verification. 

-    * If none is set here, the signature device that was used for reconstructXMLDsig will be used.

-    *  

-    * @param signatureDevice

-    *          the signatureDevice to set

-    */

-   public void setSignatureDevice(String signatureDevice)

-   {

-     this.signatureDevice = signatureDevice;

-   }

-

-   /**

-    * @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;

-   }

-

-   /**

-    * Set the index of the signature to verify (index starting at 0). A value < 0 indicates to verify all values.

-    * @param verify_which

-    */

-   public void setVerifySignatureIndex(int verify_which) {

-     this.verifySignatureIndex  = verify_which;

-   }

-

-   public int getVerifySignatureIndex() {

-      return verifySignatureIndex;

-   }

-

-   /**

-    * @see VerifyParameters#setSuppressVerifyExceptions(boolean)

-    * @param suppress

-    */

-   public void setSuppressVerifyExceptions(boolean suppress) {

-      VerifyParameters.setSuppressVerify(suppress);

-   }

-

-   public boolean isSuppressVerifyExceptions() {

-      return VerifyParameters.isSuppressVerifyExceptions();

-   }

-

-}

+/*******************************************************************************
+ * <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.verify;
+
+import java.util.Date;
+
+import at.gv.egiz.pdfas.api.commons.Constants;
+import at.gv.egiz.pdfas.api.xmldsig.ReconstructXMLDsigResult;
+
+/**
+ * This class represents the parameters needed for verify after reconstructXMLDsig has already been executed. 
+ * 
+ * @author exthex
+ *
+ */
+public class VerifyAfterReconstructXMLDsigParameters {
+
+   /**
+    * The list of signatures to be verified.
+    */
+   protected ReconstructXMLDsigResult reconstructXMLDsigResult = 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;
+
+   /**
+    * Allows to pass a VerificationTime to the signature device.
+    */
+   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;
+
+   /**
+    * The index of the signature to be verified. A value < 0 indicates to verify all signatures.
+    */
+   protected int verifySignatureIndex = -1;
+
+   /**
+    * @return the reconstructXMLDsigResult
+    */
+   public ReconstructXMLDsigResult getReconstructXMLDsigResult()
+   {
+     return this.reconstructXMLDsigResult;
+   }
+
+   /**
+    * @param reconstructXMLDsigResult
+    *          the reconstructXMLDsigResult to set
+    */
+   public void setReconstructXMLDsigResult(ReconstructXMLDsigResult reconstructXMLDsigResult)
+   {
+     this.reconstructXMLDsigResult = reconstructXMLDsigResult;
+   }
+
+   /**
+    * @return the signatureDevice
+    */
+   public String getSignatureDevice()
+   {
+     return this.signatureDevice;
+   }
+
+   /**
+    * Set the signature device to use for verification. 
+    * If none is set here, the signature device that was used for reconstructXMLDsig will be used.
+    *  
+    * @param signatureDevice
+    *          the signatureDevice to set
+    */
+   public void setSignatureDevice(String signatureDevice)
+   {
+     this.signatureDevice = signatureDevice;
+   }
+
+   /**
+    * @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;
+   }
+
+   /**
+    * Set the index of the signature to verify (index starting at 0). A value < 0 indicates to verify all values.
+    * @param verify_which
+    */
+   public void setVerifySignatureIndex(int verify_which) {
+     this.verifySignatureIndex  = verify_which;
+   }
+
+   public int getVerifySignatureIndex() {
+      return verifySignatureIndex;
+   }
+
+   /**
+    * @see VerifyParameters#setSuppressVerifyExceptions(boolean)
+    * @param suppress
+    */
+   public void setSuppressVerifyExceptions(boolean suppress) {
+      VerifyParameters.setSuppressVerify(suppress);
+   }
+
+   public boolean isSuppressVerifyExceptions() {
+      return VerifyParameters.isSuppressVerifyExceptions();
+   }
+
+}
diff --git a/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/verify/VerifyParameters.java b/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/verify/VerifyParameters.java
index e7301dc4..56e11ca1 100644
--- a/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/verify/VerifyParameters.java
+++ b/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/verify/VerifyParameters.java
@@ -1,249 +1,272 @@
-/**

- * <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.verify;

-

-import java.util.Date;

-

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

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

-

-/**

- * Parameter object that holds the verify parameters.

- * 

- * @author wprinz

- */

-public class VerifyParameters

-{

-  // This would be a perfect point for multiple inheritance in Java.

-  // VerifyParameters extends AnalyzeParameters, VerifyAfterAnalysisParameters

-  // Then a lot of code could be easily reused in the PdfAsObject's check*Parameters methods.

-

-  /**

-   * 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;

-  

-  private static ThreadLocal suppressVerifyExceptions = new ThreadLocal();

-

-  

-  public VerifyParameters() {

-     suppressVerifyExceptions.set(Boolean.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;

-   }

-   

-   /**

-    * Set if verify exceptions (because of unknown signatures) are suppressed or not (default).

-    * Suppressing can be helpful for multiple signatures if you want to verify the working rest. Unsupported

-    * Signatures are reported without throwing an exception via {@link VerifyResult#getVerificationException()}

-    * @param suppress

-    */

-   public void setSuppressVerifyExceptions(boolean suppress) {      

-      setSuppressVerify(suppress);     

-   }

-   

-   /**

-    * See {@link #setSuppressVerifyExceptions(boolean)}

-    * @return

-    */

-   public static boolean isSuppressVerifyExceptions() {

-      if (suppressVerifyExceptions.get() == null) return false;

-      return ((Boolean) suppressVerifyExceptions.get()).booleanValue(); 

-   }

-  

-   static void setSuppressVerify(boolean suppress) {

-	   suppressVerifyExceptions.set(new Boolean(suppress)); 

-   }

-

-}

+/*******************************************************************************
+ * <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.verify;
+
+import java.util.Date;
+
+import at.gv.egiz.pdfas.api.commons.Constants;
+import at.gv.egiz.pdfas.api.io.DataSource;
+
+/**
+ * Parameter object that holds the verify parameters.
+ * 
+ * @author wprinz
+ */
+public class VerifyParameters
+{
+  // This would be a perfect point for multiple inheritance in Java.
+  // VerifyParameters extends AnalyzeParameters, VerifyAfterAnalysisParameters
+  // Then a lot of code could be easily reused in the PdfAsObject's check*Parameters methods.
+
+  /**
+   * 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;
+  
+  private static ThreadLocal suppressVerifyExceptions = new ThreadLocal();
+
+  
+  public VerifyParameters() {
+     suppressVerifyExceptions.set(Boolean.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;
+   }
+   
+   /**
+    * Set if verify exceptions (because of unknown signatures) are suppressed or not (default).
+    * Suppressing can be helpful for multiple signatures if you want to verify the working rest. Unsupported
+    * Signatures are reported without throwing an exception via {@link VerifyResult#getVerificationException()}
+    * @param suppress
+    */
+   public void setSuppressVerifyExceptions(boolean suppress) {      
+      setSuppressVerify(suppress);     
+   }
+   
+   /**
+    * See {@link #setSuppressVerifyExceptions(boolean)}
+    * @return
+    */
+   public static boolean isSuppressVerifyExceptions() {
+      if (suppressVerifyExceptions.get() == null) return false;
+      return ((Boolean) suppressVerifyExceptions.get()).booleanValue(); 
+   }
+  
+   static void setSuppressVerify(boolean suppress) {
+	   suppressVerifyExceptions.set(new Boolean(suppress)); 
+   }
+
+}
diff --git a/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/verify/VerifyResult.java b/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/verify/VerifyResult.java
index fb48e5ee..ca8ee7c4 100644
--- a/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/verify/VerifyResult.java
+++ b/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/verify/VerifyResult.java
@@ -1,179 +1,202 @@
-/**

- * <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.verify;

-

-import java.util.Date;

-import java.util.List;

-

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

-import at.gv.egiz.pdfas.api.analyze.NonTextObjectInfo;

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

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

-import at.gv.egiz.pdfas.api.xmldsig.XMLDsigData;

-

-/**

- * Encapsulates the data of a verification of one signature.

- * 

- * @author wprinz

- */

-public interface VerifyResult extends SignatureInformation

-{

-   /**

-    * Returns if the verification was possible or could not even be startet. see {@link #getVerificationException()} for details.

-    * @return

-    */

-   public boolean isVerificationDone();

-   

-   /**

-    * Returns a verification exception if any. Shows that the verification could not be started. See {@link #isVerificationDone()}.

-    * @return

-    */

-   public PdfAsException getVerificationException();

-   

-  /**

-   * Returns the result of the certificate check.

-   * 

-   * @return Returns the result of the certificate check.

-   */

-  public SignatureCheck getCertificateCheck();

-

-  /**

-   * Returns the result of the value (and hash) check.

-   * 

-   * @return Returns the result of the value (and hash) check.

-   */

-  public SignatureCheck getValueCheckCode();

-

-  /**

-   * Returns the result of the manifest check.

-   * 

-   * @return Returns the result of the manifest check.

-   */

-  public SignatureCheck getManifestCheckCode();

-

-  /**

-   * Returns true, if the signer's certificate is a qualified certificate.

-   * 

-   * @return Returns true, if the signer's certificate is a qualified

-   *         certificate.

-   */

-  public boolean isQualifiedCertificate();

-  

-  /**

-   * Returns {@code true} if public authority is indicated.

-   * @return {@code true} if public authority.

-   */

-  public boolean isPublicAuthority();

-  

-  /**

-   * Returns the public authority code or {@code null}.

-   * @return The public authority code or {@code null}.

-   */

-  public String getPublicAuthorityCode();

-

-  /**

-   * Returns a list of Strings each stating one public property of the

-   * certificate.

-   * 

-   * <p>

-   * Such public properties are certificate extensions each being assigned an

-   * own OID. For example the public property "Verwaltungseigenschaft" has the

-   * OID "1.2.40.0.10.1.1.1".

-   * </p>

-   * 

-   * @return Returns the list of Strings representing the public properties of

-   *         this certificate, if any.

-   */

-  public List getPublicProperties();

-

-  /**

-   * Returns the verification time, which is the time when the signature was

-   * verified.

-   * 

-   * <p>

-   * Note that this is actually the Date passed to the verify methods over

-   * {@link VerifyParameters#setVerificationTime(Date)} or

-   * {@link VerifyAfterAnalysisParameters#setVerificationTime(Date)}. The

-   * signature devices don't respond the actual verification time so there is no

-   * guarantee that the set verification time was actually used as time of

-   * verification. Please consult the device's documentation for more

-   * information.

-   * </p>

-   * <p>

-   * If the verification device does not return a verification time and no

-   * verification time was set in the

-   * {@link VerifyParameters#setVerificationTime(Date)} or

-   * {@link VerifyAfterAnalysisParameters#setVerificationTime(Date)}, the time

-   * returned by this method will be equal to the signing time (

-   * {@link SignatureInformation#getSigningTime()}).

-   * </p>

-   * 

-   * @return Returns the verification time, which is the time when the signature

-   *         was verified.

-   */

-  public Date getVerificationTime();

-

-  /**

-   * Returns the hash input data as returned by MOA as Base64-encoded String.

-   * 

-   * <p>

-   * This will only return a value other than null if the corresponding

-   * {@link VerifyParameters} has been set to true.

-   * </p>

-   * <p>

-   * Note that the HashInputData does not necessarily have to be exactly the

-   * same as the signed data return by the

-   * {@link SignatureInformation#getSignedData()} method.

-   * </p>

-   * 

-   * @return Returns the base64 encoded hash input data as returned by MOA.

-   * 

-   * @see SignatureInformation#getSignedData()

-   */

-  public String getHashInputData();

-  

-  /**

-   * Returns a list<{@link NonTextObjectInfo}> of non textual objects in the pdf document.

-   * Only available for textual signatures. Show this to the user who signed the textual content only! 

-   * @return  List<{@link NonTextObjectInfo} or <tt>null</tt> of not available (binary signature)

-   */

-  public List getNonTextualObjects();

-  

-

-  /**

-   * Returns <code>true</code> if non textual objects have been found, <code>false</code> if not.

-   * @return <code>true</code> if non textual objects have been found, <code>false</code> if not.

-   */

-  public boolean hasNonTextualObjects();

-

-  /**

-   * Get the reconstructed xmldsig XML data. The reconstruction is done during the verification process.

-   * 

-   * @see PdfAs#reconstructXMLDSIG(at.gv.egiz.pdfas.api.xmldsig.ReconstructXMLDsigParameters)

-   * @see PdfAs#reconstructXMLDSIG(at.gv.egiz.pdfas.api.xmldsig.ReconstructXMLDsigAfterAnalysisParameters)

-   * @return

-   */

-  public XMLDsigData getReconstructedXMLDsig();

-

-}

+/*******************************************************************************
+ * <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.verify;
+
+import java.util.Date;
+import java.util.List;
+
+import at.gv.egiz.pdfas.api.PdfAs;
+import at.gv.egiz.pdfas.api.analyze.NonTextObjectInfo;
+import at.gv.egiz.pdfas.api.commons.SignatureInformation;
+import at.gv.egiz.pdfas.api.exceptions.PdfAsException;
+import at.gv.egiz.pdfas.api.xmldsig.XMLDsigData;
+
+/**
+ * Encapsulates the data of a verification of one signature.
+ * 
+ * @author wprinz
+ */
+public interface VerifyResult extends SignatureInformation
+{
+   /**
+    * Returns if the verification was possible or could not even be startet. see {@link #getVerificationException()} for details.
+    * @return
+    */
+   public boolean isVerificationDone();
+   
+   /**
+    * Returns a verification exception if any. Shows that the verification could not be started. See {@link #isVerificationDone()}.
+    * @return
+    */
+   public PdfAsException getVerificationException();
+   
+  /**
+   * Returns the result of the certificate check.
+   * 
+   * @return Returns the result of the certificate check.
+   */
+  public SignatureCheck getCertificateCheck();
+
+  /**
+   * Returns the result of the value (and hash) check.
+   * 
+   * @return Returns the result of the value (and hash) check.
+   */
+  public SignatureCheck getValueCheckCode();
+
+  /**
+   * Returns the result of the manifest check.
+   * 
+   * @return Returns the result of the manifest check.
+   */
+  public SignatureCheck getManifestCheckCode();
+
+  /**
+   * Returns true, if the signer's certificate is a qualified certificate.
+   * 
+   * @return Returns true, if the signer's certificate is a qualified
+   *         certificate.
+   */
+  public boolean isQualifiedCertificate();
+  
+  /**
+   * Returns {@code true} if public authority is indicated.
+   * @return {@code true} if public authority.
+   */
+  public boolean isPublicAuthority();
+  
+  /**
+   * Returns the public authority code or {@code null}.
+   * @return The public authority code or {@code null}.
+   */
+  public String getPublicAuthorityCode();
+
+  /**
+   * Returns a list of Strings each stating one public property of the
+   * certificate.
+   * 
+   * <p>
+   * Such public properties are certificate extensions each being assigned an
+   * own OID. For example the public property "Verwaltungseigenschaft" has the
+   * OID "1.2.40.0.10.1.1.1".
+   * </p>
+   * 
+   * @return Returns the list of Strings representing the public properties of
+   *         this certificate, if any.
+   */
+  public List getPublicProperties();
+
+  /**
+   * Returns the verification time, which is the time when the signature was
+   * verified.
+   * 
+   * <p>
+   * Note that this is actually the Date passed to the verify methods over
+   * {@link VerifyParameters#setVerificationTime(Date)} or
+   * {@link VerifyAfterAnalysisParameters#setVerificationTime(Date)}. The
+   * signature devices don't respond the actual verification time so there is no
+   * guarantee that the set verification time was actually used as time of
+   * verification. Please consult the device's documentation for more
+   * information.
+   * </p>
+   * <p>
+   * If the verification device does not return a verification time and no
+   * verification time was set in the
+   * {@link VerifyParameters#setVerificationTime(Date)} or
+   * {@link VerifyAfterAnalysisParameters#setVerificationTime(Date)}, the time
+   * returned by this method will be equal to the signing time (
+   * {@link SignatureInformation#getSigningTime()}).
+   * </p>
+   * 
+   * @return Returns the verification time, which is the time when the signature
+   *         was verified.
+   */
+  public Date getVerificationTime();
+
+  /**
+   * Returns the hash input data as returned by MOA as Base64-encoded String.
+   * 
+   * <p>
+   * This will only return a value other than null if the corresponding
+   * {@link VerifyParameters} has been set to true.
+   * </p>
+   * <p>
+   * Note that the HashInputData does not necessarily have to be exactly the
+   * same as the signed data return by the
+   * {@link SignatureInformation#getSignedData()} method.
+   * </p>
+   * 
+   * @return Returns the base64 encoded hash input data as returned by MOA.
+   * 
+   * @see SignatureInformation#getSignedData()
+   */
+  public String getHashInputData();
+  
+  /**
+   * Returns a list<{@link NonTextObjectInfo}> of non textual objects in the pdf document.
+   * Only available for textual signatures. Show this to the user who signed the textual content only! 
+   * @return  List<{@link NonTextObjectInfo} or <tt>null</tt> of not available (binary signature)
+   */
+  public List getNonTextualObjects();
+  
+
+  /**
+   * Returns <code>true</code> if non textual objects have been found, <code>false</code> if not.
+   * @return <code>true</code> if non textual objects have been found, <code>false</code> if not.
+   */
+  public boolean hasNonTextualObjects();
+
+  /**
+   * Get the reconstructed xmldsig XML data. The reconstruction is done during the verification process.
+   * 
+   * @see PdfAs#reconstructXMLDSIG(at.gv.egiz.pdfas.api.xmldsig.ReconstructXMLDsigParameters)
+   * @see PdfAs#reconstructXMLDSIG(at.gv.egiz.pdfas.api.xmldsig.ReconstructXMLDsigAfterAnalysisParameters)
+   * @return
+   */
+  public XMLDsigData getReconstructedXMLDsig();
+
+}
diff --git a/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/verify/VerifyResults.java b/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/verify/VerifyResults.java
index 44b62a78..3e0f4ee0 100644
--- a/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/verify/VerifyResults.java
+++ b/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/verify/VerifyResults.java
@@ -1,48 +1,71 @@
-/**

- * <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.verify;

-

-import java.util.List;

-

-/**

- * The result of the verification of a document.

- * 

- * <p>

- * Currently, this is not more than a list of VerifyResult objects, one for each

- * verified signature. There may be additional items in future PDF-AS versions.

- * </p>

- * 

- * @author wprinz

- */

-public interface VerifyResults

-{

-  /**

-   * Returns the List of VerifyResult objects, one for each verified signature.

-   * 

-   * @return Returns the List of VerifyResult objects, one for each verified

-   *         signature.

-   */

-  public List getResults();

-    

-}

+/*******************************************************************************
+ * <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.verify;
+
+import java.util.List;
+
+/**
+ * The result of the verification of a document.
+ * 
+ * <p>
+ * Currently, this is not more than a list of VerifyResult objects, one for each
+ * verified signature. There may be additional items in future PDF-AS versions.
+ * </p>
+ * 
+ * @author wprinz
+ */
+public interface VerifyResults
+{
+  /**
+   * Returns the List of VerifyResult objects, one for each verified signature.
+   * 
+   * @return Returns the List of VerifyResult objects, one for each verified
+   *         signature.
+   */
+  public List getResults();
+    
+}
diff --git a/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/verify/package-info.java b/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/verify/package-info.java
index be2cc3d4..e18d1b92 100644
--- a/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/verify/package-info.java
+++ b/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/api/verify/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.verify;
\ No newline at end of file
+package at.gv.egiz.pdfas.api.verify;
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;
diff --git a/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/wrapper/ByteArrayDataSink_OLD.java b/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/wrapper/ByteArrayDataSink_OLD.java
index bb39a322..95316937 100644
--- a/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/wrapper/ByteArrayDataSink_OLD.java
+++ b/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/wrapper/ByteArrayDataSink_OLD.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.
+ ******************************************************************************/
 package at.gv.egiz.pdfas.wrapper;
 
 import java.io.ByteArrayOutputStream;
diff --git a/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/wrapper/ByteArrayDataSource_OLD.java b/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/wrapper/ByteArrayDataSource_OLD.java
index ad494acd..152f4053 100644
--- a/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/wrapper/ByteArrayDataSource_OLD.java
+++ b/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/wrapper/ByteArrayDataSource_OLD.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.
+ ******************************************************************************/
 package at.gv.egiz.pdfas.wrapper;
 
 import java.io.ByteArrayInputStream;
diff --git a/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/wrapper/FileDataSource.java b/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/wrapper/FileDataSource.java
index 19394f0a..fa64f7bd 100644
--- a/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/wrapper/FileDataSource.java
+++ b/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/wrapper/FileDataSource.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.
+ ******************************************************************************/
 package at.gv.egiz.pdfas.wrapper;
 
 import java.io.ByteArrayInputStream;
diff --git a/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/wrapper/LegacyMainTest.java b/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/wrapper/LegacyMainTest.java
index b64bb4c7..8838834e 100644
--- a/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/wrapper/LegacyMainTest.java
+++ b/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/wrapper/LegacyMainTest.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.
+ ******************************************************************************/
 package at.gv.egiz.pdfas.wrapper;
 
 import java.io.File;
diff --git a/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/wrapper/PdfAsObject.java b/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/wrapper/PdfAsObject.java
index ecd3c031..005e3963 100644
--- a/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/wrapper/PdfAsObject.java
+++ b/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/wrapper/PdfAsObject.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.
+ ******************************************************************************/
 package at.gv.egiz.pdfas.wrapper;
 
 import iaik.x509.X509Certificate;
diff --git a/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/wrapper/SignParameterWrapper.java b/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/wrapper/SignParameterWrapper.java
index 87278c85..9d0f45d7 100644
--- a/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/wrapper/SignParameterWrapper.java
+++ b/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/wrapper/SignParameterWrapper.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.
+ ******************************************************************************/
 package at.gv.egiz.pdfas.wrapper;
 
 import java.io.OutputStream;
diff --git a/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/wrapper/SignResultImpl.java b/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/wrapper/SignResultImpl.java
index f8d36869..60711717 100644
--- a/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/wrapper/SignResultImpl.java
+++ b/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/wrapper/SignResultImpl.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.
+ ******************************************************************************/
 package at.gv.egiz.pdfas.wrapper;
 
 import java.security.cert.X509Certificate;
diff --git a/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/wrapper/SignatureCheckWrapper.java b/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/wrapper/SignatureCheckWrapper.java
index 04b0dd3c..743a7bf2 100644
--- a/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/wrapper/SignatureCheckWrapper.java
+++ b/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/wrapper/SignatureCheckWrapper.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.
+ ******************************************************************************/
 package at.gv.egiz.pdfas.wrapper;
 
 import at.gv.egiz.pdfas.api.verify.SignatureCheck;
diff --git a/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/wrapper/SignatureDetailInformationWrapper.java b/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/wrapper/SignatureDetailInformationWrapper.java
index 5192ffe4..fa036c8f 100644
--- a/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/wrapper/SignatureDetailInformationWrapper.java
+++ b/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/wrapper/SignatureDetailInformationWrapper.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.
+ ******************************************************************************/
 package at.gv.egiz.pdfas.wrapper;
 
 import java.security.cert.X509Certificate;
diff --git a/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/wrapper/SignaturePositionImpl.java b/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/wrapper/SignaturePositionImpl.java
index 2d950643..82da0d59 100644
--- a/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/wrapper/SignaturePositionImpl.java
+++ b/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/wrapper/SignaturePositionImpl.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.
+ ******************************************************************************/
 package at.gv.egiz.pdfas.wrapper;
 
 import at.gv.egiz.pdfas.api.sign.pos.SignaturePosition;
diff --git a/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/wrapper/VerifyParameterWrapper.java b/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/wrapper/VerifyParameterWrapper.java
index 44f9aa6c..e8e89cb4 100644
--- a/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/wrapper/VerifyParameterWrapper.java
+++ b/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/wrapper/VerifyParameterWrapper.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.
+ ******************************************************************************/
 package at.gv.egiz.pdfas.wrapper;
 
 import at.gv.egiz.pdfas.api.verify.VerifyParameters;
diff --git a/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/wrapper/VerifyResultWrapper.java b/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/wrapper/VerifyResultWrapper.java
index 7b35ef6c..770e7f3b 100644
--- a/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/wrapper/VerifyResultWrapper.java
+++ b/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/wrapper/VerifyResultWrapper.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.
+ ******************************************************************************/
 package at.gv.egiz.pdfas.wrapper;
 
 import java.io.InputStream;
diff --git a/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/wrapper/VerifyResultsImpl.java b/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/wrapper/VerifyResultsImpl.java
index d20da58b..d99db8bb 100644
--- a/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/wrapper/VerifyResultsImpl.java
+++ b/pdf-as-legacy/src/main/java/at/gv/egiz/pdfas/wrapper/VerifyResultsImpl.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.
+ ******************************************************************************/
 package at.gv.egiz.pdfas.wrapper;
 
 import java.util.List;
diff --git a/pdf-as-legacy/src/main/java/at/knowcenter/wag/egov/egiz/sig/SignatureTypes.java b/pdf-as-legacy/src/main/java/at/knowcenter/wag/egov/egiz/sig/SignatureTypes.java
index 07ff02de..8bd69ef2 100644
--- a/pdf-as-legacy/src/main/java/at/knowcenter/wag/egov/egiz/sig/SignatureTypes.java
+++ b/pdf-as-legacy/src/main/java/at/knowcenter/wag/egov/egiz/sig/SignatureTypes.java
@@ -1,230 +1,253 @@
-/**

- * <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.

- *

- * $Id: SignatureTypes.java,v 1.5 2006/10/31 08:18:56 wprinz Exp $

- */

-package at.knowcenter.wag.egov.egiz.sig;

-

-import org.apache.commons.lang3.ArrayUtils;

-

-public class SignatureTypes {

-

-	/**

-	 * Defines all supported states for {@link SignatureTypes} (signature

-	 * profiles). Signature types can be enabled ("on"), can be set to support

-	 * signature only ("sign_only"), to verification only ("verify_only") or can

-	 * be disabled ("off" or any other value not covered by other enum values).

-	 * 

-	 * @author Datentechnik Innovation GmbH

-	 */

-	public enum State {

-

-		/**

-		 * Enables a signature profile.

-		 */

-		ON("on", "yes", "true", "enabled"),

-

-		/**

-		 * Disables a signature profile.

-		 */

-		OFF(),

-

-		/**

-		 * Restricts the signature profile so that is can only be used for

-		 * verification purposes and not for signature.

-		 */

-		VERIFY_ONLY("verify_only", "verify-only", "verifyonly", "verify only",

-				"verify"),

-

-		/**

-		 * Allows the signature profile to be used for signature but not for

-		 * verification.

-		 */

-		SIGN_ONLY("sign_only", "sign-only", "signonly", "sign only", "sign");

-

-		/**

-		 * Sets the default state when no valid value was provided.

-		 */

-		private static final State DEFAULT = OFF;

-

-		/**

-		 * States that allow signatures.

-		 */

-		private static final State[] CAN_SIGN = { ON, SIGN_ONLY };

-

-		/**

-		 * States that allow verification.

-		 */

-		private static final State[] CAN_VERIFY = { ON, VERIFY_ONLY };

-

-		private String[] keyWords;

-

-		private State(String... keyWords) {

-			this.keyWords = keyWords;

-		}

-

-		/**

-		 * Returns a valid State from a given {@code keyWord}. If the

-		 * {@code keyWord} cannot be matched to a certain state, the default

-		 * State {@link #OFF} is returned.

-		 * 

-		 * @param keyWord

-		 *            A valid keyword like "on", "sign_only"...

-		 * @return The enum State.

-		 */

-		public static State fromString(String keyWord) {

-			if (keyWord == null) {

-				return DEFAULT;

-			}

-			try {

-				return valueOf(keyWord.toUpperCase());

-			} catch (IllegalArgumentException e) {

-				for (State candidate : values()) {

-					for (String candidateKeyWord : candidate.keyWords) {

-						if (keyWord.equalsIgnoreCase(candidateKeyWord)) {

-							return candidate;

-						}

-					}

-				}

-				return DEFAULT;

-			}

-		}

-

-		/**

-		 * Returns {@code true} when the current state is one of the given

-		 * candidate {@code states}.

-		 * 

-		 * @param states

-		 *            The candidate states.

-		 * @return {@code true} when the current state is one of the given

-		 *         candidate states, {@code false} if not.

-		 */

-		public boolean in(State... states) {

-			if (states != null) {

-				for (State state : states) {

-					if (this == state) {

-						return true;

-					}

-				}

-			}

-			return false;

-		}

-

-		/**

-		 * Returns if the respective state allows signatures.

-		 * 

-		 * @return {@code true} if signatures are allowed, {@code false} if not.

-		 */

-		public boolean canSign() {

-			return in(CAN_SIGN);

-		}

-

-		/**

-		 * Returns if the respective state allows verification.

-		 * 

-		 * @return {@code true} if verification is allowed, {@code false} if

-		 *         not.

-		 */

-		public boolean canVerify() {

-			return in(CAN_VERIFY);

-		}

-

-	}

-	

-	/**

-	   * Standard key get/set the singature name

-	   */

-	  public static final String SIG_NAME = "SIG_NAME";

-

-	  /**

-	   * Standard key get/set the signature date

-	   */

-	  public static final String SIG_DATE = "SIG_DATE";

-

-	  /**

-	   * Standard key get/set the signator issuer

-	   */

-	  public static final String SIG_ISSUER = "SIG_ISSUER";

-

-	  /**

-	   * Standard key get/set the siganture value

-	   */

-	  public static final String SIG_VALUE = "SIG_VALUE";

-

-	  /**

-	   * Standard key get/set the normalisation method used

-	   */

-	  public static final String SIG_NORM = "SIG_NORM";

-

-	  /**

-	   * Standard key get/set the signation id's used by BKU signated documents

-	   */

-	  public static final String SIG_ID = "SIG_ID";

-	  

-	  /**

-	   * The EGIZ Algorithm "Kennzeichnung".

-	   */

-	  public static final String SIG_KZ = "SIG_KZ";

-

-	  /**

-	   * Standard key get/set the reference to the signature label (image mark)

-	   */

-	  public static final String SIG_LABEL = "SIG_LABEL";

-

-	  /**

-	   * Standard key get/set the serial number of the signature

-	   */

-	  public static final String SIG_NUMBER = "SIG_NUMBER";

-

-	  // public static final String SIG_TYPE = "SIG_TYPE";

-	  /**

-	   * Standard key get/set the signature meta informations

-	   */

-	  public static final String SIG_META = "SIG_META";

-	  

-	  /**

-	   * Standard key get/set the signature algorithm (sign + hash)

-	   */

-	  public static final String SIG_ALG = "SIG_ALG";

-	  

-	  /**

-	   * Standard key get/set the signature note

-	   * added by rpiazzi

-	   */

-	  public static final String SIG_NOTE = "SIG_NOTE";

-	  

-	  

-	  /**

-	   * Standard key get/set the signature subject

-	   * Added to be able to define static signator name within config file

-	   * added by rpiazzi

-	   */

-	  public static final String SIG_SUBJECT = "SIG_SUBJECT";

-

-	public static String[] REQUIRED_SIG_KEYS = new String[] { SIG_DATE,

-	      SIG_ISSUER, SIG_VALUE, SIG_NUMBER, SIG_ID, SIG_KZ };

-	

-	public static boolean isRequredSigTypeKey(String name) {

-		return ArrayUtils.contains(REQUIRED_SIG_KEYS, name);

-	}

-}
\ No newline at end of file
+/*******************************************************************************
+ * <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.
+ *
+ * $Id: SignatureTypes.java,v 1.5 2006/10/31 08:18:56 wprinz Exp $
+ */
+package at.knowcenter.wag.egov.egiz.sig;
+
+import org.apache.commons.lang3.ArrayUtils;
+
+public class SignatureTypes {
+
+	/**
+	 * Defines all supported states for {@link SignatureTypes} (signature
+	 * profiles). Signature types can be enabled ("on"), can be set to support
+	 * signature only ("sign_only"), to verification only ("verify_only") or can
+	 * be disabled ("off" or any other value not covered by other enum values).
+	 * 
+	 * @author Datentechnik Innovation GmbH
+	 */
+	public enum State {
+
+		/**
+		 * Enables a signature profile.
+		 */
+		ON("on", "yes", "true", "enabled"),
+
+		/**
+		 * Disables a signature profile.
+		 */
+		OFF(),
+
+		/**
+		 * Restricts the signature profile so that is can only be used for
+		 * verification purposes and not for signature.
+		 */
+		VERIFY_ONLY("verify_only", "verify-only", "verifyonly", "verify only",
+				"verify"),
+
+		/**
+		 * Allows the signature profile to be used for signature but not for
+		 * verification.
+		 */
+		SIGN_ONLY("sign_only", "sign-only", "signonly", "sign only", "sign");
+
+		/**
+		 * Sets the default state when no valid value was provided.
+		 */
+		private static final State DEFAULT = OFF;
+
+		/**
+		 * States that allow signatures.
+		 */
+		private static final State[] CAN_SIGN = { ON, SIGN_ONLY };
+
+		/**
+		 * States that allow verification.
+		 */
+		private static final State[] CAN_VERIFY = { ON, VERIFY_ONLY };
+
+		private String[] keyWords;
+
+		private State(String... keyWords) {
+			this.keyWords = keyWords;
+		}
+
+		/**
+		 * Returns a valid State from a given {@code keyWord}. If the
+		 * {@code keyWord} cannot be matched to a certain state, the default
+		 * State {@link #OFF} is returned.
+		 * 
+		 * @param keyWord
+		 *            A valid keyword like "on", "sign_only"...
+		 * @return The enum State.
+		 */
+		public static State fromString(String keyWord) {
+			if (keyWord == null) {
+				return DEFAULT;
+			}
+			try {
+				return valueOf(keyWord.toUpperCase());
+			} catch (IllegalArgumentException e) {
+				for (State candidate : values()) {
+					for (String candidateKeyWord : candidate.keyWords) {
+						if (keyWord.equalsIgnoreCase(candidateKeyWord)) {
+							return candidate;
+						}
+					}
+				}
+				return DEFAULT;
+			}
+		}
+
+		/**
+		 * Returns {@code true} when the current state is one of the given
+		 * candidate {@code states}.
+		 * 
+		 * @param states
+		 *            The candidate states.
+		 * @return {@code true} when the current state is one of the given
+		 *         candidate states, {@code false} if not.
+		 */
+		public boolean in(State... states) {
+			if (states != null) {
+				for (State state : states) {
+					if (this == state) {
+						return true;
+					}
+				}
+			}
+			return false;
+		}
+
+		/**
+		 * Returns if the respective state allows signatures.
+		 * 
+		 * @return {@code true} if signatures are allowed, {@code false} if not.
+		 */
+		public boolean canSign() {
+			return in(CAN_SIGN);
+		}
+
+		/**
+		 * Returns if the respective state allows verification.
+		 * 
+		 * @return {@code true} if verification is allowed, {@code false} if
+		 *         not.
+		 */
+		public boolean canVerify() {
+			return in(CAN_VERIFY);
+		}
+
+	}
+	
+	/**
+	   * Standard key get/set the singature name
+	   */
+	  public static final String SIG_NAME = "SIG_NAME";
+
+	  /**
+	   * Standard key get/set the signature date
+	   */
+	  public static final String SIG_DATE = "SIG_DATE";
+
+	  /**
+	   * Standard key get/set the signator issuer
+	   */
+	  public static final String SIG_ISSUER = "SIG_ISSUER";
+
+	  /**
+	   * Standard key get/set the siganture value
+	   */
+	  public static final String SIG_VALUE = "SIG_VALUE";
+
+	  /**
+	   * Standard key get/set the normalisation method used
+	   */
+	  public static final String SIG_NORM = "SIG_NORM";
+
+	  /**
+	   * Standard key get/set the signation id's used by BKU signated documents
+	   */
+	  public static final String SIG_ID = "SIG_ID";
+	  
+	  /**
+	   * The EGIZ Algorithm "Kennzeichnung".
+	   */
+	  public static final String SIG_KZ = "SIG_KZ";
+
+	  /**
+	   * Standard key get/set the reference to the signature label (image mark)
+	   */
+	  public static final String SIG_LABEL = "SIG_LABEL";
+
+	  /**
+	   * Standard key get/set the serial number of the signature
+	   */
+	  public static final String SIG_NUMBER = "SIG_NUMBER";
+
+	  // public static final String SIG_TYPE = "SIG_TYPE";
+	  /**
+	   * Standard key get/set the signature meta informations
+	   */
+	  public static final String SIG_META = "SIG_META";
+	  
+	  /**
+	   * Standard key get/set the signature algorithm (sign + hash)
+	   */
+	  public static final String SIG_ALG = "SIG_ALG";
+	  
+	  /**
+	   * Standard key get/set the signature note
+	   * added by rpiazzi
+	   */
+	  public static final String SIG_NOTE = "SIG_NOTE";
+	  
+	  
+	  /**
+	   * Standard key get/set the signature subject
+	   * Added to be able to define static signator name within config file
+	   * added by rpiazzi
+	   */
+	  public static final String SIG_SUBJECT = "SIG_SUBJECT";
+
+	public static String[] REQUIRED_SIG_KEYS = new String[] { SIG_DATE,
+	      SIG_ISSUER, SIG_VALUE, SIG_NUMBER, SIG_ID, SIG_KZ };
+	
+	public static boolean isRequredSigTypeKey(String name) {
+		return ArrayUtils.contains(REQUIRED_SIG_KEYS, name);
+	}
+}
diff --git a/pdf-as-legacy/src/test/java/ByteArrayDataSink.java b/pdf-as-legacy/src/test/java/ByteArrayDataSink.java
index 7aa74333..45559d98 100644
--- a/pdf-as-legacy/src/test/java/ByteArrayDataSink.java
+++ b/pdf-as-legacy/src/test/java/ByteArrayDataSink.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.
+ ******************************************************************************/
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
diff --git a/pdf-as-legacy/src/test/java/ByteArrayDataSource.java b/pdf-as-legacy/src/test/java/ByteArrayDataSource.java
index d4b83cc4..6cf15f66 100644
--- a/pdf-as-legacy/src/test/java/ByteArrayDataSource.java
+++ b/pdf-as-legacy/src/test/java/ByteArrayDataSource.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.
+ ******************************************************************************/
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 
diff --git a/pdf-as-legacy/src/test/java/LegacyTest.java b/pdf-as-legacy/src/test/java/LegacyTest.java
index 21d0c3b1..8c813007 100644
--- a/pdf-as-legacy/src/test/java/LegacyTest.java
+++ b/pdf-as-legacy/src/test/java/LegacyTest.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.
+ ******************************************************************************/
 import java.io.FileOutputStream;
 import java.io.InputStream;
 import java.util.Iterator;
diff --git a/pdf-as-legacy/src/test/java/StreamUtils.java b/pdf-as-legacy/src/test/java/StreamUtils.java
index f6822d97..f525cdb4 100644
--- a/pdf-as-legacy/src/test/java/StreamUtils.java
+++ b/pdf-as-legacy/src/test/java/StreamUtils.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.
+ ******************************************************************************/
 import java.io.ByteArrayOutputStream;
 import java.io.InputStream;
 
diff --git a/pdf-as-lib/build.gradle b/pdf-as-lib/build.gradle
index 43e31242..9e440fb8 100644
--- a/pdf-as-lib/build.gradle
+++ b/pdf-as-lib/build.gradle
@@ -1,5 +1,6 @@
 apply plugin: 'java'
 apply plugin: 'eclipse'
+apply plugin: 'java-library-distribution'
 
 jar {
 	manifest {
@@ -129,6 +130,17 @@ test {
 	systemProperties 'property': 'value'
 }
 
+distributions {
+    main {
+        contents {
+            from { '../docs' }
+	    from('../doc/') {
+	       include '*.pdf'
+	    } 
+        }
+    }
+}
+
 uploadArchives {
 	repositories {
 		flatDir {
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/dsig/ObjectFactory.java b/pdf-as-lib/src/main/java/at/gv/egiz/dsig/ObjectFactory.java
index 49eec607..b5018435 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/dsig/ObjectFactory.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/dsig/ObjectFactory.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.
+ ******************************************************************************/
 //
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/dsig/X509DataType.java b/pdf-as-lib/src/main/java/at/gv/egiz/dsig/X509DataType.java
index 2ecfa62d..41be7577 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/dsig/X509DataType.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/dsig/X509DataType.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.
+ ******************************************************************************/
 //
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/dsig/X509IssuerSerialType.java b/pdf-as-lib/src/main/java/at/gv/egiz/dsig/X509IssuerSerialType.java
index 650ba68c..6f5366fb 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/dsig/X509IssuerSerialType.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/dsig/X509IssuerSerialType.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.
+ ******************************************************************************/
 //
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/dsig/util/DsigMarschaller.java b/pdf-as-lib/src/main/java/at/gv/egiz/dsig/util/DsigMarschaller.java
index 17770737..3b2308f5 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/dsig/util/DsigMarschaller.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/dsig/util/DsigMarschaller.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.
+ ******************************************************************************/
 package at.gv.egiz.dsig.util;
 
 import java.io.InputStream;
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/moa/ByteArrayDataSource.java b/pdf-as-lib/src/main/java/at/gv/egiz/moa/ByteArrayDataSource.java
index 4c3a2c6e..1e5dd918 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/moa/ByteArrayDataSource.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/moa/ByteArrayDataSource.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.
+ ******************************************************************************/
 package at.gv.egiz.moa;
 
 import java.io.ByteArrayInputStream;
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/moa/MOAFault.java b/pdf-as-lib/src/main/java/at/gv/egiz/moa/MOAFault.java
index 3de2c135..c37b5983 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/moa/MOAFault.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/moa/MOAFault.java
@@ -1,4 +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.
+ ******************************************************************************/
 /**
  * MOAFault.java
  *
@@ -40,4 +62,4 @@ public class MOAFault extends java.lang.Exception{
        return faultMessage;
     }
 }
-    
\ No newline at end of file
+    
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/moa/SignatureCreationServiceCallbackHandler.java b/pdf-as-lib/src/main/java/at/gv/egiz/moa/SignatureCreationServiceCallbackHandler.java
index 18fe872e..78c4987a 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/moa/SignatureCreationServiceCallbackHandler.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/moa/SignatureCreationServiceCallbackHandler.java
@@ -1,4 +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.
+ ******************************************************************************/
 /**
  * SignatureCreationServiceCallbackHandler.java
  *
@@ -79,4 +101,4 @@
 
 
     }
-    
\ No newline at end of file
+    
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/moa/SignatureCreationServiceStub.java b/pdf-as-lib/src/main/java/at/gv/egiz/moa/SignatureCreationServiceStub.java
index f543978f..10bdbb43 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/moa/SignatureCreationServiceStub.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/moa/SignatureCreationServiceStub.java
@@ -1,4 +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.
+ ******************************************************************************/
 /**
  * SignatureCreationServiceStub.java
  *
@@ -71256,4 +71278,4 @@
 
     
    }
-   
\ No newline at end of file
+   
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/moa/SignatureVerificationServiceCallbackHandler.java b/pdf-as-lib/src/main/java/at/gv/egiz/moa/SignatureVerificationServiceCallbackHandler.java
index 25d1424c..875e18e5 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/moa/SignatureVerificationServiceCallbackHandler.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/moa/SignatureVerificationServiceCallbackHandler.java
@@ -1,4 +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.
+ ******************************************************************************/
 /**
  * SignatureVerificationServiceCallbackHandler.java
  *
@@ -79,4 +101,4 @@
 
 
     }
-    
\ No newline at end of file
+    
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/moa/SignatureVerificationServiceStub.java b/pdf-as-lib/src/main/java/at/gv/egiz/moa/SignatureVerificationServiceStub.java
index 133d04db..26ca3994 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/moa/SignatureVerificationServiceStub.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/moa/SignatureVerificationServiceStub.java
@@ -1,4 +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.
+ ******************************************************************************/
 /**
  * SignatureVerificationServiceStub.java
  *
@@ -71256,4 +71278,4 @@
 
     
    }
-   
\ No newline at end of file
+   
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/api/ByteArrayDataSink.java b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/api/ByteArrayDataSink.java
index a8931963..b7c14dbf 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/api/ByteArrayDataSink.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/api/ByteArrayDataSink.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.
+ ******************************************************************************/
 package at.gv.egiz.pdfas.lib.api;
 
 import java.io.ByteArrayOutputStream;
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/api/ByteArrayDataSource.java b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/api/ByteArrayDataSource.java
index 6adfde51..fdf175c7 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/api/ByteArrayDataSource.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/api/ByteArrayDataSource.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.
+ ******************************************************************************/
 package at.gv.egiz.pdfas.lib.api;
 
 /**
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/api/Configuration.java b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/api/Configuration.java
index d2f00a59..54046e39 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/api/Configuration.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/api/Configuration.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.
+ ******************************************************************************/
 package at.gv.egiz.pdfas.lib.api;
 
 /**
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/api/DataSink.java b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/api/DataSink.java
index 258141b5..89dfd8c5 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/api/DataSink.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/api/DataSink.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.
+ ******************************************************************************/
 package at.gv.egiz.pdfas.lib.api;
 
 import java.io.OutputStream;
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/api/DataSource.java b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/api/DataSource.java
index 093a3777..9bb2f7fc 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/api/DataSource.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/api/DataSource.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.
+ ******************************************************************************/
 package at.gv.egiz.pdfas.lib.api;
 
 /**
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/api/IConfigurationConstants.java b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/api/IConfigurationConstants.java
index 21f8c81e..127120d2 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/api/IConfigurationConstants.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/api/IConfigurationConstants.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.
+ ******************************************************************************/
 package at.gv.egiz.pdfas.lib.api;
 
 public interface IConfigurationConstants {
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/api/PdfAs.java b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/api/PdfAs.java
index 3ae329cf..15227c55 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/api/PdfAs.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/api/PdfAs.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.
+ ******************************************************************************/
 package at.gv.egiz.pdfas.lib.api;
 
 import java.util.List;
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/api/PdfAsFactory.java b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/api/PdfAsFactory.java
index 02d217c2..6f84e9bc 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/api/PdfAsFactory.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/api/PdfAsFactory.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.
+ ******************************************************************************/
 package at.gv.egiz.pdfas.lib.api;
 
 import iaik.security.ec.provider.ECCelerate;
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/api/PdfAsParameter.java b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/api/PdfAsParameter.java
index 0ef5f876..3f37eebb 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/api/PdfAsParameter.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/api/PdfAsParameter.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.
+ ******************************************************************************/
 package at.gv.egiz.pdfas.lib.api;
 
 public interface PdfAsParameter {
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/api/SignaturePosition.java b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/api/SignaturePosition.java
index 477d798f..f3107e99 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/api/SignaturePosition.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/api/SignaturePosition.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.
+ ******************************************************************************/
 package at.gv.egiz.pdfas.lib.api;
 
 public interface SignaturePosition {
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/api/StatusRequest.java b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/api/StatusRequest.java
index 2c283900..42bd79c6 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/api/StatusRequest.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/api/StatusRequest.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.
+ ******************************************************************************/
 package at.gv.egiz.pdfas.lib.api;
 
 import java.security.cert.CertificateException;
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/api/sign/IPlainSigner.java b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/api/sign/IPlainSigner.java
index 70945678..8ab770e7 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/api/sign/IPlainSigner.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/api/sign/IPlainSigner.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.
+ ******************************************************************************/
 package at.gv.egiz.pdfas.lib.api.sign;
 
 import iaik.x509.X509Certificate;
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/api/sign/SignParameter.java b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/api/sign/SignParameter.java
index 0b4fb389..905b8c2a 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/api/sign/SignParameter.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/api/sign/SignParameter.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.
+ ******************************************************************************/
 package at.gv.egiz.pdfas.lib.api.sign;
 
 import at.gv.egiz.pdfas.lib.api.DataSink;
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/api/sign/SignResult.java b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/api/sign/SignResult.java
index d994c3e1..0af34121 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/api/sign/SignResult.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/api/sign/SignResult.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.
+ ******************************************************************************/
 package at.gv.egiz.pdfas.lib.api.sign;
 
 import java.security.cert.X509Certificate;
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/api/verify/SignatureCheck.java b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/api/verify/SignatureCheck.java
index a021eb2a..2a1698c6 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/api/verify/SignatureCheck.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/api/verify/SignatureCheck.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.
+ ******************************************************************************/
 package at.gv.egiz.pdfas.lib.api.verify;
 
 public interface SignatureCheck {
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/api/verify/VerifyParameter.java b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/api/verify/VerifyParameter.java
index cd973146..3523c268 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/api/verify/VerifyParameter.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/api/verify/VerifyParameter.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.
+ ******************************************************************************/
 package at.gv.egiz.pdfas.lib.api.verify;
 
 import java.util.Date;
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/api/verify/VerifyResult.java b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/api/verify/VerifyResult.java
index 7aa391b5..40e82c91 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/api/verify/VerifyResult.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/api/verify/VerifyResult.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.
+ ******************************************************************************/
 package at.gv.egiz.pdfas.lib.api.verify;
 
 import iaik.x509.X509Certificate;
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/PdfAsImpl.java b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/PdfAsImpl.java
index d477ee0f..a2ad3575 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/PdfAsImpl.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/PdfAsImpl.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.
+ ******************************************************************************/
 package at.gv.egiz.pdfas.lib.impl;
 
 import java.io.ByteArrayInputStream;
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/PdfAsParameterImpl.java b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/PdfAsParameterImpl.java
index d4bb44e6..c9e8ef54 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/PdfAsParameterImpl.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/PdfAsParameterImpl.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.
+ ******************************************************************************/
 package at.gv.egiz.pdfas.lib.impl;
 
 import at.gv.egiz.pdfas.lib.api.Configuration;
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/SignParameterImpl.java b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/SignParameterImpl.java
index acf1f7da..ddf2eaef 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/SignParameterImpl.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/SignParameterImpl.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.
+ ******************************************************************************/
 package at.gv.egiz.pdfas.lib.impl;
 
 import at.gv.egiz.pdfas.lib.api.Configuration;
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/SignResultImpl.java b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/SignResultImpl.java
index 28a2a33b..87fb2881 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/SignResultImpl.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/SignResultImpl.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.
+ ******************************************************************************/
 package at.gv.egiz.pdfas.lib.impl;
 
 import java.security.cert.X509Certificate;
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/SignaturePositionImpl.java b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/SignaturePositionImpl.java
index 7ad8174b..80f6078e 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/SignaturePositionImpl.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/SignaturePositionImpl.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.
+ ******************************************************************************/
 package at.gv.egiz.pdfas.lib.impl;
 
 import at.gv.egiz.pdfas.lib.api.SignaturePosition;
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/StatusRequestImpl.java b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/StatusRequestImpl.java
index 71e5cb4e..86b8325e 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/StatusRequestImpl.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/StatusRequestImpl.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.
+ ******************************************************************************/
 package at.gv.egiz.pdfas.lib.impl;
 
 import iaik.x509.X509Certificate;
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/VerifyParameterImpl.java b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/VerifyParameterImpl.java
index d754c032..b7b81761 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/VerifyParameterImpl.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/VerifyParameterImpl.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.
+ ******************************************************************************/
 package at.gv.egiz.pdfas.lib.impl;
 
 import java.util.Date;
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/configuration/ConfigurationImpl.java b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/configuration/ConfigurationImpl.java
index 9303036f..c767b990 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/configuration/ConfigurationImpl.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/configuration/ConfigurationImpl.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.
+ ******************************************************************************/
 package at.gv.egiz.pdfas.lib.impl.configuration;
 
 import java.util.HashMap;
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/configuration/GlobalConfiguration.java b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/configuration/GlobalConfiguration.java
index 2124f63e..78bde7ec 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/configuration/GlobalConfiguration.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/configuration/GlobalConfiguration.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.
+ ******************************************************************************/
 package at.gv.egiz.pdfas.lib.impl.configuration;
 
 import at.gv.egiz.pdfas.common.settings.ISettings;
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/configuration/PlaceholderConfiguration.java b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/configuration/PlaceholderConfiguration.java
index 7d3beb5c..ec030388 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/configuration/PlaceholderConfiguration.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/configuration/PlaceholderConfiguration.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.
+ ******************************************************************************/
 package at.gv.egiz.pdfas.lib.impl.configuration;
 
 import at.gv.egiz.pdfas.common.settings.ISettings;
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/configuration/SignatureProfileConfiguration.java b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/configuration/SignatureProfileConfiguration.java
index b2d5207d..a7dd3138 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/configuration/SignatureProfileConfiguration.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/configuration/SignatureProfileConfiguration.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.
+ ******************************************************************************/
 package at.gv.egiz.pdfas.lib.impl.configuration;
 
 import at.gv.egiz.pdfas.common.settings.ISettings;
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/configuration/SpecificBaseConfiguration.java b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/configuration/SpecificBaseConfiguration.java
index 88c7b3d7..e2c1eb5e 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/configuration/SpecificBaseConfiguration.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/configuration/SpecificBaseConfiguration.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.
+ ******************************************************************************/
 package at.gv.egiz.pdfas.lib.impl.configuration;
 
 import at.gv.egiz.pdfas.common.settings.ISettings;
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/placeholder/SignaturePlaceholderContext.java b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/placeholder/SignaturePlaceholderContext.java
index 28a34f6a..f09202ae 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/placeholder/SignaturePlaceholderContext.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/placeholder/SignaturePlaceholderContext.java
@@ -1,72 +1,95 @@
-/**

- * <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.lib.impl.placeholder;

-

-/**

- * Store and retrieve {@link SignaturePlaceholderData} in/from a thread local context.

- * 

- * @author exthex

- *

- */

-public class SignaturePlaceholderContext {

-   

-   private ThreadLocal sigHolder = new ThreadLocal();

-   

-   private static SignaturePlaceholderContext instance = new SignaturePlaceholderContext();

-   

-   /**

-    * Constructor. Private because this is a singleton.

-    */

-   private SignaturePlaceholderContext() {

-      

-   }

-

-   /**

-    * Get the {@link SignaturePlaceholderData} which is currently bound to this thread.

-    * Might be null.

-    * 

-    * @return

-    */

-   public static SignaturePlaceholderData getSignaturePlaceholderData(){

-      return (SignaturePlaceholderData)instance.sigHolder.get();

-   }

-

-   /**

-    * 

-    * @return true if there is currently a {@link SignaturePlaceholderData} bound to this thread, false otherwise.

-    */

-   public static boolean isSignaturePlaceholderDataSet() {

-      return instance.sigHolder.get() != null;

-   }

-

-   /**

-    * Bind a {@link SignaturePlaceholderData} to this thread.

-    * If the given data is null, the context will be cleared.

-    * 

-    * @param data if null, clears the ThreadLocal, else binds the data to the current thread.

-    */

-   public static void setSignaturePlaceholderData(SignaturePlaceholderData data) {

-      instance.sigHolder.set(data);

-   }

-}

+/*******************************************************************************
+ * <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.lib.impl.placeholder;
+
+/**
+ * Store and retrieve {@link SignaturePlaceholderData} in/from a thread local context.
+ * 
+ * @author exthex
+ *
+ */
+public class SignaturePlaceholderContext {
+   
+   private ThreadLocal sigHolder = new ThreadLocal();
+   
+   private static SignaturePlaceholderContext instance = new SignaturePlaceholderContext();
+   
+   /**
+    * Constructor. Private because this is a singleton.
+    */
+   private SignaturePlaceholderContext() {
+      
+   }
+
+   /**
+    * Get the {@link SignaturePlaceholderData} which is currently bound to this thread.
+    * Might be null.
+    * 
+    * @return
+    */
+   public static SignaturePlaceholderData getSignaturePlaceholderData(){
+      return (SignaturePlaceholderData)instance.sigHolder.get();
+   }
+
+   /**
+    * 
+    * @return true if there is currently a {@link SignaturePlaceholderData} bound to this thread, false otherwise.
+    */
+   public static boolean isSignaturePlaceholderDataSet() {
+      return instance.sigHolder.get() != null;
+   }
+
+   /**
+    * Bind a {@link SignaturePlaceholderData} to this thread.
+    * If the given data is null, the context will be cleared.
+    * 
+    * @param data if null, clears the ThreadLocal, else binds the data to the current thread.
+    */
+   public static void setSignaturePlaceholderData(SignaturePlaceholderData data) {
+      instance.sigHolder.set(data);
+   }
+}
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/placeholder/SignaturePlaceholderData.java b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/placeholder/SignaturePlaceholderData.java
index d068104a..333e581b 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/placeholder/SignaturePlaceholderData.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/placeholder/SignaturePlaceholderData.java
@@ -1,152 +1,175 @@
-/**

- * <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.lib.impl.placeholder;

-

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

-

-/**

- * This class represents all the data which can be extracted from a placeholder image.

- * 

- * @author exthex

- *

- */

-public class SignaturePlaceholderData {

-

-   public static final String ID_KEY = "id";

-

-   public static final String PROFILE_KEY = "profile";

-

-   public static final String TYPE_KEY = "type";

-

-   public static final String SIG_KEY_KEY = "key";

-

-   private String profile;

-

-   private String type;

-

-   private String key;

-

-   private String id;

-

-   private TablePos tablePos;

-

-   private String placeholderName;

-

-   /**

-    * 

-    * @param profile

-    * @param type

-    * @param sigKey

-    * @param id 

-    */

-   public SignaturePlaceholderData(String profile, String type, String sigKey, String id) {

-      this.profile = profile;

-      this.type = type;

-      this.key = sigKey;

-      this.id = id;

-   }

-

-   /**

-    * Get the table position for the signature block.<br/>

-    * The table position is created from the page number, the upper left corner and the width of the placeholder image.

-    * 

-    * @return

-    */

-   public TablePos getTablePos() {

-      return tablePos;

-   }

-

-   void setTablePos(TablePos tablePos) {

-      this.tablePos = tablePos;

-   }

-

-   /**

-    * The profile name. Might be null if not included in the qr-code.

-    * 

-    * @return

-    */

-   public String getProfile() {

-      return profile;

-   }

-

-   void setProfile(String profile) {

-      this.profile = profile;

-   }

-

-   /**

-    * The signature type: "textual" or "binary". Might be null if not included in the qr-code.

-    * @return

-    */

-   public String getType() {

-      return type;

-   }

-

-   void setType(String type) {

-      this.type = type;

-   }

-

-   /**

-    * The key identifier for MOA signature. Might be null if not included in the qr-code.

-    * 

-    * @return

-    */

-   public String getKey() {

-      return key;

-   }

-

-   void setKey(String key) {

-      this.key = key;

-   }

-

-   public String toString() {

-      return getClass().toString() + ": profile=" + profile + "; type=" + type + "; sigKey=" + key + "; table pos=" + tablePos;

-   }

-

-   void setPlaceholderName(String name) {

-      this.placeholderName = name;

-   }

-

-   /**

-    * The name of the placeholder image.

-    * 

-    * @return

-    */

-   public String getPlaceholderName() {

-      return placeholderName;

-   }

-

-   /**

-    * The id associated with this placeholder.

-    * 

-    * @return

-    */

-   public String getId() {

-      return id;

-   }

-

-   void setId(String id) {

-      this.id = id;

-   }

-

-}

+/*******************************************************************************
+ * <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.lib.impl.placeholder;
+
+import at.knowcenter.wag.egov.egiz.pdf.TablePos;
+
+/**
+ * This class represents all the data which can be extracted from a placeholder image.
+ * 
+ * @author exthex
+ *
+ */
+public class SignaturePlaceholderData {
+
+   public static final String ID_KEY = "id";
+
+   public static final String PROFILE_KEY = "profile";
+
+   public static final String TYPE_KEY = "type";
+
+   public static final String SIG_KEY_KEY = "key";
+
+   private String profile;
+
+   private String type;
+
+   private String key;
+
+   private String id;
+
+   private TablePos tablePos;
+
+   private String placeholderName;
+
+   /**
+    * 
+    * @param profile
+    * @param type
+    * @param sigKey
+    * @param id 
+    */
+   public SignaturePlaceholderData(String profile, String type, String sigKey, String id) {
+      this.profile = profile;
+      this.type = type;
+      this.key = sigKey;
+      this.id = id;
+   }
+
+   /**
+    * Get the table position for the signature block.<br/>
+    * The table position is created from the page number, the upper left corner and the width of the placeholder image.
+    * 
+    * @return
+    */
+   public TablePos getTablePos() {
+      return tablePos;
+   }
+
+   void setTablePos(TablePos tablePos) {
+      this.tablePos = tablePos;
+   }
+
+   /**
+    * The profile name. Might be null if not included in the qr-code.
+    * 
+    * @return
+    */
+   public String getProfile() {
+      return profile;
+   }
+
+   void setProfile(String profile) {
+      this.profile = profile;
+   }
+
+   /**
+    * The signature type: "textual" or "binary". Might be null if not included in the qr-code.
+    * @return
+    */
+   public String getType() {
+      return type;
+   }
+
+   void setType(String type) {
+      this.type = type;
+   }
+
+   /**
+    * The key identifier for MOA signature. Might be null if not included in the qr-code.
+    * 
+    * @return
+    */
+   public String getKey() {
+      return key;
+   }
+
+   void setKey(String key) {
+      this.key = key;
+   }
+
+   public String toString() {
+      return getClass().toString() + ": profile=" + profile + "; type=" + type + "; sigKey=" + key + "; table pos=" + tablePos;
+   }
+
+   void setPlaceholderName(String name) {
+      this.placeholderName = name;
+   }
+
+   /**
+    * The name of the placeholder image.
+    * 
+    * @return
+    */
+   public String getPlaceholderName() {
+      return placeholderName;
+   }
+
+   /**
+    * The id associated with this placeholder.
+    * 
+    * @return
+    */
+   public String getId() {
+      return id;
+   }
+
+   void setId(String id) {
+      this.id = id;
+   }
+
+}
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/placeholder/SignaturePlaceholderExtractor.java b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/placeholder/SignaturePlaceholderExtractor.java
index 0f6a31cd..52e25781 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/placeholder/SignaturePlaceholderExtractor.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/placeholder/SignaturePlaceholderExtractor.java
@@ -1,351 +1,374 @@
-/**

- * <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.lib.impl.placeholder;

-

-import java.awt.geom.AffineTransform;

-import java.awt.geom.NoninvertibleTransformException;

-import java.awt.image.BufferedImage;

-import java.io.IOException;

-import java.io.InputStream;

-import java.util.Hashtable;

-import java.util.Iterator;

-import java.util.List;

-import java.util.Map;

-import java.util.Vector;

-

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

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

-import org.apache.pdfbox.cos.COSName;

-import org.apache.pdfbox.exceptions.WrappedIOException;

-import org.apache.pdfbox.pdmodel.PDDocument;

-import org.apache.pdfbox.pdmodel.PDPage;

-import org.apache.pdfbox.pdmodel.graphics.xobject.PDXObject;

-import org.apache.pdfbox.pdmodel.graphics.xobject.PDXObjectImage;

-import org.apache.pdfbox.util.Matrix;

-import org.apache.pdfbox.util.PDFOperator;

-import org.apache.pdfbox.util.PDFStreamEngine;

-import org.apache.pdfbox.util.ResourceLoader;

-

-import at.gv.egiz.pdfas.common.exceptions.PDFIOException;

-import at.gv.egiz.pdfas.common.exceptions.PdfAsException;

-import at.gv.egiz.pdfas.common.exceptions.PlaceholderExtractionException;

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

-

-import com.google.zxing.BarcodeFormat;

-import com.google.zxing.BinaryBitmap;

-import com.google.zxing.DecodeHintType;

-import com.google.zxing.LuminanceSource;

-import com.google.zxing.MultiFormatReader;

-import com.google.zxing.NotFoundException;

-import com.google.zxing.ReaderException;

-import com.google.zxing.Result;

-import com.google.zxing.client.j2se.BufferedImageLuminanceSource;

-import com.google.zxing.common.HybridBinarizer;

-

-//////

-

-

-

-/**

- * Extract all relevant information from a placeholder image.

- *

- * @author exthex

- *

- */

-public class SignaturePlaceholderExtractor extends PDFStreamEngine {

-   /**

-    * The log.

-    */

-   private static Log log = LogFactory.getLog(SignaturePlaceholderExtractor.class);

-

-   public static final String QR_PLACEHOLDER_IDENTIFIER = "PDF-AS-POS";

-   public static final int PLACEHOLDER_MATCH_MODE_STRICT = 0;

-   public static final int PLACEHOLDER_MATCH_MODE_MODERATE = 1;

-   public static final int PLACEHOLDER_MATCH_MODE_LENIENT = 2;

-   

-   private List placeholders = new Vector();

-   private int currentPage = 0;

-

-   private SignaturePlaceholderExtractor(String placeholderId, int placeholderMatchMode) throws IOException {

-      super(ResourceLoader.loadProperties("placeholder/pdfbox-reader.properties",

-            true));

-   }

-

-   /**

-    * Search the document for placeholder images and possibly included

-    * additional info.<br/>

-    * Searches only for the first placeholder page after page from top.

-    *

-    * @param inputStream

-    * @return all available info from the first found placeholder.

-    * @throws PDFDocumentException if the document could not be read.

-    * @throws PlaceholderExtractionException if STRICT matching mode was requested and no suitable placeholder could be found.

-    */

-   public static SignaturePlaceholderData extract(InputStream inputStream, String placeholderId, int matchMode)

-         throws PdfAsException {

-      SignaturePlaceholderContext.setSignaturePlaceholderData(null);

-      PDDocument doc = null;

-      try

-      {

-         try {

-            doc = PDDocument.load(inputStream);

-         } catch (IOException e) {

-            throw new PDFIOException("error.pdf.io.04", e);

-         }

-         SignaturePlaceholderExtractor extractor;

-         try

-         {

-            extractor = new SignaturePlaceholderExtractor(placeholderId, matchMode);

-         } catch (IOException e2) {

-            throw new PDFIOException("error.pdf.io.04", e2);

-         }

-         List pages = doc.getDocumentCatalog().getAllPages();

-         Iterator iter = pages.iterator();

-         int pageNr = 0;

-         while (iter.hasNext()) {

-            pageNr++;

-            PDPage page = (PDPage) iter.next();

-            try {

-               extractor.setCurrentPage(pageNr);

-               extractor.processStream( page, page.findResources(), page.getContents().getStream() );

-               SignaturePlaceholderData ret = matchPlaceholderPage(extractor.placeholders, placeholderId, matchMode);

-               if (ret != null){

-            	   SignaturePlaceholderContext.setSignaturePlaceholderData(ret);

-                  return ret;

-               }

-            } catch (IOException e1) {

-            	throw new PDFIOException("error.pdf.io.04", e1);

-            }

-

-         }

-         if (extractor.placeholders.size() > 0){

-        	SignaturePlaceholderData ret = matchPlaceholderDocument(extractor.placeholders, placeholderId, matchMode);

-            SignaturePlaceholderContext.setSignaturePlaceholderData(ret);

-            return ret;

-         }

-         // no placeholders found, apply strict mode if set

-         if (matchMode == PLACEHOLDER_MATCH_MODE_STRICT) {

-            throw new PlaceholderExtractionException("error.pdf.stamp.09");

-         }

-

-         return null;

-      } finally {

-         if (doc != null)

-            try {

-               doc.close();

-            } catch (IOException e) {

-               log.debug("Could not close document.", e);

-            }

-      }

-

-   }

-

-   private static SignaturePlaceholderData matchPlaceholderDocument(

-         List placeholders, String placeholderId, int matchMode) throws PlaceholderExtractionException {

-

-      if (matchMode == PLACEHOLDER_MATCH_MODE_STRICT)

-         throw new PlaceholderExtractionException("error.pdf.stamp.09");

-

-      if (placeholders.size() == 0)

-         return null;

-

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

-      {

-         SignaturePlaceholderData spd = (SignaturePlaceholderData)placeholders.get(i);

-         if (spd.getId() == null)

-            return spd;

-      }

-

-      if (matchMode == PLACEHOLDER_MATCH_MODE_LENIENT)

-         return (SignaturePlaceholderData)placeholders.get(0);

-

-      return null;

-   }

-

-   private static SignaturePlaceholderData matchPlaceholderPage(List placeholders,

-         String placeholderId, int matchMode) {

-      if (placeholders.size() == 0)

-         return null;

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

-      {

-         SignaturePlaceholderData data = (SignaturePlaceholderData)placeholders.get(i);

-         if (placeholderId != null && placeholderId.equals(data.getId()))

-            return data;

-         if (placeholderId == null && data.getId() == null)

-            return data;

-      }

-      return null;

-   }

-

-   private void setCurrentPage(int pageNr) {

-      this.currentPage = pageNr;

-   }

-

-   protected void processOperator( PDFOperator operator, List arguments ) throws IOException

-   {

-	   String operation = operator.getOperation();

-	  if( operation.equals( "Do" ) )

-       {

-		   COSName objectName = (COSName)arguments.get( 0 );

-           Map xobjects = getResources().getXObjects();

-           PDXObject xobject = (PDXObject)xobjects.get( objectName.getName() );

-           if( xobject instanceof PDXObjectImage )

-           {

-        	   try

-               {

-                   PDXObjectImage image = (PDXObjectImage)xobject;

-                   SignaturePlaceholderData data = checkImage(image);

-                   if (data != null)

-                   {

-                      PDPage page = getCurrentPage();

-                      Matrix ctm = getGraphicsState().getCurrentTransformationMatrix();

-                      double rotationInRadians = (page.findRotation() * Math.PI)/180;

-

-                      AffineTransform rotation = new AffineTransform();

-                      rotation.setToRotation( rotationInRadians );

-                      AffineTransform rotationInverse = rotation.createInverse();

-                      Matrix rotationInverseMatrix = new Matrix();

-                      rotationInverseMatrix.setFromAffineTransform( rotationInverse );

-                      Matrix rotationMatrix = new Matrix();

-                      rotationMatrix.setFromAffineTransform( rotation );

-

-                      Matrix unrotatedCTM = ctm.multiply( rotationInverseMatrix );

-

-                      float x = unrotatedCTM.getXPosition();

-                      float y = unrotatedCTM.getYPosition() + unrotatedCTM.getYScale();

-                      float w = unrotatedCTM.getXScale();

-

-                      String posString = "p:" + currentPage + ";x:" + x + ";y:" + y + ";w:" + w;

-                      try

-                      {

-                         data.setTablePos(new TablePos(posString));

-                         data.setPlaceholderName(objectName.getName());

-                         placeholders.add(data);

-                      } catch (PdfAsException e) {

-                         throw new WrappedIOException(e);

-                      }

-                   }

-               }

-               catch( NoninvertibleTransformException e )

-               {

-                   throw new WrappedIOException( e );

-               }

-           }

-       }

-       else

-       {

-    	   super.processOperator( operator, arguments );

-       }

-   }

-

-   /**

-    * Checks an image if it is a placeholder for a signature.

-    *

-    * @param image

-    * @return

-    * @throws IOException

-    */

-   private SignaturePlaceholderData checkImage(PDXObjectImage image) throws IOException {

-	  BufferedImage bimg = image.getRGBImage();

-      if (bimg == null) {

-         String type = image.getSuffix();

-         if (type != null) {

-            type = type.toUpperCase() + " images";

-         } else {

-            type = "Image type";

-         }

-         log.info("Unable to extract image for QRCode analysis. " + type + " not supported. Add additional JAI Image filters to your classpath. Refer to https://jai.dev.java.net. Skipping image.");

-         return null;

-      }

-      if(bimg.getHeight() < 10 || bimg.getWidth() < 10) {

-         log.debug("Image too small for QRCode. Skipping image.");

-         return null;

-      }

-

-      LuminanceSource source = new BufferedImageLuminanceSource(bimg);

-      BinaryBitmap bitmap = new BinaryBitmap(new HybridBinarizer(source));

-      Result result;

-      long before = System.currentTimeMillis();

-      try {

-    	 Hashtable hints = new Hashtable();

-         Vector formats = new Vector();

-         formats.add(BarcodeFormat.QR_CODE);

-         hints.put(DecodeHintType.POSSIBLE_FORMATS, formats);

-         result = new MultiFormatReader().decode(bitmap, hints);

-

-         String text = result.getText();

-         String profile = null;

-         String type = null;

-         String sigKey = null;

-         String id = null;

-         if (text != null) {

-            if (text.startsWith(QR_PLACEHOLDER_IDENTIFIER)) {

-               String[] data = text.split(";");

-               if (data.length > 1) {

-            	  for (int i = 1; i < data.length; i++) {

-                     String kvPair = data[i];

-                     String[] kv = kvPair.split("=");

-                     if (kv.length != 2) {

-                        log.debug("Invalid parameter in placeholder data: " + kvPair);

-                     } else {

-                        if (kv[0].equalsIgnoreCase(SignaturePlaceholderData.ID_KEY)) {

-                           id = kv[1];

-                        } else if (kv[0].equalsIgnoreCase(SignaturePlaceholderData.PROFILE_KEY)) {

-                           profile = kv[1];

-                        } else if (kv[0]

-                              .equalsIgnoreCase(SignaturePlaceholderData.SIG_KEY_KEY)) {

-                           sigKey = kv[1];

-                        } else if (kv[0]

-                              .equalsIgnoreCase(SignaturePlaceholderData.TYPE_KEY)) {

-                           type = kv[1];

-                        }

-                     }

-                  }

-               }

-               return new SignaturePlaceholderData(profile, type, sigKey, id);

-            } else {

-               log.warn("QR-Code found but does not start with \"" + QR_PLACEHOLDER_IDENTIFIER + "\". Ignoring QR placeholder.");

-            }

-         }

-      } catch (ReaderException re) {

-         if (log.isDebugEnabled()) {

-            log.debug("Could not decode - not a placeholder. needed: "

-                  + (System.currentTimeMillis() - before));

-         }

-         if (!(re instanceof NotFoundException)){

-            if (log.isInfoEnabled()) {

-               log.info("Failed to decode image", re);

-            }

-         }

-      } catch(ArrayIndexOutOfBoundsException e){

-         if (log.isInfoEnabled()) {

-            log.info("Failed to decode image. Probably a zxing bug", e);

-         }

-      }

-      return null;

-   }

-

-}

-

-

+/*******************************************************************************
+ * <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.lib.impl.placeholder;
+
+import java.awt.geom.AffineTransform;
+import java.awt.geom.NoninvertibleTransformException;
+import java.awt.image.BufferedImage;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Vector;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.pdfbox.cos.COSName;
+import org.apache.pdfbox.exceptions.WrappedIOException;
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.pdmodel.PDPage;
+import org.apache.pdfbox.pdmodel.graphics.xobject.PDXObject;
+import org.apache.pdfbox.pdmodel.graphics.xobject.PDXObjectImage;
+import org.apache.pdfbox.util.Matrix;
+import org.apache.pdfbox.util.PDFOperator;
+import org.apache.pdfbox.util.PDFStreamEngine;
+import org.apache.pdfbox.util.ResourceLoader;
+
+import at.gv.egiz.pdfas.common.exceptions.PDFIOException;
+import at.gv.egiz.pdfas.common.exceptions.PdfAsException;
+import at.gv.egiz.pdfas.common.exceptions.PlaceholderExtractionException;
+import at.knowcenter.wag.egov.egiz.pdf.TablePos;
+
+import com.google.zxing.BarcodeFormat;
+import com.google.zxing.BinaryBitmap;
+import com.google.zxing.DecodeHintType;
+import com.google.zxing.LuminanceSource;
+import com.google.zxing.MultiFormatReader;
+import com.google.zxing.NotFoundException;
+import com.google.zxing.ReaderException;
+import com.google.zxing.Result;
+import com.google.zxing.client.j2se.BufferedImageLuminanceSource;
+import com.google.zxing.common.HybridBinarizer;
+
+//////
+
+
+
+/**
+ * Extract all relevant information from a placeholder image.
+ *
+ * @author exthex
+ *
+ */
+public class SignaturePlaceholderExtractor extends PDFStreamEngine {
+   /**
+    * The log.
+    */
+   private static Log log = LogFactory.getLog(SignaturePlaceholderExtractor.class);
+
+   public static final String QR_PLACEHOLDER_IDENTIFIER = "PDF-AS-POS";
+   public static final int PLACEHOLDER_MATCH_MODE_STRICT = 0;
+   public static final int PLACEHOLDER_MATCH_MODE_MODERATE = 1;
+   public static final int PLACEHOLDER_MATCH_MODE_LENIENT = 2;
+   
+   private List placeholders = new Vector();
+   private int currentPage = 0;
+
+   private SignaturePlaceholderExtractor(String placeholderId, int placeholderMatchMode) throws IOException {
+      super(ResourceLoader.loadProperties("placeholder/pdfbox-reader.properties",
+            true));
+   }
+
+   /**
+    * Search the document for placeholder images and possibly included
+    * additional info.<br/>
+    * Searches only for the first placeholder page after page from top.
+    *
+    * @param inputStream
+    * @return all available info from the first found placeholder.
+    * @throws PDFDocumentException if the document could not be read.
+    * @throws PlaceholderExtractionException if STRICT matching mode was requested and no suitable placeholder could be found.
+    */
+   public static SignaturePlaceholderData extract(InputStream inputStream, String placeholderId, int matchMode)
+         throws PdfAsException {
+      SignaturePlaceholderContext.setSignaturePlaceholderData(null);
+      PDDocument doc = null;
+      try
+      {
+         try {
+            doc = PDDocument.load(inputStream);
+         } catch (IOException e) {
+            throw new PDFIOException("error.pdf.io.04", e);
+         }
+         SignaturePlaceholderExtractor extractor;
+         try
+         {
+            extractor = new SignaturePlaceholderExtractor(placeholderId, matchMode);
+         } catch (IOException e2) {
+            throw new PDFIOException("error.pdf.io.04", e2);
+         }
+         List pages = doc.getDocumentCatalog().getAllPages();
+         Iterator iter = pages.iterator();
+         int pageNr = 0;
+         while (iter.hasNext()) {
+            pageNr++;
+            PDPage page = (PDPage) iter.next();
+            try {
+               extractor.setCurrentPage(pageNr);
+               extractor.processStream( page, page.findResources(), page.getContents().getStream() );
+               SignaturePlaceholderData ret = matchPlaceholderPage(extractor.placeholders, placeholderId, matchMode);
+               if (ret != null){
+            	   SignaturePlaceholderContext.setSignaturePlaceholderData(ret);
+                  return ret;
+               }
+            } catch (IOException e1) {
+            	throw new PDFIOException("error.pdf.io.04", e1);
+            }
+
+         }
+         if (extractor.placeholders.size() > 0){
+        	SignaturePlaceholderData ret = matchPlaceholderDocument(extractor.placeholders, placeholderId, matchMode);
+            SignaturePlaceholderContext.setSignaturePlaceholderData(ret);
+            return ret;
+         }
+         // no placeholders found, apply strict mode if set
+         if (matchMode == PLACEHOLDER_MATCH_MODE_STRICT) {
+            throw new PlaceholderExtractionException("error.pdf.stamp.09");
+         }
+
+         return null;
+      } finally {
+         if (doc != null)
+            try {
+               doc.close();
+            } catch (IOException e) {
+               log.debug("Could not close document.", e);
+            }
+      }
+
+   }
+
+   private static SignaturePlaceholderData matchPlaceholderDocument(
+         List placeholders, String placeholderId, int matchMode) throws PlaceholderExtractionException {
+
+      if (matchMode == PLACEHOLDER_MATCH_MODE_STRICT)
+         throw new PlaceholderExtractionException("error.pdf.stamp.09");
+
+      if (placeholders.size() == 0)
+         return null;
+
+      for (int i = 0; i < placeholders.size(); i++)
+      {
+         SignaturePlaceholderData spd = (SignaturePlaceholderData)placeholders.get(i);
+         if (spd.getId() == null)
+            return spd;
+      }
+
+      if (matchMode == PLACEHOLDER_MATCH_MODE_LENIENT)
+         return (SignaturePlaceholderData)placeholders.get(0);
+
+      return null;
+   }
+
+   private static SignaturePlaceholderData matchPlaceholderPage(List placeholders,
+         String placeholderId, int matchMode) {
+      if (placeholders.size() == 0)
+         return null;
+      for (int i = 0; i < placeholders.size(); i++)
+      {
+         SignaturePlaceholderData data = (SignaturePlaceholderData)placeholders.get(i);
+         if (placeholderId != null && placeholderId.equals(data.getId()))
+            return data;
+         if (placeholderId == null && data.getId() == null)
+            return data;
+      }
+      return null;
+   }
+
+   private void setCurrentPage(int pageNr) {
+      this.currentPage = pageNr;
+   }
+
+   protected void processOperator( PDFOperator operator, List arguments ) throws IOException
+   {
+	   String operation = operator.getOperation();
+	  if( operation.equals( "Do" ) )
+       {
+		   COSName objectName = (COSName)arguments.get( 0 );
+           Map xobjects = getResources().getXObjects();
+           PDXObject xobject = (PDXObject)xobjects.get( objectName.getName() );
+           if( xobject instanceof PDXObjectImage )
+           {
+        	   try
+               {
+                   PDXObjectImage image = (PDXObjectImage)xobject;
+                   SignaturePlaceholderData data = checkImage(image);
+                   if (data != null)
+                   {
+                      PDPage page = getCurrentPage();
+                      Matrix ctm = getGraphicsState().getCurrentTransformationMatrix();
+                      double rotationInRadians = (page.findRotation() * Math.PI)/180;
+
+                      AffineTransform rotation = new AffineTransform();
+                      rotation.setToRotation( rotationInRadians );
+                      AffineTransform rotationInverse = rotation.createInverse();
+                      Matrix rotationInverseMatrix = new Matrix();
+                      rotationInverseMatrix.setFromAffineTransform( rotationInverse );
+                      Matrix rotationMatrix = new Matrix();
+                      rotationMatrix.setFromAffineTransform( rotation );
+
+                      Matrix unrotatedCTM = ctm.multiply( rotationInverseMatrix );
+
+                      float x = unrotatedCTM.getXPosition();
+                      float y = unrotatedCTM.getYPosition() + unrotatedCTM.getYScale();
+                      float w = unrotatedCTM.getXScale();
+
+                      String posString = "p:" + currentPage + ";x:" + x + ";y:" + y + ";w:" + w;
+                      try
+                      {
+                         data.setTablePos(new TablePos(posString));
+                         data.setPlaceholderName(objectName.getName());
+                         placeholders.add(data);
+                      } catch (PdfAsException e) {
+                         throw new WrappedIOException(e);
+                      }
+                   }
+               }
+               catch( NoninvertibleTransformException e )
+               {
+                   throw new WrappedIOException( e );
+               }
+           }
+       }
+       else
+       {
+    	   super.processOperator( operator, arguments );
+       }
+   }
+
+   /**
+    * Checks an image if it is a placeholder for a signature.
+    *
+    * @param image
+    * @return
+    * @throws IOException
+    */
+   private SignaturePlaceholderData checkImage(PDXObjectImage image) throws IOException {
+	  BufferedImage bimg = image.getRGBImage();
+      if (bimg == null) {
+         String type = image.getSuffix();
+         if (type != null) {
+            type = type.toUpperCase() + " images";
+         } else {
+            type = "Image type";
+         }
+         log.info("Unable to extract image for QRCode analysis. " + type + " not supported. Add additional JAI Image filters to your classpath. Refer to https://jai.dev.java.net. Skipping image.");
+         return null;
+      }
+      if(bimg.getHeight() < 10 || bimg.getWidth() < 10) {
+         log.debug("Image too small for QRCode. Skipping image.");
+         return null;
+      }
+
+      LuminanceSource source = new BufferedImageLuminanceSource(bimg);
+      BinaryBitmap bitmap = new BinaryBitmap(new HybridBinarizer(source));
+      Result result;
+      long before = System.currentTimeMillis();
+      try {
+    	 Hashtable hints = new Hashtable();
+         Vector formats = new Vector();
+         formats.add(BarcodeFormat.QR_CODE);
+         hints.put(DecodeHintType.POSSIBLE_FORMATS, formats);
+         result = new MultiFormatReader().decode(bitmap, hints);
+
+         String text = result.getText();
+         String profile = null;
+         String type = null;
+         String sigKey = null;
+         String id = null;
+         if (text != null) {
+            if (text.startsWith(QR_PLACEHOLDER_IDENTIFIER)) {
+               String[] data = text.split(";");
+               if (data.length > 1) {
+            	  for (int i = 1; i < data.length; i++) {
+                     String kvPair = data[i];
+                     String[] kv = kvPair.split("=");
+                     if (kv.length != 2) {
+                        log.debug("Invalid parameter in placeholder data: " + kvPair);
+                     } else {
+                        if (kv[0].equalsIgnoreCase(SignaturePlaceholderData.ID_KEY)) {
+                           id = kv[1];
+                        } else if (kv[0].equalsIgnoreCase(SignaturePlaceholderData.PROFILE_KEY)) {
+                           profile = kv[1];
+                        } else if (kv[0]
+                              .equalsIgnoreCase(SignaturePlaceholderData.SIG_KEY_KEY)) {
+                           sigKey = kv[1];
+                        } else if (kv[0]
+                              .equalsIgnoreCase(SignaturePlaceholderData.TYPE_KEY)) {
+                           type = kv[1];
+                        }
+                     }
+                  }
+               }
+               return new SignaturePlaceholderData(profile, type, sigKey, id);
+            } else {
+               log.warn("QR-Code found but does not start with \"" + QR_PLACEHOLDER_IDENTIFIER + "\". Ignoring QR placeholder.");
+            }
+         }
+      } catch (ReaderException re) {
+         if (log.isDebugEnabled()) {
+            log.debug("Could not decode - not a placeholder. needed: "
+                  + (System.currentTimeMillis() - before));
+         }
+         if (!(re instanceof NotFoundException)){
+            if (log.isInfoEnabled()) {
+               log.info("Failed to decode image", re);
+            }
+         }
+      } catch(ArrayIndexOutOfBoundsException e){
+         if (log.isInfoEnabled()) {
+            log.info("Failed to decode image. Probably a zxing bug", e);
+         }
+      }
+      return null;
+   }
+
+}
+
+
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/positioning/Positioning.java b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/positioning/Positioning.java
index e0be68ee..c8c2f99f 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/positioning/Positioning.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/positioning/Positioning.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.
+ ******************************************************************************/
 package at.gv.egiz.pdfas.lib.impl.positioning;
 
 import at.gv.egiz.pdfas.common.exceptions.PdfAsException;
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/signing/IPdfSigner.java b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/signing/IPdfSigner.java
index 38c6530a..98ade583 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/signing/IPdfSigner.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/signing/IPdfSigner.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.
+ ******************************************************************************/
 package at.gv.egiz.pdfas.lib.impl.signing;
 
 import at.gv.egiz.pdfas.common.exceptions.PdfAsException;
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/signing/PdfSignerFactory.java b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/signing/PdfSignerFactory.java
index 469ea174..947574ba 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/signing/PdfSignerFactory.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/signing/PdfSignerFactory.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.
+ ******************************************************************************/
 package at.gv.egiz.pdfas.lib.impl.signing;
 
 import at.gv.egiz.pdfas.lib.impl.signing.pdfbox.PADESPDFBOXSigner;
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/signing/pdfbox/PADESPDFBOXSigner.java b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/signing/pdfbox/PADESPDFBOXSigner.java
index 40b274a8..d93ff5e1 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/signing/pdfbox/PADESPDFBOXSigner.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/signing/pdfbox/PADESPDFBOXSigner.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.
+ ******************************************************************************/
 package at.gv.egiz.pdfas.lib.impl.signing.pdfbox;
 
 import java.io.ByteArrayInputStream;
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/signing/pdfbox/PdfboxSignerWrapper.java b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/signing/pdfbox/PdfboxSignerWrapper.java
index 8000d8a0..4fe2ba6c 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/signing/pdfbox/PdfboxSignerWrapper.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/signing/pdfbox/PdfboxSignerWrapper.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.
+ ******************************************************************************/
 package at.gv.egiz.pdfas.lib.impl.signing.pdfbox;
 
 import java.io.IOException;
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/signing/sig_interface/PDFASSignatureInterface.java b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/signing/sig_interface/PDFASSignatureInterface.java
index 43f0014d..c4ace1d7 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/signing/sig_interface/PDFASSignatureInterface.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/signing/sig_interface/PDFASSignatureInterface.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.
+ ******************************************************************************/
 package at.gv.egiz.pdfas.lib.impl.signing.sig_interface;
 
 import java.util.Calendar;
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/signing/sig_interface/SignatureDataExtractor.java b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/signing/sig_interface/SignatureDataExtractor.java
index 4b7afa6c..32cfb410 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/signing/sig_interface/SignatureDataExtractor.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/signing/sig_interface/SignatureDataExtractor.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.
+ ******************************************************************************/
 package at.gv.egiz.pdfas.lib.impl.signing.sig_interface;
 
 import iaik.x509.X509Certificate;
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/signing/sig_interface/SignatureDataInjector.java b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/signing/sig_interface/SignatureDataInjector.java
index cc120717..3308f784 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/signing/sig_interface/SignatureDataInjector.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/signing/sig_interface/SignatureDataInjector.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.
+ ******************************************************************************/
 package at.gv.egiz.pdfas.lib.impl.signing.sig_interface;
 
 import iaik.x509.X509Certificate;
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/stamping/CertificateResolver.java b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/stamping/CertificateResolver.java
index f5a89741..0aacb1b0 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/stamping/CertificateResolver.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/stamping/CertificateResolver.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.
+ ******************************************************************************/
 package at.gv.egiz.pdfas.lib.impl.stamping;
 
 import iaik.x509.X509Certificate;
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/stamping/IPDFStamper.java b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/stamping/IPDFStamper.java
index 5c84acfe..6de356ed 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/stamping/IPDFStamper.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/stamping/IPDFStamper.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.
+ ******************************************************************************/
 package at.gv.egiz.pdfas.lib.impl.stamping;
 
 import at.gv.egiz.pdfas.common.exceptions.PdfAsException;
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/stamping/IPDFVisualObject.java b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/stamping/IPDFVisualObject.java
index fd7cac5c..f4e1cdf4 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/stamping/IPDFVisualObject.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/stamping/IPDFVisualObject.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.
+ ******************************************************************************/
 package at.gv.egiz.pdfas.lib.impl.stamping;
 
 public interface IPDFVisualObject {
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/stamping/IResolver.java b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/stamping/IResolver.java
index 921d9eca..4ba365fa 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/stamping/IResolver.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/stamping/IResolver.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.
+ ******************************************************************************/
 package at.gv.egiz.pdfas.lib.impl.stamping;
 
 import at.gv.egiz.pdfas.common.settings.SignatureProfileSettings;
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/stamping/StamperFactory.java b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/stamping/StamperFactory.java
index e215e07d..05bccc89 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/stamping/StamperFactory.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/stamping/StamperFactory.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.
+ ******************************************************************************/
 package at.gv.egiz.pdfas.lib.impl.stamping;
 
 import at.gv.egiz.pdfas.common.exceptions.PdfAsException;
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/stamping/TableFactory.java b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/stamping/TableFactory.java
index 9d574af7..cbda8e95 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/stamping/TableFactory.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/stamping/TableFactory.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.
+ ******************************************************************************/
 package at.gv.egiz.pdfas.lib.impl.stamping;
 
 import at.gv.egiz.pdfas.common.settings.IProfileConstants;
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/stamping/ValueResolver.java b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/stamping/ValueResolver.java
index fa90afa3..dc24f40f 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/stamping/ValueResolver.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/stamping/ValueResolver.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.
+ ******************************************************************************/
 package at.gv.egiz.pdfas.lib.impl.stamping;
 
 import java.text.SimpleDateFormat;
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/status/OperationStatus.java b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/status/OperationStatus.java
index 2f7b67e7..0796078f 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/status/OperationStatus.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/status/OperationStatus.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.
+ ******************************************************************************/
 package at.gv.egiz.pdfas.lib.impl.status;
 
 import java.io.Serializable;
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/status/PDFObject.java b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/status/PDFObject.java
index df496f3f..514d0fa3 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/status/PDFObject.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/status/PDFObject.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.
+ ******************************************************************************/
 package at.gv.egiz.pdfas.lib.impl.status;
 
 public class PDFObject {
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/status/RequestedSignature.java b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/status/RequestedSignature.java
index 0d551c8b..63f6a0d7 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/status/RequestedSignature.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/status/RequestedSignature.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.
+ ******************************************************************************/
 package at.gv.egiz.pdfas.lib.impl.status;
 
 import iaik.x509.X509Certificate;
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/verify/FilterEntry.java b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/verify/FilterEntry.java
index 59b20c97..83ef17e6 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/verify/FilterEntry.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/verify/FilterEntry.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.
+ ******************************************************************************/
 package at.gv.egiz.pdfas.lib.impl.verify;
 
 import org.apache.pdfbox.cos.COSName;
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/verify/IVerifyFilter.java b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/verify/IVerifyFilter.java
index a13e384f..6f6a58b0 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/verify/IVerifyFilter.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/verify/IVerifyFilter.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.
+ ******************************************************************************/
 package at.gv.egiz.pdfas.lib.impl.verify;
 
 import java.util.Date;
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/verify/SignatureCheckImpl.java b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/verify/SignatureCheckImpl.java
index 6daf4735..2ce74e6a 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/verify/SignatureCheckImpl.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/verify/SignatureCheckImpl.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.
+ ******************************************************************************/
 package at.gv.egiz.pdfas.lib.impl.verify;
 
 import at.gv.egiz.pdfas.lib.api.verify.SignatureCheck;
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/verify/VerifierDispatcher.java b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/verify/VerifierDispatcher.java
index e0b57262..509494b2 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/verify/VerifierDispatcher.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/verify/VerifierDispatcher.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.
+ ******************************************************************************/
 package at.gv.egiz.pdfas.lib.impl.verify;
 
 import java.util.HashMap;
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/verify/VerifyResultImpl.java b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/verify/VerifyResultImpl.java
index 5a67d807..5eb40662 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/verify/VerifyResultImpl.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/verify/VerifyResultImpl.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.
+ ******************************************************************************/
 package at.gv.egiz.pdfas.lib.impl.verify;
 
 import iaik.x509.X509Certificate;
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/package-info.java b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/package-info.java
index e6ebd1d8..a1bd53c7 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/package-info.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/package-info.java
@@ -1,4 +1,27 @@
+/*******************************************************************************
+ * <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.
+ ******************************************************************************/
 /**
  * PDF-AS 4.0 Main package name
  */
-package at.gv.egiz.pdfas.lib;
\ No newline at end of file
+package at.gv.egiz.pdfas.lib;
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/util/CertificateUtils.java b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/util/CertificateUtils.java
index 2f4fbe10..c9cc4cf6 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/util/CertificateUtils.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/util/CertificateUtils.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.
+ ******************************************************************************/
 package at.gv.egiz.pdfas.lib.util;
 
 import iaik.asn1.structures.AlgorithmID;
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/AllSignatoriesType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/AllSignatoriesType.java
index 6951073c..964ebe9e 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/AllSignatoriesType.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/AllSignatoriesType.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.
+ ******************************************************************************/
 //
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/AnyChildrenType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/AnyChildrenType.java
index cebf21ae..20f12838 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/AnyChildrenType.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/AnyChildrenType.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.
+ ******************************************************************************/
 //
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/AnyMixedChildrenType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/AnyMixedChildrenType.java
index 03afc871..b0684e59 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/AnyMixedChildrenType.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/AnyMixedChildrenType.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.
+ ******************************************************************************/
 //
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/Base64ContentType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/Base64ContentType.java
index 7bbb4448..374fe703 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/Base64ContentType.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/Base64ContentType.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.
+ ******************************************************************************/
 //
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/Base64OptRefContentType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/Base64OptRefContentType.java
index 44094a72..6a1bc6a4 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/Base64OptRefContentType.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/Base64OptRefContentType.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.
+ ******************************************************************************/
 //
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/Base64XMLContentType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/Base64XMLContentType.java
index dd0055a6..2463ce97 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/Base64XMLContentType.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/Base64XMLContentType.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.
+ ******************************************************************************/
 //
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/BindingType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/BindingType.java
index 55baaa94..6ca1d301 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/BindingType.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/BindingType.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.
+ ******************************************************************************/
 //
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/CMSDataObjectOptionalMetaType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/CMSDataObjectOptionalMetaType.java
index 36ae9398..4e8c2527 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/CMSDataObjectOptionalMetaType.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/CMSDataObjectOptionalMetaType.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.
+ ******************************************************************************/
 //
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/CMSDataObjectRequiredMetaType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/CMSDataObjectRequiredMetaType.java
index 87440ef3..46cf6f11 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/CMSDataObjectRequiredMetaType.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/CMSDataObjectRequiredMetaType.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.
+ ******************************************************************************/
 //
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/CreateCMSSignatureRequestType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/CreateCMSSignatureRequestType.java
index 8d5599e6..5209ffd8 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/CreateCMSSignatureRequestType.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/CreateCMSSignatureRequestType.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.
+ ******************************************************************************/
 //
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/CreateCMSSignatureResponseType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/CreateCMSSignatureResponseType.java
index d5a68de8..a6828c33 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/CreateCMSSignatureResponseType.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/CreateCMSSignatureResponseType.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.
+ ******************************************************************************/
 //
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/ErrorResponseType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/ErrorResponseType.java
index 2a30b430..4d57a06a 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/ErrorResponseType.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/ErrorResponseType.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.
+ ******************************************************************************/
 //
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/ExcludedByteRangeType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/ExcludedByteRangeType.java
index bc1bc303..a3da1bac 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/ExcludedByteRangeType.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/ExcludedByteRangeType.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.
+ ******************************************************************************/
 //
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/GetPropertiesRequest.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/GetPropertiesRequest.java
index 448a45d5..0ce919b5 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/GetPropertiesRequest.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/GetPropertiesRequest.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.
+ ******************************************************************************/
 //
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/GetPropertiesRequestType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/GetPropertiesRequestType.java
index 5a455ab0..7427a998 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/GetPropertiesRequestType.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/GetPropertiesRequestType.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.
+ ******************************************************************************/
 //
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/GetPropertiesResponseType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/GetPropertiesResponseType.java
index 4fa8a9c4..73e92432 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/GetPropertiesResponseType.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/GetPropertiesResponseType.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.
+ ******************************************************************************/
 //
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/GetStatusRequestType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/GetStatusRequestType.java
index 78a6d941..e60fd77a 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/GetStatusRequestType.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/GetStatusRequestType.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.
+ ******************************************************************************/
 //
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/GetStatusResponseType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/GetStatusResponseType.java
index 5c4fa9e4..4fb33163 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/GetStatusResponseType.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/GetStatusResponseType.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.
+ ******************************************************************************/
 //
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/InfoboxAssocArrayPairType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/InfoboxAssocArrayPairType.java
index 4745f0df..d53e0cd7 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/InfoboxAssocArrayPairType.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/InfoboxAssocArrayPairType.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.
+ ******************************************************************************/
 //
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/InfoboxReadDataAssocArrayType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/InfoboxReadDataAssocArrayType.java
index 489c9656..ae71c629 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/InfoboxReadDataAssocArrayType.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/InfoboxReadDataAssocArrayType.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.
+ ******************************************************************************/
 //
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/InfoboxReadParamsAssocArrayType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/InfoboxReadParamsAssocArrayType.java
index fd238971..24b01f4d 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/InfoboxReadParamsAssocArrayType.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/InfoboxReadParamsAssocArrayType.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.
+ ******************************************************************************/
 //
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/InfoboxReadParamsBinaryFileType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/InfoboxReadParamsBinaryFileType.java
index 18e25614..d59404f6 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/InfoboxReadParamsBinaryFileType.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/InfoboxReadParamsBinaryFileType.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.
+ ******************************************************************************/
 //
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/InfoboxReadRequestType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/InfoboxReadRequestType.java
index b39dcb2f..81a4744f 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/InfoboxReadRequestType.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/InfoboxReadRequestType.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.
+ ******************************************************************************/
 //
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/InfoboxReadResponseType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/InfoboxReadResponseType.java
index fe8a6db4..cca0d73f 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/InfoboxReadResponseType.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/InfoboxReadResponseType.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.
+ ******************************************************************************/
 //
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/MetaInfoType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/MetaInfoType.java
index 72080288..f0b69ef7 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/MetaInfoType.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/MetaInfoType.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.
+ ******************************************************************************/
 //
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/NullOperationRequestType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/NullOperationRequestType.java
index 69b2f060..029a6908 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/NullOperationRequestType.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/NullOperationRequestType.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.
+ ******************************************************************************/
 //
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/NullOperationResponseType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/NullOperationResponseType.java
index c7d3132e..70017337 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/NullOperationResponseType.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/NullOperationResponseType.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.
+ ******************************************************************************/
 //
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/ObjectFactory.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/ObjectFactory.java
index 3e9ca0d3..a7b826d5 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/ObjectFactory.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/ObjectFactory.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.
+ ******************************************************************************/
 //
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/QualifiedBoxIdentifierType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/QualifiedBoxIdentifierType.java
index 97908a88..2f7e6ebc 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/QualifiedBoxIdentifierType.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/QualifiedBoxIdentifierType.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.
+ ******************************************************************************/
 //
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/TokenStatusType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/TokenStatusType.java
index a9f5e513..80a3fc91 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/TokenStatusType.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/TokenStatusType.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.
+ ******************************************************************************/
 //
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/VerifyCMSSignatureRequestType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/VerifyCMSSignatureRequestType.java
index 8ed1bc03..5138240d 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/VerifyCMSSignatureRequestType.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/VerifyCMSSignatureRequestType.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.
+ ******************************************************************************/
 //
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/XMLContentType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/XMLContentType.java
index 6d1342fc..22ca67e9 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/XMLContentType.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/XMLContentType.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.
+ ******************************************************************************/
 //
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/package-info.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/package-info.java
index 6e4f6072..6266c1ed 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/package-info.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/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.
+ ******************************************************************************/
 //
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/util/BKUSLConnector.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/util/BKUSLConnector.java
index 080a16a7..95be4512 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/util/BKUSLConnector.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/util/BKUSLConnector.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.
+ ******************************************************************************/
 package at.gv.egiz.sl.util;
 
 import java.io.BufferedReader;
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/util/BaseSLConnector.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/util/BaseSLConnector.java
index 8772239c..0001d855 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/util/BaseSLConnector.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/util/BaseSLConnector.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.
+ ******************************************************************************/
 package at.gv.egiz.sl.util;
 
 import java.math.BigInteger;
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/util/ISLConnector.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/util/ISLConnector.java
index 3c0c1b84..779787eb 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/util/ISLConnector.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/util/ISLConnector.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.
+ ******************************************************************************/
 package at.gv.egiz.sl.util;
 
 import at.gv.egiz.pdfas.common.exceptions.PDFIOException;
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/util/ISignatureConnector.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/util/ISignatureConnector.java
index 8830db5c..e39398a6 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/util/ISignatureConnector.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/util/ISignatureConnector.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.
+ ******************************************************************************/
 package at.gv.egiz.sl.util;
 
 import iaik.x509.X509Certificate;
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/util/ISignatureConnectorSLWrapper.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/util/ISignatureConnectorSLWrapper.java
index 75b10c4c..edd7555e 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/util/ISignatureConnectorSLWrapper.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/util/ISignatureConnectorSLWrapper.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.
+ ******************************************************************************/
 package at.gv.egiz.sl.util;
 
 import iaik.cms.CMSException;
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/util/MOAConnector.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/util/MOAConnector.java
index bd8f5d8d..71e7181a 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/util/MOAConnector.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/util/MOAConnector.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.
+ ******************************************************************************/
 package at.gv.egiz.sl.util;
 
 import iaik.x509.X509Certificate;
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/util/SLMarschaller.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/util/SLMarschaller.java
index 8f1b3cc5..b62dbfc0 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/util/SLMarschaller.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/util/SLMarschaller.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.
+ ******************************************************************************/
 package at.gv.egiz.sl.util;
 
 import java.io.InputStream;
diff --git a/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/PDFPage.java b/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/PDFPage.java
index b5928406..cdfedcc9 100644
--- a/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/PDFPage.java
+++ b/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/PDFPage.java
@@ -1,502 +1,525 @@
-/**

- * <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.

- *

- * $Id: PDFPage.java,v 1.5 2006/10/31 08:09:33 wprinz Exp $

- */

-package at.knowcenter.wag.egov.egiz.pdf;

-

-import at.knowcenter.wag.egov.egiz.pdf.operator.path.construction.*;

-import at.knowcenter.wag.egov.egiz.pdf.operator.path.painting.*;

-

-import org.apache.commons.lang3.math.NumberUtils;

-import org.apache.pdfbox.cos.COSName;

-import org.apache.pdfbox.cos.COSStream;

-import org.apache.pdfbox.pdmodel.PDPage;

-import org.apache.pdfbox.pdmodel.PDResources;

-import org.apache.pdfbox.pdmodel.common.PDRectangle;

-import org.apache.pdfbox.pdmodel.common.PDStream;

-import org.apache.pdfbox.pdmodel.graphics.xobject.PDXObject;

-import org.apache.pdfbox.pdmodel.graphics.xobject.PDXObjectForm;

-import org.apache.pdfbox.util.Matrix;

-import org.apache.pdfbox.util.PDFOperator;

-import org.apache.pdfbox.util.PDFTextStripper;

-import org.apache.pdfbox.util.TextPosition;

-import org.apache.pdfbox.util.operator.OperatorProcessor;

-import org.slf4j.Logger;

-import org.slf4j.LoggerFactory;

-

-import java.awt.*;

-import java.awt.geom.GeneralPath;

-import java.io.IOException;

-import java.io.Writer;

-import java.util.List;

-import java.util.Map;

-

-/**

- * PDFPage is an inner class that is used to calculate the page length of a PDF

- * Document page. It extends the PDFTextStripper class and implement one

- * interested method: {@link at.knowcenter.wag.egov.egiz.pdf.PDFPage#showCharacter(TextPosition)}<br>

- * This method is called when processing the FileStream. By calling the method

- * {@link org.apache.pdfbox.util.PDFStreamEngine#processStream(org.apache.pdfbox.pdmodel.PDPage, org.apache.pdfbox.pdmodel.PDResources, org.pdfbox.cos.COSStream)}

- * the implemented method showCharacter is called.

- * 

- * @author wlackner

- * @see PDFTextStripper

- */

-public class PDFPage extends PDFTextStripper {

-	/**

-	 * The logger definition.

-	 */

-    private static final Logger logger = LoggerFactory.getLogger(PDFPage.class);

-

-	/**

-	 * The maximum (lowest) y position of a character.

-	 */

-	protected float max_character_ypos = Float.NEGATIVE_INFINITY;

-

-	/**

-	 * The maximum (lowest y position of an image.

-	 */

-	protected float max_image_ypos = Float.NEGATIVE_INFINITY;

-

-	/**

-	 * The effective page height.

-	 */

-	protected float effectivePageHeight;

-

-	/**

-	 * The path currently being constructed.

-	 */

-	private GeneralPath currentPath = new GeneralPath();

-

-	/**

-	 * The lowest position of a drawn path (originating from top).

-	 */

-	private float maxPathRelatedYPositionFromTop = Float.NEGATIVE_INFINITY;

-

-	/**

-	 * Constructor.

-	 * 

-	 * @param effectivePageHeight

-	 *            The height of the page to be evaluated. PDF elements outside

-	 *            this height will not be considered.

-	 * 

-	 * @throws java.io.IOException

-	 */

-	public PDFPage(float effectivePageHeight, boolean legacy32) throws IOException {

-		super();

-

-		this.effectivePageHeight = effectivePageHeight;

-

-		OperatorProcessor newInvoke = new MyInvoke(this);

-		newInvoke.setContext(this);

-        this.registerOperatorProcessor("Do", newInvoke);

-        

-		if (!legacy32) {

-			registerCustomPathOperators();

-		}

-	}

-

-	/**

-	 * Registers operators responsible for path construction and painting in

-	 * order to fix auto positioning on pages with path elements.

-	 * 

-	 * @author Datentechnik Innovation GmbH

-	 */

-	@SuppressWarnings("unchecked")

-	private void registerCustomPathOperators() {

-

-		// *** path construction

-

-        this.registerOperatorProcessor("m", new MoveTo(this));

-        this.registerOperatorProcessor("l", new LineTo(this));

-        this.registerOperatorProcessor("c", new CurveTo(this));

-        this.registerOperatorProcessor("y", new CurveToReplicateFinalPoint(this));

-        this.registerOperatorProcessor("v", new CurveToReplicateInitialPoint(this));

-        this.registerOperatorProcessor("h", new ClosePath(this));

-

-		// *** path painting

-

-		// "S": stroke path

-        this.registerOperatorProcessor("S", new StrokePath(this));

-        this.registerOperatorProcessor("s", new CloseAndStrokePath(this));

-        this.registerOperatorProcessor("f", new FillPathNonZeroWindingNumberRule(this));

-        this.registerOperatorProcessor("F", new FillPathNonZeroWindingNumberRule(this));

-        this.registerOperatorProcessor("f*", new FillPathEvenOddRule(this));

-        this.registerOperatorProcessor("b", new CloseFillNonZeroAndStrokePath(this));

-        this.registerOperatorProcessor("B", new FillNonZeroAndStrokePath(this));

-        this.registerOperatorProcessor("b*", new CloseFillEvenOddAndStrokePath(this));

-        this.registerOperatorProcessor("B*", new FillEvenOddAndStrokePath(this));

-        this.registerOperatorProcessor("n", new EndPath(this));

-

-		// Note: The graphic context

-		// (org.pdfbox.pdmodel.graphics.PDGraphicsState) of the underlying

-		// pdfbox library does

-		// not yet support clipping. This prevents feasible usage of clipping

-		// operators (W, W*).

-		// operators.put("W", new ...(this));

-		// operators.put("W*", new ...(this));

-

-	}

-

-	/**

-	 * Returns the path currently being constructed.

-	 * 

-	 * @return The path currently being constructed.

-	 */

-	public GeneralPath getCurrentPath() {

-		return currentPath;

-	}

-

-	/**

-	 * Sets the current path.

-	 * 

-	 * @param currentPath

-	 *            The new current path.

-	 */

-	public void setCurrentPath(GeneralPath currentPath) {

-		this.currentPath = currentPath;

-	}

-

-	/**

-	 * Registers a rectangle that bounds the path currently being drawn.

-	 * 

-	 * @param bounds

-	 *            A rectangle depicting the bounds (coordinates originating from

-	 *            bottom left).

-	 * @author Datentechnik Innovation GmbH

-	 */

-	public void registerPathBounds(Rectangle bounds) {

-		if (!bounds.isEmpty()) {

-			logger.debug("Registering path bounds: " + bounds);

-

-			// vertical start of rectangle (counting from top of page)

-			float upperBoundYPositionFromTop;

-

-			// vertical end of rectangle (counting from top of page)

-			// this depicts the current end of path-related page content

-			float lowerBoundYPositionFromTop;

-

-			PDRectangle boundaryBox = this.getCurrentPage().findMediaBox();

-			float pageHeight;

-

-			switch (this.getCurrentPage().findRotation()) {

-			case 90: // CW

-				pageHeight = boundaryBox.getWidth();

-				upperBoundYPositionFromTop = (float) bounds.getMinX();

-				lowerBoundYPositionFromTop = (float) bounds.getMaxX();

-				break;

-			case 180:

-				pageHeight = boundaryBox.getHeight();

-				upperBoundYPositionFromTop = (float) bounds.getMinY();

-				lowerBoundYPositionFromTop = (float) bounds.getMaxY();

-				break;

-			case 270: // CCW

-				pageHeight = boundaryBox.getWidth();

-				upperBoundYPositionFromTop = pageHeight

-						- (float) bounds.getMaxX();

-				lowerBoundYPositionFromTop = pageHeight

-						- (float) bounds.getMinX();

-				break;

-			default:

-				pageHeight = boundaryBox.getHeight();

-				upperBoundYPositionFromTop = pageHeight

-						- (float) bounds.getMaxY();

-				lowerBoundYPositionFromTop = pageHeight

-						- (float) bounds.getMinY();

-				break;

-			}

-

-			// new maximum ?

-			if (lowerBoundYPositionFromTop > maxPathRelatedYPositionFromTop) {

-				// Is the rectangle (at least partly) located above the footer

-				// line?

-				// (effective page height := page height - footer line)

-				if (upperBoundYPositionFromTop <= effectivePageHeight) {

-					// yes: update current end of path-related page content

-					maxPathRelatedYPositionFromTop = lowerBoundYPositionFromTop;

-					logger.trace("New max path related y position (from top): "

-							+ maxPathRelatedYPositionFromTop);

-				} else {

-					// no: rectangle is fully located below the footer line ->

-					// ignore

-					logger.trace("Ignoring path bound below the footer line.");

-				}

-			}

-		}

-	}

-

-	protected void processOperator(PDFOperator operator, List arguments)

-			throws IOException {

-		logger.trace("operator = " + operator);

-		super.processOperator(operator, arguments);

-	}

-

-	@Override

-	protected void processTextPosition(TextPosition text) {

-		showCharacter(text);

-	}

-	

-	// exthex

-	/**

-	 * A method provided as an event interface to allow a subclass to perform

-	 * some specific functionality when a character needs to be displayed. This

-	 * method is used to calculate the latest position of a text in the page.

-	 * Sorry for this missinterpretation of the method, but it is the only way

-	 * to do this (provided by PDFBox)!!!

-	 * 

-	 * @param text

-	 *            the character to be displayed -> calculate there y position.

-	 */

-	protected void showCharacter(TextPosition text) {

-		float current_y = text.getY();

-		final String character = text.getCharacter();

-

-		int pageRotation = this.getCurrentPage().findRotation();

-		// logger_.debug("PageRotation = " + pageRotation);

-		if (pageRotation == 0) {

-			current_y = text.getY();

-		}

-		if (pageRotation == 90) {

-			current_y = text.getX();

-		}

-		if (pageRotation == 180) {

-			float page_height = this.getCurrentPage().findMediaBox().getHeight();

-			current_y = page_height - text.getY();

-		}

-		if (pageRotation == 270) {

-			float page_height = this.getCurrentPage().findMediaBox().getHeight();

-			current_y = page_height - text.getX();

-		}

-

-		if (current_y > this.effectivePageHeight) {

-			// logger_.debug("character is below footer_line. footer_line = " +

-			// this.footer_line + ", text.character=" + character + ", y=" +

-			// current_y);

-			return;

-		}

-

-		// store ypos of the char if it is not empty

-		if (!character.equals(" ") && current_y > this.max_character_ypos) {

-			this.max_character_ypos = current_y;

-		}

-

-	}

-

-	// use this funtion getting an unsorted text output

-	// public void showString(byte[] string) {

-	// logger_.debug(new String(string));

-	// }

-

-	/**

-	 * Returns the calculated page length.

-	 * 

-	 * @return the max page length value

-	 */

-	public float getMaxPageLength() {

-		if (logger.isDebugEnabled()) {

-			logger.debug("Determining page content length: text="

-					+ max_character_ypos + ", image=" + max_image_ypos

-					+ ", path=" + maxPathRelatedYPositionFromTop);

-		}

-		return NumberUtils.max(max_character_ypos, max_image_ypos,

-                maxPathRelatedYPositionFromTop);

-	}

-

-	public class MyInvoke extends OperatorProcessor {

-

-        private PDFPage mypage;

-

-        public MyInvoke(PDFPage page) {

-            this.mypage = page;

-        }

-

-		public void process(PDFOperator operator, List arguments)

-				throws IOException {

-			COSName name = (COSName) arguments.get(0);

-

-			// PDResources res = context.getResources();

-

-			Map xobjects = context.getXObjects();

-			PDXObject xobject = (PDXObject) xobjects.get(name.getName());

-

-			PDStream stream = xobject.getPDStream();

-			COSStream cos_stream = stream.getStream();

-

-			COSName subtype = (COSName) cos_stream

-					.getDictionaryObject(COSName.SUBTYPE);

-			if (subtype.equals(COSName.IMAGE)) {

-				logger.debug("XObject Image");

-

-				Matrix ctm = context.getGraphicsState()

-						.getCurrentTransformationMatrix();

-                logger.debug("ctm = " + ctm);

-

-				Pos[] coordinates = new Pos[] { new Pos(0, 0, 1),

-						new Pos(1, 0, 1), new Pos(0, 1, 1), new Pos(1, 1, 1) };

-

-				Pos[] transformed_coordinates = transtormCoordinates(

-						coordinates, ctm);

-

-				/**********************************************************

-				 * pdf-as fix: calculating min and max point of an image to look

-				 * where the signature should be placed fix solves problems with

-				 * footer and images and placement of the signature in an image

-				 * only pdf document

-				 **********************************************************/

-

-				float actual_lowest_point = Float.NaN;

-				float actual_starting_point = Float.NaN;

-

-				int pageRotation = this.mypage.getCurrentPage().findRotation();

-				logger.debug("PageRotation = " + pageRotation);

-				if (pageRotation == 0) {

-					float min_y = findMinY(transformed_coordinates);

-                    logger.debug("min_y = " + min_y);

-					float page_height = this.mypage.getCurrentPage().findMediaBox().getHeight();

-                    logger.debug("page_height = " + page_height);

-

-					actual_lowest_point = page_height - min_y;

-					actual_starting_point = page_height

-							- findMaxY(transformed_coordinates);

-				}

-				if (pageRotation == 90) {

-					float max_x = findMaxX(transformed_coordinates);

-                    logger.debug("max_x = " + max_x);

-					float page_width = this.mypage.getCurrentPage().findMediaBox().getWidth();

-                    logger.debug("page_width = " + page_width);

-

-					actual_lowest_point = max_x;

-					actual_starting_point = findMinX(transformed_coordinates);

-				}

-				if (pageRotation == 180) {

-					float min_y = findMinY(transformed_coordinates);

-                    logger.debug("min_y = " + min_y);

-					float page_height = this.mypage.getCurrentPage().findMediaBox().getHeight();

-					actual_lowest_point = page_height

-							- findMaxY(transformed_coordinates);

-					actual_starting_point = page_height - min_y;

-				}

-				if (pageRotation == 270) {

-					float min_x = findMinX(transformed_coordinates);

-                    logger.debug("min_x = " + min_x);

-

-					float page_width = this.mypage.getCurrentPage().findMediaBox().getWidth();

-                    logger.debug("page_width = " + page_width);

-

-					actual_lowest_point = page_width - min_x;

-					actual_starting_point = page_width

-							- findMaxX(transformed_coordinates);

-				}

-

-                logger.debug("actual_lowest_point = " + actual_lowest_point);

-

-				if (actual_lowest_point > PDFPage.this.effectivePageHeight

-						&& actual_starting_point > PDFPage.this.effectivePageHeight) {

-                    logger.debug("image is below footer_line");

-					return;

-				}

-

-				if (actual_lowest_point > PDFPage.this.max_image_ypos) {

-					PDFPage.this.max_image_ypos = actual_lowest_point;

-				}

-

-				return;

-			}

-

-			if (xobject instanceof PDXObjectForm) {

-				PDXObjectForm form = (PDXObjectForm) xobject;

-				COSStream invoke = (COSStream) form.getCOSObject();

-				PDResources pdResources = form.getResources();

-				PDPage page = context.getCurrentPage();

-				if (pdResources == null) {

-					pdResources = page.findResources();

-				}

-

-				getContext().processSubStream(page, pdResources, invoke);

-			}

-		}

-	}

-

-	public static Pos[] transtormCoordinates(Pos[] coordinates, Matrix m) {

-		Pos[] transformed = new Pos[coordinates.length];

-		for (int i = 0; i < coordinates.length; i++) {

-			transformed[i] = transtormCoordinate(coordinates[i], m);

-		}

-		return transformed;

-	}

-

-	public static Pos transtormCoordinate(Pos pos, Matrix m) {

-		Pos transformed = new Pos();

-		transformed.x = pos.x * m.getValue(0, 0) + pos.y * m.getValue(1, 0)

-				+ pos.z * m.getValue(2, 0);

-		transformed.y = pos.x * m.getValue(0, 1) + pos.y * m.getValue(1, 1)

-				+ pos.z * m.getValue(2, 1);

-		transformed.z = pos.x * m.getValue(0, 2) + pos.y * m.getValue(1, 2)

-				+ pos.z * m.getValue(2, 2);

-

-        logger.debug(" transformed " + pos + " --> " + transformed);

-		return transformed;

-	}

-

-	public static float findMinY(Pos[] coordinates) {

-		float min = Float.POSITIVE_INFINITY;

-		for (int i = 0; i < coordinates.length; i++) {

-			if (coordinates[i].y < min) {

-				min = coordinates[i].y;

-			}

-		}

-		return min;

-	}

-

-	public static float findMaxY(Pos[] coordinates) {

-		float max = 0;

-		for (int i = 0; i < coordinates.length; i++) {

-			if (coordinates[i].y > max) {

-				max = coordinates[i].y;

-			}

-		}

-		return max;

-	}

-

-	public static float findMaxX(Pos[] coordinates) {

-		float max = Float.NEGATIVE_INFINITY;

-		for (int i = 0; i < coordinates.length; i++) {

-			if (coordinates[i].x > max) {

-				max = coordinates[i].x;

-			}

-		}

-		return max;

-	}

-

-	public static float findMinX(Pos[] coordinates) {

-		float min = Float.POSITIVE_INFINITY;

-		for (int i = 0; i < coordinates.length; i++) {

-			if (coordinates[i].x < min) {

-				min = coordinates[i].x;

-			}

-		}

-		return min;

-	}

-

-}
\ No newline at end of file
+/*******************************************************************************
+ * <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.
+ *
+ * $Id: PDFPage.java,v 1.5 2006/10/31 08:09:33 wprinz Exp $
+ */
+package at.knowcenter.wag.egov.egiz.pdf;
+
+import at.knowcenter.wag.egov.egiz.pdf.operator.path.construction.*;
+import at.knowcenter.wag.egov.egiz.pdf.operator.path.painting.*;
+
+import org.apache.commons.lang3.math.NumberUtils;
+import org.apache.pdfbox.cos.COSName;
+import org.apache.pdfbox.cos.COSStream;
+import org.apache.pdfbox.pdmodel.PDPage;
+import org.apache.pdfbox.pdmodel.PDResources;
+import org.apache.pdfbox.pdmodel.common.PDRectangle;
+import org.apache.pdfbox.pdmodel.common.PDStream;
+import org.apache.pdfbox.pdmodel.graphics.xobject.PDXObject;
+import org.apache.pdfbox.pdmodel.graphics.xobject.PDXObjectForm;
+import org.apache.pdfbox.util.Matrix;
+import org.apache.pdfbox.util.PDFOperator;
+import org.apache.pdfbox.util.PDFTextStripper;
+import org.apache.pdfbox.util.TextPosition;
+import org.apache.pdfbox.util.operator.OperatorProcessor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.awt.*;
+import java.awt.geom.GeneralPath;
+import java.io.IOException;
+import java.io.Writer;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * PDFPage is an inner class that is used to calculate the page length of a PDF
+ * Document page. It extends the PDFTextStripper class and implement one
+ * interested method: {@link at.knowcenter.wag.egov.egiz.pdf.PDFPage#showCharacter(TextPosition)}<br>
+ * This method is called when processing the FileStream. By calling the method
+ * {@link org.apache.pdfbox.util.PDFStreamEngine#processStream(org.apache.pdfbox.pdmodel.PDPage, org.apache.pdfbox.pdmodel.PDResources, org.pdfbox.cos.COSStream)}
+ * the implemented method showCharacter is called.
+ * 
+ * @author wlackner
+ * @see PDFTextStripper
+ */
+public class PDFPage extends PDFTextStripper {
+	/**
+	 * The logger definition.
+	 */
+    private static final Logger logger = LoggerFactory.getLogger(PDFPage.class);
+
+	/**
+	 * The maximum (lowest) y position of a character.
+	 */
+	protected float max_character_ypos = Float.NEGATIVE_INFINITY;
+
+	/**
+	 * The maximum (lowest y position of an image.
+	 */
+	protected float max_image_ypos = Float.NEGATIVE_INFINITY;
+
+	/**
+	 * The effective page height.
+	 */
+	protected float effectivePageHeight;
+
+	/**
+	 * The path currently being constructed.
+	 */
+	private GeneralPath currentPath = new GeneralPath();
+
+	/**
+	 * The lowest position of a drawn path (originating from top).
+	 */
+	private float maxPathRelatedYPositionFromTop = Float.NEGATIVE_INFINITY;
+
+	/**
+	 * Constructor.
+	 * 
+	 * @param effectivePageHeight
+	 *            The height of the page to be evaluated. PDF elements outside
+	 *            this height will not be considered.
+	 * 
+	 * @throws java.io.IOException
+	 */
+	public PDFPage(float effectivePageHeight, boolean legacy32) throws IOException {
+		super();
+
+		this.effectivePageHeight = effectivePageHeight;
+
+		OperatorProcessor newInvoke = new MyInvoke(this);
+		newInvoke.setContext(this);
+        this.registerOperatorProcessor("Do", newInvoke);
+        
+		if (!legacy32) {
+			registerCustomPathOperators();
+		}
+	}
+
+	/**
+	 * Registers operators responsible for path construction and painting in
+	 * order to fix auto positioning on pages with path elements.
+	 * 
+	 * @author Datentechnik Innovation GmbH
+	 */
+	@SuppressWarnings("unchecked")
+	private void registerCustomPathOperators() {
+
+		// *** path construction
+
+        this.registerOperatorProcessor("m", new MoveTo(this));
+        this.registerOperatorProcessor("l", new LineTo(this));
+        this.registerOperatorProcessor("c", new CurveTo(this));
+        this.registerOperatorProcessor("y", new CurveToReplicateFinalPoint(this));
+        this.registerOperatorProcessor("v", new CurveToReplicateInitialPoint(this));
+        this.registerOperatorProcessor("h", new ClosePath(this));
+
+		// *** path painting
+
+		// "S": stroke path
+        this.registerOperatorProcessor("S", new StrokePath(this));
+        this.registerOperatorProcessor("s", new CloseAndStrokePath(this));
+        this.registerOperatorProcessor("f", new FillPathNonZeroWindingNumberRule(this));
+        this.registerOperatorProcessor("F", new FillPathNonZeroWindingNumberRule(this));
+        this.registerOperatorProcessor("f*", new FillPathEvenOddRule(this));
+        this.registerOperatorProcessor("b", new CloseFillNonZeroAndStrokePath(this));
+        this.registerOperatorProcessor("B", new FillNonZeroAndStrokePath(this));
+        this.registerOperatorProcessor("b*", new CloseFillEvenOddAndStrokePath(this));
+        this.registerOperatorProcessor("B*", new FillEvenOddAndStrokePath(this));
+        this.registerOperatorProcessor("n", new EndPath(this));
+
+		// Note: The graphic context
+		// (org.pdfbox.pdmodel.graphics.PDGraphicsState) of the underlying
+		// pdfbox library does
+		// not yet support clipping. This prevents feasible usage of clipping
+		// operators (W, W*).
+		// operators.put("W", new ...(this));
+		// operators.put("W*", new ...(this));
+
+	}
+
+	/**
+	 * Returns the path currently being constructed.
+	 * 
+	 * @return The path currently being constructed.
+	 */
+	public GeneralPath getCurrentPath() {
+		return currentPath;
+	}
+
+	/**
+	 * Sets the current path.
+	 * 
+	 * @param currentPath
+	 *            The new current path.
+	 */
+	public void setCurrentPath(GeneralPath currentPath) {
+		this.currentPath = currentPath;
+	}
+
+	/**
+	 * Registers a rectangle that bounds the path currently being drawn.
+	 * 
+	 * @param bounds
+	 *            A rectangle depicting the bounds (coordinates originating from
+	 *            bottom left).
+	 * @author Datentechnik Innovation GmbH
+	 */
+	public void registerPathBounds(Rectangle bounds) {
+		if (!bounds.isEmpty()) {
+			logger.debug("Registering path bounds: " + bounds);
+
+			// vertical start of rectangle (counting from top of page)
+			float upperBoundYPositionFromTop;
+
+			// vertical end of rectangle (counting from top of page)
+			// this depicts the current end of path-related page content
+			float lowerBoundYPositionFromTop;
+
+			PDRectangle boundaryBox = this.getCurrentPage().findMediaBox();
+			float pageHeight;
+
+			switch (this.getCurrentPage().findRotation()) {
+			case 90: // CW
+				pageHeight = boundaryBox.getWidth();
+				upperBoundYPositionFromTop = (float) bounds.getMinX();
+				lowerBoundYPositionFromTop = (float) bounds.getMaxX();
+				break;
+			case 180:
+				pageHeight = boundaryBox.getHeight();
+				upperBoundYPositionFromTop = (float) bounds.getMinY();
+				lowerBoundYPositionFromTop = (float) bounds.getMaxY();
+				break;
+			case 270: // CCW
+				pageHeight = boundaryBox.getWidth();
+				upperBoundYPositionFromTop = pageHeight
+						- (float) bounds.getMaxX();
+				lowerBoundYPositionFromTop = pageHeight
+						- (float) bounds.getMinX();
+				break;
+			default:
+				pageHeight = boundaryBox.getHeight();
+				upperBoundYPositionFromTop = pageHeight
+						- (float) bounds.getMaxY();
+				lowerBoundYPositionFromTop = pageHeight
+						- (float) bounds.getMinY();
+				break;
+			}
+
+			// new maximum ?
+			if (lowerBoundYPositionFromTop > maxPathRelatedYPositionFromTop) {
+				// Is the rectangle (at least partly) located above the footer
+				// line?
+				// (effective page height := page height - footer line)
+				if (upperBoundYPositionFromTop <= effectivePageHeight) {
+					// yes: update current end of path-related page content
+					maxPathRelatedYPositionFromTop = lowerBoundYPositionFromTop;
+					logger.trace("New max path related y position (from top): "
+							+ maxPathRelatedYPositionFromTop);
+				} else {
+					// no: rectangle is fully located below the footer line ->
+					// ignore
+					logger.trace("Ignoring path bound below the footer line.");
+				}
+			}
+		}
+	}
+
+	protected void processOperator(PDFOperator operator, List arguments)
+			throws IOException {
+		logger.trace("operator = " + operator);
+		super.processOperator(operator, arguments);
+	}
+
+	@Override
+	protected void processTextPosition(TextPosition text) {
+		showCharacter(text);
+	}
+	
+	// exthex
+	/**
+	 * A method provided as an event interface to allow a subclass to perform
+	 * some specific functionality when a character needs to be displayed. This
+	 * method is used to calculate the latest position of a text in the page.
+	 * Sorry for this missinterpretation of the method, but it is the only way
+	 * to do this (provided by PDFBox)!!!
+	 * 
+	 * @param text
+	 *            the character to be displayed -> calculate there y position.
+	 */
+	protected void showCharacter(TextPosition text) {
+		float current_y = text.getY();
+		final String character = text.getCharacter();
+
+		int pageRotation = this.getCurrentPage().findRotation();
+		// logger_.debug("PageRotation = " + pageRotation);
+		if (pageRotation == 0) {
+			current_y = text.getY();
+		}
+		if (pageRotation == 90) {
+			current_y = text.getX();
+		}
+		if (pageRotation == 180) {
+			float page_height = this.getCurrentPage().findMediaBox().getHeight();
+			current_y = page_height - text.getY();
+		}
+		if (pageRotation == 270) {
+			float page_height = this.getCurrentPage().findMediaBox().getHeight();
+			current_y = page_height - text.getX();
+		}
+
+		if (current_y > this.effectivePageHeight) {
+			// logger_.debug("character is below footer_line. footer_line = " +
+			// this.footer_line + ", text.character=" + character + ", y=" +
+			// current_y);
+			return;
+		}
+
+		// store ypos of the char if it is not empty
+		if (!character.equals(" ") && current_y > this.max_character_ypos) {
+			this.max_character_ypos = current_y;
+		}
+
+	}
+
+	// use this funtion getting an unsorted text output
+	// public void showString(byte[] string) {
+	// logger_.debug(new String(string));
+	// }
+
+	/**
+	 * Returns the calculated page length.
+	 * 
+	 * @return the max page length value
+	 */
+	public float getMaxPageLength() {
+		if (logger.isDebugEnabled()) {
+			logger.debug("Determining page content length: text="
+					+ max_character_ypos + ", image=" + max_image_ypos
+					+ ", path=" + maxPathRelatedYPositionFromTop);
+		}
+		return NumberUtils.max(max_character_ypos, max_image_ypos,
+                maxPathRelatedYPositionFromTop);
+	}
+
+	public class MyInvoke extends OperatorProcessor {
+
+        private PDFPage mypage;
+
+        public MyInvoke(PDFPage page) {
+            this.mypage = page;
+        }
+
+		public void process(PDFOperator operator, List arguments)
+				throws IOException {
+			COSName name = (COSName) arguments.get(0);
+
+			// PDResources res = context.getResources();
+
+			Map xobjects = context.getXObjects();
+			PDXObject xobject = (PDXObject) xobjects.get(name.getName());
+
+			PDStream stream = xobject.getPDStream();
+			COSStream cos_stream = stream.getStream();
+
+			COSName subtype = (COSName) cos_stream
+					.getDictionaryObject(COSName.SUBTYPE);
+			if (subtype.equals(COSName.IMAGE)) {
+				logger.debug("XObject Image");
+
+				Matrix ctm = context.getGraphicsState()
+						.getCurrentTransformationMatrix();
+                logger.debug("ctm = " + ctm);
+
+				Pos[] coordinates = new Pos[] { new Pos(0, 0, 1),
+						new Pos(1, 0, 1), new Pos(0, 1, 1), new Pos(1, 1, 1) };
+
+				Pos[] transformed_coordinates = transtormCoordinates(
+						coordinates, ctm);
+
+				/**********************************************************
+				 * pdf-as fix: calculating min and max point of an image to look
+				 * where the signature should be placed fix solves problems with
+				 * footer and images and placement of the signature in an image
+				 * only pdf document
+				 **********************************************************/
+
+				float actual_lowest_point = Float.NaN;
+				float actual_starting_point = Float.NaN;
+
+				int pageRotation = this.mypage.getCurrentPage().findRotation();
+				logger.debug("PageRotation = " + pageRotation);
+				if (pageRotation == 0) {
+					float min_y = findMinY(transformed_coordinates);
+                    logger.debug("min_y = " + min_y);
+					float page_height = this.mypage.getCurrentPage().findMediaBox().getHeight();
+                    logger.debug("page_height = " + page_height);
+
+					actual_lowest_point = page_height - min_y;
+					actual_starting_point = page_height
+							- findMaxY(transformed_coordinates);
+				}
+				if (pageRotation == 90) {
+					float max_x = findMaxX(transformed_coordinates);
+                    logger.debug("max_x = " + max_x);
+					float page_width = this.mypage.getCurrentPage().findMediaBox().getWidth();
+                    logger.debug("page_width = " + page_width);
+
+					actual_lowest_point = max_x;
+					actual_starting_point = findMinX(transformed_coordinates);
+				}
+				if (pageRotation == 180) {
+					float min_y = findMinY(transformed_coordinates);
+                    logger.debug("min_y = " + min_y);
+					float page_height = this.mypage.getCurrentPage().findMediaBox().getHeight();
+					actual_lowest_point = page_height
+							- findMaxY(transformed_coordinates);
+					actual_starting_point = page_height - min_y;
+				}
+				if (pageRotation == 270) {
+					float min_x = findMinX(transformed_coordinates);
+                    logger.debug("min_x = " + min_x);
+
+					float page_width = this.mypage.getCurrentPage().findMediaBox().getWidth();
+                    logger.debug("page_width = " + page_width);
+
+					actual_lowest_point = page_width - min_x;
+					actual_starting_point = page_width
+							- findMaxX(transformed_coordinates);
+				}
+
+                logger.debug("actual_lowest_point = " + actual_lowest_point);
+
+				if (actual_lowest_point > PDFPage.this.effectivePageHeight
+						&& actual_starting_point > PDFPage.this.effectivePageHeight) {
+                    logger.debug("image is below footer_line");
+					return;
+				}
+
+				if (actual_lowest_point > PDFPage.this.max_image_ypos) {
+					PDFPage.this.max_image_ypos = actual_lowest_point;
+				}
+
+				return;
+			}
+
+			if (xobject instanceof PDXObjectForm) {
+				PDXObjectForm form = (PDXObjectForm) xobject;
+				COSStream invoke = (COSStream) form.getCOSObject();
+				PDResources pdResources = form.getResources();
+				PDPage page = context.getCurrentPage();
+				if (pdResources == null) {
+					pdResources = page.findResources();
+				}
+
+				getContext().processSubStream(page, pdResources, invoke);
+			}
+		}
+	}
+
+	public static Pos[] transtormCoordinates(Pos[] coordinates, Matrix m) {
+		Pos[] transformed = new Pos[coordinates.length];
+		for (int i = 0; i < coordinates.length; i++) {
+			transformed[i] = transtormCoordinate(coordinates[i], m);
+		}
+		return transformed;
+	}
+
+	public static Pos transtormCoordinate(Pos pos, Matrix m) {
+		Pos transformed = new Pos();
+		transformed.x = pos.x * m.getValue(0, 0) + pos.y * m.getValue(1, 0)
+				+ pos.z * m.getValue(2, 0);
+		transformed.y = pos.x * m.getValue(0, 1) + pos.y * m.getValue(1, 1)
+				+ pos.z * m.getValue(2, 1);
+		transformed.z = pos.x * m.getValue(0, 2) + pos.y * m.getValue(1, 2)
+				+ pos.z * m.getValue(2, 2);
+
+        logger.debug(" transformed " + pos + " --> " + transformed);
+		return transformed;
+	}
+
+	public static float findMinY(Pos[] coordinates) {
+		float min = Float.POSITIVE_INFINITY;
+		for (int i = 0; i < coordinates.length; i++) {
+			if (coordinates[i].y < min) {
+				min = coordinates[i].y;
+			}
+		}
+		return min;
+	}
+
+	public static float findMaxY(Pos[] coordinates) {
+		float max = 0;
+		for (int i = 0; i < coordinates.length; i++) {
+			if (coordinates[i].y > max) {
+				max = coordinates[i].y;
+			}
+		}
+		return max;
+	}
+
+	public static float findMaxX(Pos[] coordinates) {
+		float max = Float.NEGATIVE_INFINITY;
+		for (int i = 0; i < coordinates.length; i++) {
+			if (coordinates[i].x > max) {
+				max = coordinates[i].x;
+			}
+		}
+		return max;
+	}
+
+	public static float findMinX(Pos[] coordinates) {
+		float min = Float.POSITIVE_INFINITY;
+		for (int i = 0; i < coordinates.length; i++) {
+			if (coordinates[i].x < min) {
+				min = coordinates[i].x;
+			}
+		}
+		return min;
+	}
+
+}
diff --git a/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/PDFUtilities.java b/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/PDFUtilities.java
index 15a42deb..9bc9d38c 100644
--- a/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/PDFUtilities.java
+++ b/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/PDFUtilities.java
@@ -1,72 +1,95 @@
-/**

- * <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.

- *

- * $Id: PDFUtilities.java,v 1.3 2006/10/31 08:09:33 wprinz Exp $

- */

-package at.knowcenter.wag.egov.egiz.pdf;

-

-import java.io.IOException;

-import java.util.List;

-

-import at.gv.egiz.pdfas.common.exceptions.PDFIOException;

-import org.apache.pdfbox.cos.COSStream;

-import org.apache.pdfbox.pdmodel.PDDocument;

-import org.apache.pdfbox.pdmodel.PDPage;

-import org.apache.pdfbox.pdmodel.PDResources;

-import org.apache.pdfbox.pdmodel.interactive.pagenavigation.PDThreadBead;

-

-

-/**

- * Contains useful helpers for accessing PDF documents.

- *

- * @author wprinz

- * @author mruhmer

- */

-public abstract class PDFUtilities

-{

-    public static float calculatePageLength(PDDocument document, int page, float effectivePageHeight, /*int pagerotation,*/ boolean legacy32) throws PDFIOException {

-	    //int last_page_id = document.getNumberOfPages();

-	    List allPages = document.getDocumentCatalog().getAllPages();

-	    PDPage pdpage = (PDPage) allPages.get(page);

-	    //pdpage.setRotation(pagerotation);

-	    return calculatePageLength(pdpage, effectivePageHeight, legacy32);

-	}

-

-    public static float calculatePageLength(PDPage page, float effectivePageHeight, boolean legacy32) throws PDFIOException

-    {

-        try{

-            PDFPage my_page = new PDFPage(effectivePageHeight, legacy32);

-            PDResources resources = page.findResources();

-            COSStream stream = page.getContents().getStream();

-            //List<PDThreadBead> articles = page.getThreadBeads();

-            //my_page.processMyPage(page);

-            my_page.processStream(page, resources, stream);

-            return my_page.getMaxPageLength();

-        }

-        catch (IOException e)

-        {

-            throw new PDFIOException("error.pdf.stamp.11", e);

-        }

-    }

-

-}

+/*******************************************************************************
+ * <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.
+ *
+ * $Id: PDFUtilities.java,v 1.3 2006/10/31 08:09:33 wprinz Exp $
+ */
+package at.knowcenter.wag.egov.egiz.pdf;
+
+import java.io.IOException;
+import java.util.List;
+
+import at.gv.egiz.pdfas.common.exceptions.PDFIOException;
+import org.apache.pdfbox.cos.COSStream;
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.pdmodel.PDPage;
+import org.apache.pdfbox.pdmodel.PDResources;
+import org.apache.pdfbox.pdmodel.interactive.pagenavigation.PDThreadBead;
+
+
+/**
+ * Contains useful helpers for accessing PDF documents.
+ *
+ * @author wprinz
+ * @author mruhmer
+ */
+public abstract class PDFUtilities
+{
+    public static float calculatePageLength(PDDocument document, int page, float effectivePageHeight, /*int pagerotation,*/ boolean legacy32) throws PDFIOException {
+	    //int last_page_id = document.getNumberOfPages();
+	    List allPages = document.getDocumentCatalog().getAllPages();
+	    PDPage pdpage = (PDPage) allPages.get(page);
+	    //pdpage.setRotation(pagerotation);
+	    return calculatePageLength(pdpage, effectivePageHeight, legacy32);
+	}
+
+    public static float calculatePageLength(PDPage page, float effectivePageHeight, boolean legacy32) throws PDFIOException
+    {
+        try{
+            PDFPage my_page = new PDFPage(effectivePageHeight, legacy32);
+            PDResources resources = page.findResources();
+            COSStream stream = page.getContents().getStream();
+            //List<PDThreadBead> articles = page.getThreadBeads();
+            //my_page.processMyPage(page);
+            my_page.processStream(page, resources, stream);
+            return my_page.getMaxPageLength();
+        }
+        catch (IOException e)
+        {
+            throw new PDFIOException("error.pdf.stamp.11", e);
+        }
+    }
+
+}
diff --git a/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/Pos.java b/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/Pos.java
index 6f03fed4..e46ddbc1 100644
--- a/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/Pos.java
+++ b/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/Pos.java
@@ -1,70 +1,93 @@
-/**

- * <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.

- *

- * $Id: Pos.java,v 1.1 2006/08/25 17:10:08 wprinz Exp $

- */

-package at.knowcenter.wag.egov.egiz.pdf;

-

-/**

- * Encapsulation of a position on a PDF page.

- * 

- * @author wprinz

- */

-public class Pos

-{

-

-  public float x;

-

-  public float y;

-

-  public float z;

-

-  /**

-   * Default constructor.

-   */

-  public Pos()

-  {

-  }

-

-  /**

-   * Constructor that sets the coordinates.

-   * @param xx

-   * @param yy

-   * @param zz

-   */

-  public Pos(float xx, float yy, float zz)

-  {

-    this.x = xx;

-    this.y = yy;

-    this.z = zz;

-  }

-

-  /**

-   * @see Object#toString()

-   */

-  public String toString()

-  {

-    return "(" + this.x + "," + this.y + "," + this.z + ")";

-  }

-

-}

+/*******************************************************************************
+ * <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.
+ *
+ * $Id: Pos.java,v 1.1 2006/08/25 17:10:08 wprinz Exp $
+ */
+package at.knowcenter.wag.egov.egiz.pdf;
+
+/**
+ * Encapsulation of a position on a PDF page.
+ * 
+ * @author wprinz
+ */
+public class Pos
+{
+
+  public float x;
+
+  public float y;
+
+  public float z;
+
+  /**
+   * Default constructor.
+   */
+  public Pos()
+  {
+  }
+
+  /**
+   * Constructor that sets the coordinates.
+   * @param xx
+   * @param yy
+   * @param zz
+   */
+  public Pos(float xx, float yy, float zz)
+  {
+    this.x = xx;
+    this.y = yy;
+    this.z = zz;
+  }
+
+  /**
+   * @see Object#toString()
+   */
+  public String toString()
+  {
+    return "(" + this.x + "," + this.y + "," + this.z + ")";
+  }
+
+}
diff --git a/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/PositioningInstruction.java b/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/PositioningInstruction.java
index d0c1afc1..245e864f 100644
--- a/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/PositioningInstruction.java
+++ b/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/PositioningInstruction.java
@@ -1,198 +1,221 @@
-/**

- * <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.

- *

- * $Id:  $

- */

-package at.knowcenter.wag.egov.egiz.pdf;

-

-/**

- * The positioning instruction holds information of where to place the signature

- * block.

- * 

- * <p>

- * This instruction is given to the PDF writer in order to place the signature.

- * </p>

- * 

- * @author wprinz

- */

-public class PositioningInstruction

-{

-

-  /**

-   * Tells, if a new plain page should be appended.

-   * 

-   * <p>

-   * This command is executed before the signature block is positioned according

-   * to page, x and y.

-   * </p>

-   */

-  protected boolean make_new_page = false;

-

-  /**

-   * The number of the page on which the signature block is to be placed. If

-   * specified to make a new page, the number of this newly created page can be

-   * used here as well.

-   */

-  protected int page = 0;

-

-  /**

-   * The x coordinate where the upper left corner of the signature block should

-   * be placed.

-   */

-  protected float x = 0.0f;

-

-  /**

-   * The y coordinate where the upper left corner of the signature block should

-   * be placed.

-   */

-  protected float y = 0.0f;

-  

-  /**

-   * The rotation of the signature block

-   */

-  protected float rotation = 0.0f;

-

-  /**

-   * 

-   * @param make_new_page

-   *          Tells, if a new plain page should be appended. This command is

-   *          executed before the signature block is positioned according to

-   *          page, x and y.

-   * @param page

-   *          The number of the page on which the signature block is to be

-   *          placed. If specified to make a new page, the number of this newly

-   *          created page can be used here as well.

-   * @param x

-   *          The x coordinate where the upper left corner of the signature

-   *          block should be placed.

-   * @param y

-   *          The y coordinate where the upper left corner of the signature

-   *          block should be placed.

-   */

-  public PositioningInstruction(boolean make_new_page, int page, float x, float y, float rotation)

-  {

-    this.make_new_page = make_new_page;

-    this.page = page;

-    this.x = x;

-    this.y = y;

-    this.rotation = rotation;

-  }

-

-  /**

-   * Tells, if a new plain page should be appended to the document.

-   * 

-   * @return Returns true, if a new plain page should be appended.

-   */

-  public boolean isMakeNewPage()

-  {

-    return this.make_new_page;

-  }

-

-  /**

-   * Returns the page on which the signature is to be printed.

-   * 

-   * @return Returns the page on which the signature is to be printed.

-   */

-  public int getPage()

-  {

-    return this.page;

-  }

-

-  /**

-   * Returns the x coordinate where the upper left corner of the signature block

-   * should be placed.

-   * 

-   * @return Returns the x coordinate where the upper left corner of the

-   *         signature block should be placed.

-   */

-  public float getX()

-  {

-    return this.x;

-  }

-

-  /**

-   * Returns the y coordinate where the upper left corner of the signature block

-   * should be placed.

-   * 

-   * @return Returns the y coordinate where the upper left corner of the

-   *         signature block should be placed.

-   */

-  public float getY()

-  {

-    return this.y;

-  }

-  

-  public float getRotation()

-  {

-    return this.rotation;

-  }

-

-	public int hashCode() {

-		final int prime = 31;

-		int result = 1;

-		result = prime * result + (make_new_page ? 1231 : 1237);

-		result = prime * result + page;

-		result = prime * result + Float.floatToIntBits(x);

-		result = prime * result + Float.floatToIntBits(y);

-		result = prime * result + Float.floatToIntBits(rotation);

-		return result;

-	}

-

-	public boolean equals(Object obj) {

-		if (this == obj)

-			return true;

-		if (obj == null)

-			return false;

-		if (!(obj instanceof PositioningInstruction))

-			return false;

-		PositioningInstruction other = (PositioningInstruction) obj;

-		if (make_new_page != other.make_new_page)

-			return false;

-		if (page != other.page)

-			return false;

-		if (Float.floatToIntBits(x) != Float.floatToIntBits(other.x))

-			return false;

-		if (Float.floatToIntBits(y) != Float.floatToIntBits(other.y))

-			return false;

-		if (Float.floatToIntBits(rotation) != Float.floatToIntBits(other.rotation))

-			return false;

-		return true;

-	}

-

-	public String toString() {

-		StringBuffer buffer = new StringBuffer();

-		buffer.append("PositioningInstruction [page=");

-		buffer.append(page);

-		buffer.append(", make_new_page=");

-		buffer.append(make_new_page);

-		buffer.append(", x=");

-		buffer.append(x);

-		buffer.append(", y=");

-		buffer.append(y);

-		buffer.append(", r=");

-		buffer.append(rotation);

-		buffer.append("]");

-		return buffer.toString();

-	}

-

-}

+/*******************************************************************************
+ * <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.
+ *
+ * $Id:  $
+ */
+package at.knowcenter.wag.egov.egiz.pdf;
+
+/**
+ * The positioning instruction holds information of where to place the signature
+ * block.
+ * 
+ * <p>
+ * This instruction is given to the PDF writer in order to place the signature.
+ * </p>
+ * 
+ * @author wprinz
+ */
+public class PositioningInstruction
+{
+
+  /**
+   * Tells, if a new plain page should be appended.
+   * 
+   * <p>
+   * This command is executed before the signature block is positioned according
+   * to page, x and y.
+   * </p>
+   */
+  protected boolean make_new_page = false;
+
+  /**
+   * The number of the page on which the signature block is to be placed. If
+   * specified to make a new page, the number of this newly created page can be
+   * used here as well.
+   */
+  protected int page = 0;
+
+  /**
+   * The x coordinate where the upper left corner of the signature block should
+   * be placed.
+   */
+  protected float x = 0.0f;
+
+  /**
+   * The y coordinate where the upper left corner of the signature block should
+   * be placed.
+   */
+  protected float y = 0.0f;
+  
+  /**
+   * The rotation of the signature block
+   */
+  protected float rotation = 0.0f;
+
+  /**
+   * 
+   * @param make_new_page
+   *          Tells, if a new plain page should be appended. This command is
+   *          executed before the signature block is positioned according to
+   *          page, x and y.
+   * @param page
+   *          The number of the page on which the signature block is to be
+   *          placed. If specified to make a new page, the number of this newly
+   *          created page can be used here as well.
+   * @param x
+   *          The x coordinate where the upper left corner of the signature
+   *          block should be placed.
+   * @param y
+   *          The y coordinate where the upper left corner of the signature
+   *          block should be placed.
+   */
+  public PositioningInstruction(boolean make_new_page, int page, float x, float y, float rotation)
+  {
+    this.make_new_page = make_new_page;
+    this.page = page;
+    this.x = x;
+    this.y = y;
+    this.rotation = rotation;
+  }
+
+  /**
+   * Tells, if a new plain page should be appended to the document.
+   * 
+   * @return Returns true, if a new plain page should be appended.
+   */
+  public boolean isMakeNewPage()
+  {
+    return this.make_new_page;
+  }
+
+  /**
+   * Returns the page on which the signature is to be printed.
+   * 
+   * @return Returns the page on which the signature is to be printed.
+   */
+  public int getPage()
+  {
+    return this.page;
+  }
+
+  /**
+   * Returns the x coordinate where the upper left corner of the signature block
+   * should be placed.
+   * 
+   * @return Returns the x coordinate where the upper left corner of the
+   *         signature block should be placed.
+   */
+  public float getX()
+  {
+    return this.x;
+  }
+
+  /**
+   * Returns the y coordinate where the upper left corner of the signature block
+   * should be placed.
+   * 
+   * @return Returns the y coordinate where the upper left corner of the
+   *         signature block should be placed.
+   */
+  public float getY()
+  {
+    return this.y;
+  }
+  
+  public float getRotation()
+  {
+    return this.rotation;
+  }
+
+	public int hashCode() {
+		final int prime = 31;
+		int result = 1;
+		result = prime * result + (make_new_page ? 1231 : 1237);
+		result = prime * result + page;
+		result = prime * result + Float.floatToIntBits(x);
+		result = prime * result + Float.floatToIntBits(y);
+		result = prime * result + Float.floatToIntBits(rotation);
+		return result;
+	}
+
+	public boolean equals(Object obj) {
+		if (this == obj)
+			return true;
+		if (obj == null)
+			return false;
+		if (!(obj instanceof PositioningInstruction))
+			return false;
+		PositioningInstruction other = (PositioningInstruction) obj;
+		if (make_new_page != other.make_new_page)
+			return false;
+		if (page != other.page)
+			return false;
+		if (Float.floatToIntBits(x) != Float.floatToIntBits(other.x))
+			return false;
+		if (Float.floatToIntBits(y) != Float.floatToIntBits(other.y))
+			return false;
+		if (Float.floatToIntBits(rotation) != Float.floatToIntBits(other.rotation))
+			return false;
+		return true;
+	}
+
+	public String toString() {
+		StringBuffer buffer = new StringBuffer();
+		buffer.append("PositioningInstruction [page=");
+		buffer.append(page);
+		buffer.append(", make_new_page=");
+		buffer.append(make_new_page);
+		buffer.append(", x=");
+		buffer.append(x);
+		buffer.append(", y=");
+		buffer.append(y);
+		buffer.append(", r=");
+		buffer.append(rotation);
+		buffer.append("]");
+		return buffer.toString();
+	}
+
+}
diff --git a/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/TablePos.java b/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/TablePos.java
index 7bf2103b..9d411d1e 100644
--- a/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/TablePos.java
+++ b/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/TablePos.java
@@ -1,276 +1,299 @@
-/**

- * <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.

- *

- * $Id: TablePos.java,v 1.1 2006/08/25 17:10:08 wprinz Exp $

- */

-package at.knowcenter.wag.egov.egiz.pdf;

-

-import java.io.Serializable;

-

-import at.gv.egiz.pdfas.common.exceptions.PdfAsException;

-

-/**

- * Class that holds the exact position where the table should be written to the

- * document.

- * 

- * @author wprinz

- * @author mruhmer

- */

-public class TablePos implements Serializable

-{

-

-  /**

-   * SVUID.

-   */

-  private static final long serialVersionUID = -5299027706623518059L;

-

-  /**

-   * The page on which the block should be displayed.

-   * 

-   */

-  private int page = 0;

-

-  /**

-   * The x position.

-   */

-  private float pos_x = 0.0f;

-

-  /**

-   * The y position.

-   */

-  private float pos_y = 0.0f;

-

-  /**

-   * The width of the block.

-   */

-  private float width = 0.0f;

-  /**

-   * The top y position of the footer line.

-   */

-  public float footer_line = 0.0f;

-  

-  /**

-   * The rotation of the signature block

-   */

-  public float rotation = 0.0f;

-

-  /**

-   * The y position.

-   */

-  public String myposstring = "";

-  

-  private boolean newpage = false;

-  private boolean autoX = true; 

-  private boolean autoY = true;

-  private boolean autoW = true;

-  private boolean autoP = true;

-  

-  public boolean isXauto()

-  {

-	return this.autoX;

-  }

-  public boolean isYauto()

-  {

-	return this.autoY;

-  } 

-  public boolean isWauto()

-  {

-	return this.autoW;

-  }

-  public boolean isPauto()

-  {

-	return this.autoP;

-  }

-  public boolean isNewPage()

-  {

-	return this.newpage;

-  }

-  public int getPage()

-  {

-	return this.page;  

-  }

-  public float getFooterLine()

-  {

-	//ignore if newpage and y is not auto

-	if (!this.autoY || this.newpage) 

-	{

-	  return 0.0f;

-	}

-	return this.footer_line;  

-  } 

-  public float getPosX()

-  {

-	return this.pos_x;  

-  }  

-  public float getPosY()

-  {

-	return this.pos_y;  

-  } 

-  public float getWidth()

-  {

-	return this.width;  

-  }  

-  public TablePos()

-  {

-    //nothing to do --> default

-  } 

-  

-  /**

-   * Constructor.

-   * 

-   * @param pos_string The pos instruction.

-   *        format : [x:x_algo];[y:y_algo];[w:w_algo][p:p_algo];[f:f_algo];[r:r_algo]

-   *        x_algo:='auto'     ... automatic positioning x

-   *                floatvalue ... absolute x

-   *        y_algo:='auto'     ... automatic positioning y

-   *                floatvalue ... absolute y

-   *        w_algo:='auto'     ... automatic width

-   *                floatvalue ... absolute width    

-   *        p_algo:='auto'     ... automatic last page

-   *                'new'      ... new page  

-   *                intvalue   ... pagenumber

-   *        f_algo  floatvalue ... consider footerline (only if y_algo is auto and p_algo is not 'new')

-   *        r_algo  floatvalue ... rotate the table arround the lower left corner anti clockwise in degree

-   * @throws PdfAsException

-   */

-  public TablePos(String pos_string) throws PdfAsException

-  {

-    //parse posstring and throw exception

-	//[x:x_algo];[y:y_algo];[w:w_algo][p:p_algo];[f:f_algo]

-	

-	String[] strs = pos_string.split(";");

-	try

-	{

-	  for (int cmds = 0;cmds<strs.length;cmds++)

-	  {

-		 

-		 String cmd_kvstring = strs[cmds];

-		 String[] cmd_kv = cmd_kvstring.split(":");

-		 if (cmd_kv.length != 2)

-		 {

-			 throw new PdfAsException("Pos string (=" + pos_string + ") is invalid.");

-		 }

-		 String cmdstr =  cmd_kv[0];

-		 if (cmdstr.length() != 1)

-		 {

-			 throw new PdfAsException("Pos string (=" + pos_string + ") is invalid.");

-		 }		 

-		 char command = cmdstr.charAt(0);

-	     String commandval= cmd_kv[1];

-	     switch (command)

-	     {

-	     	case 'x': {

-	     		         if (!commandval.equalsIgnoreCase("auto"))

-	     		         {  

-	     		        	float xval= Float.parseFloat(commandval);

-	     		            if (xval<0)

-	     		            {

-	     		            	throw new PdfAsException("Pos string (x:" + xval + ") is invalid.");

-	     		            }	     		          

-	     		        	this.pos_x = xval;

-	     		        	this.autoX = false; 

-	     		         }	     		         

-	     		         break;

-	     			  }	

-	     	case 'y': {

-		         		if (!commandval.equalsIgnoreCase("auto"))

-		         		{

-		         			float yval= Float.parseFloat(commandval);

-	     		            if (yval<0)

-	     		            {

-	     		            	throw new PdfAsException("Pos string (y:" + yval + ") is invalid.");

-	     		            }			         			

-		         			this.pos_y = yval;

-		         			this.autoY = false; 

-		         		}	     		         

-		         		break;

-	     			  }		

-	     	case 'w': { 

-         				if (!commandval.equalsIgnoreCase("auto"))

-         				{    

-		         			float wval= Float.parseFloat(commandval);

-	     		            if (wval<=0)

-	     		            {

-	     		            	throw new PdfAsException("pos.width (w:" + wval + ") must not be lower or equal 0.");

-	     		            }        					

-         					this.width = wval;

-         					this.autoW = false; 

-         				}	     		         

-         				break;

-      				  }

-	     	case 'p': {

- 						if (!commandval.equalsIgnoreCase("auto"))

- 						{ 

- 							if (commandval.equalsIgnoreCase("new"))

- 							{ 								

- 								this.newpage = true;

- 							}

- 							else

- 							{

- 								int pval = Integer.parseInt(commandval);

- 								if (pval<1)

- 								{

- 									throw new PdfAsException("Page (p:" + pval + ") must not be lower than 1.");

- 								}

- 								this.page = pval;

- 								this.autoP = false;

- 							}

- 						}						     		       

- 						break;

-      				  }

-	     	case 'f': {

-	     		        float flval=Float.parseFloat(commandval);

-     		            if (flval<0)

-     		            {

-     		            	throw new PdfAsException("Pos string (=" + pos_string + ") is invalid.");

-     		            } 	     		        

-	     				this.footer_line = flval;

-	     				break;

-	     			  }

-	     	case 'r': {

- 		        		float flval=Float.parseFloat(commandval);

- 		        		if (flval<0)

- 		        		{

- 		        			throw new PdfAsException("Pos string (=" + pos_string + ") is invalid.");

- 		        		} 	     		        

- 		        		this.rotation = flval;

- 		        		break;

- 			  }

-	     	default : {

-		                throw new PdfAsException("Pos string (=" + pos_string + ") is invalid.");

-	                  }

-	     }

-	  }

-	  this.myposstring=pos_string;

-    }

-    catch (NumberFormatException e)

-    {

-      throw new PdfAsException("Pos string (=" + pos_string + ") cannot be parsed.");

-    }

-  }

-  public String toString()

-  {  

-	 String thatsme = "cmd:"+this.myposstring+" pos_x:"+this.pos_x+" pos_y:"+this.pos_y+" page:"+this.page+" width:"+this.width+" footer:"+this.footer_line+" rotation:"+this.rotation+"\n "+" autoX:"+this.autoX+" autoY:"+this.autoY+" autoW:"+this.autoW+" Newpage:"+this.newpage+" autoP:"+this.autoP; 

-	 return thatsme;

-  }

-}

+/*******************************************************************************
+ * <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.
+ *
+ * $Id: TablePos.java,v 1.1 2006/08/25 17:10:08 wprinz Exp $
+ */
+package at.knowcenter.wag.egov.egiz.pdf;
+
+import java.io.Serializable;
+
+import at.gv.egiz.pdfas.common.exceptions.PdfAsException;
+
+/**
+ * Class that holds the exact position where the table should be written to the
+ * document.
+ * 
+ * @author wprinz
+ * @author mruhmer
+ */
+public class TablePos implements Serializable
+{
+
+  /**
+   * SVUID.
+   */
+  private static final long serialVersionUID = -5299027706623518059L;
+
+  /**
+   * The page on which the block should be displayed.
+   * 
+   */
+  private int page = 0;
+
+  /**
+   * The x position.
+   */
+  private float pos_x = 0.0f;
+
+  /**
+   * The y position.
+   */
+  private float pos_y = 0.0f;
+
+  /**
+   * The width of the block.
+   */
+  private float width = 0.0f;
+  /**
+   * The top y position of the footer line.
+   */
+  public float footer_line = 0.0f;
+  
+  /**
+   * The rotation of the signature block
+   */
+  public float rotation = 0.0f;
+
+  /**
+   * The y position.
+   */
+  public String myposstring = "";
+  
+  private boolean newpage = false;
+  private boolean autoX = true; 
+  private boolean autoY = true;
+  private boolean autoW = true;
+  private boolean autoP = true;
+  
+  public boolean isXauto()
+  {
+	return this.autoX;
+  }
+  public boolean isYauto()
+  {
+	return this.autoY;
+  } 
+  public boolean isWauto()
+  {
+	return this.autoW;
+  }
+  public boolean isPauto()
+  {
+	return this.autoP;
+  }
+  public boolean isNewPage()
+  {
+	return this.newpage;
+  }
+  public int getPage()
+  {
+	return this.page;  
+  }
+  public float getFooterLine()
+  {
+	//ignore if newpage and y is not auto
+	if (!this.autoY || this.newpage) 
+	{
+	  return 0.0f;
+	}
+	return this.footer_line;  
+  } 
+  public float getPosX()
+  {
+	return this.pos_x;  
+  }  
+  public float getPosY()
+  {
+	return this.pos_y;  
+  } 
+  public float getWidth()
+  {
+	return this.width;  
+  }  
+  public TablePos()
+  {
+    //nothing to do --> default
+  } 
+  
+  /**
+   * Constructor.
+   * 
+   * @param pos_string The pos instruction.
+   *        format : [x:x_algo];[y:y_algo];[w:w_algo][p:p_algo];[f:f_algo];[r:r_algo]
+   *        x_algo:='auto'     ... automatic positioning x
+   *                floatvalue ... absolute x
+   *        y_algo:='auto'     ... automatic positioning y
+   *                floatvalue ... absolute y
+   *        w_algo:='auto'     ... automatic width
+   *                floatvalue ... absolute width    
+   *        p_algo:='auto'     ... automatic last page
+   *                'new'      ... new page  
+   *                intvalue   ... pagenumber
+   *        f_algo  floatvalue ... consider footerline (only if y_algo is auto and p_algo is not 'new')
+   *        r_algo  floatvalue ... rotate the table arround the lower left corner anti clockwise in degree
+   * @throws PdfAsException
+   */
+  public TablePos(String pos_string) throws PdfAsException
+  {
+    //parse posstring and throw exception
+	//[x:x_algo];[y:y_algo];[w:w_algo][p:p_algo];[f:f_algo]
+	
+	String[] strs = pos_string.split(";");
+	try
+	{
+	  for (int cmds = 0;cmds<strs.length;cmds++)
+	  {
+		 
+		 String cmd_kvstring = strs[cmds];
+		 String[] cmd_kv = cmd_kvstring.split(":");
+		 if (cmd_kv.length != 2)
+		 {
+			 throw new PdfAsException("Pos string (=" + pos_string + ") is invalid.");
+		 }
+		 String cmdstr =  cmd_kv[0];
+		 if (cmdstr.length() != 1)
+		 {
+			 throw new PdfAsException("Pos string (=" + pos_string + ") is invalid.");
+		 }		 
+		 char command = cmdstr.charAt(0);
+	     String commandval= cmd_kv[1];
+	     switch (command)
+	     {
+	     	case 'x': {
+	     		         if (!commandval.equalsIgnoreCase("auto"))
+	     		         {  
+	     		        	float xval= Float.parseFloat(commandval);
+	     		            if (xval<0)
+	     		            {
+	     		            	throw new PdfAsException("Pos string (x:" + xval + ") is invalid.");
+	     		            }	     		          
+	     		        	this.pos_x = xval;
+	     		        	this.autoX = false; 
+	     		         }	     		         
+	     		         break;
+	     			  }	
+	     	case 'y': {
+		         		if (!commandval.equalsIgnoreCase("auto"))
+		         		{
+		         			float yval= Float.parseFloat(commandval);
+	     		            if (yval<0)
+	     		            {
+	     		            	throw new PdfAsException("Pos string (y:" + yval + ") is invalid.");
+	     		            }			         			
+		         			this.pos_y = yval;
+		         			this.autoY = false; 
+		         		}	     		         
+		         		break;
+	     			  }		
+	     	case 'w': { 
+         				if (!commandval.equalsIgnoreCase("auto"))
+         				{    
+		         			float wval= Float.parseFloat(commandval);
+	     		            if (wval<=0)
+	     		            {
+	     		            	throw new PdfAsException("pos.width (w:" + wval + ") must not be lower or equal 0.");
+	     		            }        					
+         					this.width = wval;
+         					this.autoW = false; 
+         				}	     		         
+         				break;
+      				  }
+	     	case 'p': {
+ 						if (!commandval.equalsIgnoreCase("auto"))
+ 						{ 
+ 							if (commandval.equalsIgnoreCase("new"))
+ 							{ 								
+ 								this.newpage = true;
+ 							}
+ 							else
+ 							{
+ 								int pval = Integer.parseInt(commandval);
+ 								if (pval<1)
+ 								{
+ 									throw new PdfAsException("Page (p:" + pval + ") must not be lower than 1.");
+ 								}
+ 								this.page = pval;
+ 								this.autoP = false;
+ 							}
+ 						}						     		       
+ 						break;
+      				  }
+	     	case 'f': {
+	     		        float flval=Float.parseFloat(commandval);
+     		            if (flval<0)
+     		            {
+     		            	throw new PdfAsException("Pos string (=" + pos_string + ") is invalid.");
+     		            } 	     		        
+	     				this.footer_line = flval;
+	     				break;
+	     			  }
+	     	case 'r': {
+ 		        		float flval=Float.parseFloat(commandval);
+ 		        		if (flval<0)
+ 		        		{
+ 		        			throw new PdfAsException("Pos string (=" + pos_string + ") is invalid.");
+ 		        		} 	     		        
+ 		        		this.rotation = flval;
+ 		        		break;
+ 			  }
+	     	default : {
+		                throw new PdfAsException("Pos string (=" + pos_string + ") is invalid.");
+	                  }
+	     }
+	  }
+	  this.myposstring=pos_string;
+    }
+    catch (NumberFormatException e)
+    {
+      throw new PdfAsException("Pos string (=" + pos_string + ") cannot be parsed.");
+    }
+  }
+  public String toString()
+  {  
+	 String thatsme = "cmd:"+this.myposstring+" pos_x:"+this.pos_x+" pos_y:"+this.pos_y+" page:"+this.page+" width:"+this.width+" footer:"+this.footer_line+" rotation:"+this.rotation+"\n "+" autoX:"+this.autoX+" autoY:"+this.autoY+" autoW:"+this.autoW+" Newpage:"+this.newpage+" autoP:"+this.autoP; 
+	 return thatsme;
+  }
+}
diff --git a/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/operator/path/PathConstructionOperatorProcessor.java b/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/operator/path/PathConstructionOperatorProcessor.java
index 63bd9481..2e16c117 100644
--- a/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/operator/path/PathConstructionOperatorProcessor.java
+++ b/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/operator/path/PathConstructionOperatorProcessor.java
@@ -1,61 +1,84 @@
-/**

- * <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.knowcenter.wag.egov.egiz.pdf.operator.path;

-

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

-import org.apache.pdfbox.util.operator.OperatorProcessor;

-

-import java.awt.geom.Point2D;

-

-/**

- * Provides functions for path construction operators.

- *

- * @see "PDF 1.7 specification, Section 8.5.2 'Path Construction Operators'"

- * @author Datentechnik Innovation GmbH

- *

- */

-public abstract class PathConstructionOperatorProcessor extends OperatorProcessor {

-

-	public PathConstructionOperatorProcessor(PDFPage context) {

-		setContext(context);

-	}

-

-	/**

-	 * Transforms the given point from user space coordinates to device space coordinates based on the current

-	 * transition matrix.

-	 *

-	 * @param x

-	 *            The x axis value of the user space coordinates.

-	 * @param y

-	 *            The y axis value of the user space coordinates.

-	 * @return The transformed point.

-	 */

-	public Point2D transform(double x, double y) {

-		double[] position = { x, y };

-		context.getGraphicsState().getCurrentTransformationMatrix().createAffineTransform()

-				.transform(position, 0, position, 0, 1);

-		return new Point2D.Double(position[0], position[1]);

-	}

-

-}

+/*******************************************************************************
+ * <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.knowcenter.wag.egov.egiz.pdf.operator.path;
+
+import at.knowcenter.wag.egov.egiz.pdf.PDFPage;
+import org.apache.pdfbox.util.operator.OperatorProcessor;
+
+import java.awt.geom.Point2D;
+
+/**
+ * Provides functions for path construction operators.
+ *
+ * @see "PDF 1.7 specification, Section 8.5.2 'Path Construction Operators'"
+ * @author Datentechnik Innovation GmbH
+ *
+ */
+public abstract class PathConstructionOperatorProcessor extends OperatorProcessor {
+
+	public PathConstructionOperatorProcessor(PDFPage context) {
+		setContext(context);
+	}
+
+	/**
+	 * Transforms the given point from user space coordinates to device space coordinates based on the current
+	 * transition matrix.
+	 *
+	 * @param x
+	 *            The x axis value of the user space coordinates.
+	 * @param y
+	 *            The y axis value of the user space coordinates.
+	 * @return The transformed point.
+	 */
+	public Point2D transform(double x, double y) {
+		double[] position = { x, y };
+		context.getGraphicsState().getCurrentTransformationMatrix().createAffineTransform()
+				.transform(position, 0, position, 0, 1);
+		return new Point2D.Double(position[0], position[1]);
+	}
+
+}
diff --git a/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/operator/path/PathPaintingOperatorProcessor.java b/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/operator/path/PathPaintingOperatorProcessor.java
index a0b73015..bc34d562 100644
--- a/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/operator/path/PathPaintingOperatorProcessor.java
+++ b/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/operator/path/PathPaintingOperatorProcessor.java
@@ -1,42 +1,65 @@
-/**

- * <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.knowcenter.wag.egov.egiz.pdf.operator.path;

-

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

-import org.apache.pdfbox.util.operator.OperatorProcessor;

-

-/**

- * Provides functions for path painting operators.

- *

- * @see "PDF 1.7 specification, Section 8.5.2 'Path Construction Operators'"

- * @author Datentechnik Innovation GmbH

- *

- */

-public abstract class PathPaintingOperatorProcessor extends OperatorProcessor {

-

-	public PathPaintingOperatorProcessor(PDFPage context) {

-		setContext(context);

-	}

-

-}

+/*******************************************************************************
+ * <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.knowcenter.wag.egov.egiz.pdf.operator.path;
+
+import at.knowcenter.wag.egov.egiz.pdf.PDFPage;
+import org.apache.pdfbox.util.operator.OperatorProcessor;
+
+/**
+ * Provides functions for path painting operators.
+ *
+ * @see "PDF 1.7 specification, Section 8.5.2 'Path Construction Operators'"
+ * @author Datentechnik Innovation GmbH
+ *
+ */
+public abstract class PathPaintingOperatorProcessor extends OperatorProcessor {
+
+	public PathPaintingOperatorProcessor(PDFPage context) {
+		setContext(context);
+	}
+
+}
diff --git a/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/operator/path/construction/ClosePath.java b/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/operator/path/construction/ClosePath.java
index c663fb5d..48248f3b 100644
--- a/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/operator/path/construction/ClosePath.java
+++ b/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/operator/path/construction/ClosePath.java
@@ -1,67 +1,90 @@
-/**

- * <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.knowcenter.wag.egov.egiz.pdf.operator.path.construction;

-

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

-import at.knowcenter.wag.egov.egiz.pdf.operator.path.PathConstructionOperatorProcessor;

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

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

-import org.apache.pdfbox.util.PDFOperator;

-

-import java.io.IOException;

-import java.util.List;

-

-/**

- * Close the current subpath by appending a straight line segment from the current point to the starting point of the

- * subpath. If the current subpath is already closed, h shall donothing. This operator terminates the current subpath.

- * Appending another segment to the current path shall begin a new subpath, even if the new segment begins at the

- * endpoint reached by the h operation.

- *

- * @see "PDF 1.7 specification, Section 8.5.2 'Path Construction Operators'"

- * @author PdfBox, modified by Datentechnik Innovation GmbH

- */

-public class ClosePath extends PathConstructionOperatorProcessor {

-

-	private Log log = LogFactory.getLog(getClass());

-

-	public ClosePath(PDFPage context) {

-		super(context);

-	}

-

-	@Override

-	public void process(PDFOperator operator, List operands) throws IOException {

-		try {

-			PDFPage pdfPage = (PDFPage) context;

-

-			pdfPage.getCurrentPath().closePath();

-

-			if (log.isTraceEnabled()) {

-				log.trace("Closing current path.");

-			}

-		} catch (Exception e) {

-			log.warn("Error processing operator 'h'.", e);

-		}

-	}

-

-}

+/*******************************************************************************
+ * <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.knowcenter.wag.egov.egiz.pdf.operator.path.construction;
+
+import at.knowcenter.wag.egov.egiz.pdf.PDFPage;
+import at.knowcenter.wag.egov.egiz.pdf.operator.path.PathConstructionOperatorProcessor;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.pdfbox.util.PDFOperator;
+
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * Close the current subpath by appending a straight line segment from the current point to the starting point of the
+ * subpath. If the current subpath is already closed, h shall donothing. This operator terminates the current subpath.
+ * Appending another segment to the current path shall begin a new subpath, even if the new segment begins at the
+ * endpoint reached by the h operation.
+ *
+ * @see "PDF 1.7 specification, Section 8.5.2 'Path Construction Operators'"
+ * @author PdfBox, modified by Datentechnik Innovation GmbH
+ */
+public class ClosePath extends PathConstructionOperatorProcessor {
+
+	private Log log = LogFactory.getLog(getClass());
+
+	public ClosePath(PDFPage context) {
+		super(context);
+	}
+
+	@Override
+	public void process(PDFOperator operator, List operands) throws IOException {
+		try {
+			PDFPage pdfPage = (PDFPage) context;
+
+			pdfPage.getCurrentPath().closePath();
+
+			if (log.isTraceEnabled()) {
+				log.trace("Closing current path.");
+			}
+		} catch (Exception e) {
+			log.warn("Error processing operator 'h'.", e);
+		}
+	}
+
+}
diff --git a/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/operator/path/construction/CurveTo.java b/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/operator/path/construction/CurveTo.java
index 70f5ab20..982f72d8 100644
--- a/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/operator/path/construction/CurveTo.java
+++ b/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/operator/path/construction/CurveTo.java
@@ -1,84 +1,107 @@
-/**

- * <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.knowcenter.wag.egov.egiz.pdf.operator.path.construction;

-

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

-import at.knowcenter.wag.egov.egiz.pdf.operator.path.PathConstructionOperatorProcessor;

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

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

-import org.apache.pdfbox.cos.COSNumber;

-import org.apache.pdfbox.util.PDFOperator;

-

-import java.awt.geom.Point2D;

-import java.io.IOException;

-import java.util.List;

-

-/**

- * Append a cubic Bezier curve to the current path. The curve shall extend from the current point to the point (x3, y3),

- * using (x1, y1) and (x2, y2) as the Bezier control points (see 8.5.2.2, "Cubic Bezier Curves"). The new current point

- * shall be (x3, y3).

- *

- * @see "PDF 1.7 specification, Section 8.5.2 'Path Construction Operators'"

- * @author PdfBox, modified by Datentechnik Innovation GmbH

- */

-public class CurveTo extends PathConstructionOperatorProcessor {

-

-	private Log log = LogFactory.getLog(getClass());

-

-	public CurveTo(PDFPage context) {

-		super(context);

-	}

-

-	@Override

-	public void process(PDFOperator operator, List operands) throws IOException {

-		try {

-			PDFPage pdfPage = (PDFPage) context;

-

-			COSNumber x1 = (COSNumber) operands.get(0);

-			COSNumber y1 = (COSNumber) operands.get(1);

-			COSNumber x2 = (COSNumber) operands.get(2);

-			COSNumber y2 = (COSNumber) operands.get(3);

-			COSNumber x3 = (COSNumber) operands.get(4);

-			COSNumber y3 = (COSNumber) operands.get(5);

-

-			Point2D p1 = transform(x1.doubleValue(), y1.doubleValue());

-			Point2D p2 = transform(x2.doubleValue(), y2.doubleValue());

-			Point2D p3 = transform(x3.doubleValue(), y3.doubleValue());

-

-			pdfPage.getCurrentPath().curveTo(

-					(float) p1.getX(), (float) p1.getY(),

-					(float) p2.getX(), (float) p2.getY(),

-					(float) p3.getX(), (float) p3.getY()

-			);

-

-			if (log.isTraceEnabled()) {

-				log.trace("Appending cubic Bezier curve with x1:" + p1.getX() + ",y1:" + p1.getY() + ", x2:"

-						+ p2.getX() + ",y2:" + p2.getY() + ", x3:" + p3.getX() + ",y3:" + p3.getY());

-			}

-		} catch (Exception e) {

-			log.warn("Error processing operator 'c'.", e);

-		}

-	}

-

-}

+/*******************************************************************************
+ * <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.knowcenter.wag.egov.egiz.pdf.operator.path.construction;
+
+import at.knowcenter.wag.egov.egiz.pdf.PDFPage;
+import at.knowcenter.wag.egov.egiz.pdf.operator.path.PathConstructionOperatorProcessor;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.pdfbox.cos.COSNumber;
+import org.apache.pdfbox.util.PDFOperator;
+
+import java.awt.geom.Point2D;
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * Append a cubic Bezier curve to the current path. The curve shall extend from the current point to the point (x3, y3),
+ * using (x1, y1) and (x2, y2) as the Bezier control points (see 8.5.2.2, "Cubic Bezier Curves"). The new current point
+ * shall be (x3, y3).
+ *
+ * @see "PDF 1.7 specification, Section 8.5.2 'Path Construction Operators'"
+ * @author PdfBox, modified by Datentechnik Innovation GmbH
+ */
+public class CurveTo extends PathConstructionOperatorProcessor {
+
+	private Log log = LogFactory.getLog(getClass());
+
+	public CurveTo(PDFPage context) {
+		super(context);
+	}
+
+	@Override
+	public void process(PDFOperator operator, List operands) throws IOException {
+		try {
+			PDFPage pdfPage = (PDFPage) context;
+
+			COSNumber x1 = (COSNumber) operands.get(0);
+			COSNumber y1 = (COSNumber) operands.get(1);
+			COSNumber x2 = (COSNumber) operands.get(2);
+			COSNumber y2 = (COSNumber) operands.get(3);
+			COSNumber x3 = (COSNumber) operands.get(4);
+			COSNumber y3 = (COSNumber) operands.get(5);
+
+			Point2D p1 = transform(x1.doubleValue(), y1.doubleValue());
+			Point2D p2 = transform(x2.doubleValue(), y2.doubleValue());
+			Point2D p3 = transform(x3.doubleValue(), y3.doubleValue());
+
+			pdfPage.getCurrentPath().curveTo(
+					(float) p1.getX(), (float) p1.getY(),
+					(float) p2.getX(), (float) p2.getY(),
+					(float) p3.getX(), (float) p3.getY()
+			);
+
+			if (log.isTraceEnabled()) {
+				log.trace("Appending cubic Bezier curve with x1:" + p1.getX() + ",y1:" + p1.getY() + ", x2:"
+						+ p2.getX() + ",y2:" + p2.getY() + ", x3:" + p3.getX() + ",y3:" + p3.getY());
+			}
+		} catch (Exception e) {
+			log.warn("Error processing operator 'c'.", e);
+		}
+	}
+
+}
diff --git a/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/operator/path/construction/CurveToReplicateFinalPoint.java b/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/operator/path/construction/CurveToReplicateFinalPoint.java
index c6125751..8a467c7e 100644
--- a/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/operator/path/construction/CurveToReplicateFinalPoint.java
+++ b/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/operator/path/construction/CurveToReplicateFinalPoint.java
@@ -1,81 +1,104 @@
-/**

- * <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.knowcenter.wag.egov.egiz.pdf.operator.path.construction;

-

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

-import at.knowcenter.wag.egov.egiz.pdf.operator.path.PathConstructionOperatorProcessor;

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

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

-import org.apache.pdfbox.cos.COSNumber;

-import org.apache.pdfbox.util.PDFOperator;

-

-import java.awt.geom.Point2D;

-import java.io.IOException;

-import java.util.List;

-

-/**

- * Append a cubic Bezier curve to the current path. The curve shall extend from the current point to the point (x3, y3),

- * using (x1, y1) and (x3, y3) as the Bezier control points (see 8.5.2.2, "Cubic Bezier Curves"). The new current point

- * shall be (x3, y3).

- *

- * @see "PDF 1.7 specification, Section 8.5.2 'Path Construction Operators'"

- * @author PdfBox, modified by Datentechnik Innovation GmbH

- */

-public class CurveToReplicateFinalPoint extends PathConstructionOperatorProcessor {

-

-	private Log log = LogFactory.getLog(getClass());

-

-	public CurveToReplicateFinalPoint(PDFPage context) {

-		super(context);

-	}

-

-	@Override

-	public void process(PDFOperator operator, List operands) throws IOException {

-		try {

-			PDFPage pdfPage = (PDFPage) context;

-

-			COSNumber x1 = (COSNumber) operands.get(0);

-			COSNumber y1 = (COSNumber) operands.get(1);

-			COSNumber x3 = (COSNumber) operands.get(2);

-			COSNumber y3 = (COSNumber) operands.get(3);

-

-			Point2D p1 = transform(x1.doubleValue(), y1.doubleValue());

-			Point2D p3 = transform(x3.doubleValue(), y3.doubleValue());

-

-			pdfPage.getCurrentPath().curveTo(

-					(float) p1.getX(), (float) p1.getY(),

-					(float) p3.getX(), (float) p3.getY(),

-					(float) p3.getX(), (float) p3.getY()

-			);

-

-			if (log.isTraceEnabled()) {

-				log.trace("Appending cubic Bezier curve with x1:" + p1.getX() + ",y1:" + p1.getY() + ", x3:"

-						+ p3.getX() + ",y3:" + p3.getY());

-			}

-		} catch (Exception e) {

-			log.warn("Error processing operator 'y'.", e);

-		}

-	}

-

-}

+/*******************************************************************************
+ * <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.knowcenter.wag.egov.egiz.pdf.operator.path.construction;
+
+import at.knowcenter.wag.egov.egiz.pdf.PDFPage;
+import at.knowcenter.wag.egov.egiz.pdf.operator.path.PathConstructionOperatorProcessor;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.pdfbox.cos.COSNumber;
+import org.apache.pdfbox.util.PDFOperator;
+
+import java.awt.geom.Point2D;
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * Append a cubic Bezier curve to the current path. The curve shall extend from the current point to the point (x3, y3),
+ * using (x1, y1) and (x3, y3) as the Bezier control points (see 8.5.2.2, "Cubic Bezier Curves"). The new current point
+ * shall be (x3, y3).
+ *
+ * @see "PDF 1.7 specification, Section 8.5.2 'Path Construction Operators'"
+ * @author PdfBox, modified by Datentechnik Innovation GmbH
+ */
+public class CurveToReplicateFinalPoint extends PathConstructionOperatorProcessor {
+
+	private Log log = LogFactory.getLog(getClass());
+
+	public CurveToReplicateFinalPoint(PDFPage context) {
+		super(context);
+	}
+
+	@Override
+	public void process(PDFOperator operator, List operands) throws IOException {
+		try {
+			PDFPage pdfPage = (PDFPage) context;
+
+			COSNumber x1 = (COSNumber) operands.get(0);
+			COSNumber y1 = (COSNumber) operands.get(1);
+			COSNumber x3 = (COSNumber) operands.get(2);
+			COSNumber y3 = (COSNumber) operands.get(3);
+
+			Point2D p1 = transform(x1.doubleValue(), y1.doubleValue());
+			Point2D p3 = transform(x3.doubleValue(), y3.doubleValue());
+
+			pdfPage.getCurrentPath().curveTo(
+					(float) p1.getX(), (float) p1.getY(),
+					(float) p3.getX(), (float) p3.getY(),
+					(float) p3.getX(), (float) p3.getY()
+			);
+
+			if (log.isTraceEnabled()) {
+				log.trace("Appending cubic Bezier curve with x1:" + p1.getX() + ",y1:" + p1.getY() + ", x3:"
+						+ p3.getX() + ",y3:" + p3.getY());
+			}
+		} catch (Exception e) {
+			log.warn("Error processing operator 'y'.", e);
+		}
+	}
+
+}
diff --git a/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/operator/path/construction/CurveToReplicateInitialPoint.java b/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/operator/path/construction/CurveToReplicateInitialPoint.java
index 1479bc7d..e05be319 100644
--- a/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/operator/path/construction/CurveToReplicateInitialPoint.java
+++ b/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/operator/path/construction/CurveToReplicateInitialPoint.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.knowcenter.wag.egov.egiz.pdf.operator.path.construction;

-

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

-import at.knowcenter.wag.egov.egiz.pdf.operator.path.PathConstructionOperatorProcessor;

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

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

-import org.apache.pdfbox.cos.COSNumber;

-import org.apache.pdfbox.util.PDFOperator;

-

-import java.awt.geom.Point2D;

-import java.io.IOException;

-import java.util.List;

-

-/**

- * Append a cubic Bezier curve to the current path. The curve shall extend from the current point to the point (x3, y3),

- * using the current point and (x2, y2) as the Bezier control points (see 8.5.2.2, "Cubic Bezier Curves"). The new

- * current point shall be (x3, y3).

- *

- * @see "PDF 1.7 specification, Section 8.5.2 'Path Construction Operators'"

- * @author PdfBox, modified by Datentechnik Innovation GmbH

- */

-public class CurveToReplicateInitialPoint extends PathConstructionOperatorProcessor {

-

-	private Log log = LogFactory.getLog(getClass());

-

-	public CurveToReplicateInitialPoint(PDFPage context) {

-		super(context);

-	}

-

-	@Override

-	public void process(PDFOperator operator, List operands) throws IOException {

-		try {

-			PDFPage pdfPage = (PDFPage) context;

-

-			COSNumber x2 = (COSNumber) operands.get(0);

-			COSNumber y2 = (COSNumber) operands.get(1);

-			COSNumber x3 = (COSNumber) operands.get(2);

-			COSNumber y3 = (COSNumber) operands.get(3);

-

-	        Point2D currentPoint = pdfPage.getCurrentPath().getCurrentPoint();

-			Point2D p2 = transform(x2.doubleValue(), y2.doubleValue());

-			Point2D p3 = transform(x3.doubleValue(), y3.doubleValue());

-

-			pdfPage.getCurrentPath().curveTo(

-					(float)currentPoint.getX(), (float)currentPoint.getY(),

-					(float) p2.getX(), (float) p2.getY(),

-					(float) p3.getX(), (float) p3.getY()

-			);

-

-			if (log.isTraceEnabled()) {

-				log.trace("Appending cubic Bezier curve with x2:" + p2.getX() + ",y2:" + p2.getY() + ", x3:"

-						+ p3.getX() + ",y3:" + p3.getY() + ", using current point x:" + currentPoint.getX() + ",y:"

-						+ currentPoint.getY());

-			}

-		} catch (Exception e) {

-			log.warn("Error processing operator 'v'.", e);

-		}

-	}

-

-}

+/*******************************************************************************
+ * <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.knowcenter.wag.egov.egiz.pdf.operator.path.construction;
+
+import at.knowcenter.wag.egov.egiz.pdf.PDFPage;
+import at.knowcenter.wag.egov.egiz.pdf.operator.path.PathConstructionOperatorProcessor;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.pdfbox.cos.COSNumber;
+import org.apache.pdfbox.util.PDFOperator;
+
+import java.awt.geom.Point2D;
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * Append a cubic Bezier curve to the current path. The curve shall extend from the current point to the point (x3, y3),
+ * using the current point and (x2, y2) as the Bezier control points (see 8.5.2.2, "Cubic Bezier Curves"). The new
+ * current point shall be (x3, y3).
+ *
+ * @see "PDF 1.7 specification, Section 8.5.2 'Path Construction Operators'"
+ * @author PdfBox, modified by Datentechnik Innovation GmbH
+ */
+public class CurveToReplicateInitialPoint extends PathConstructionOperatorProcessor {
+
+	private Log log = LogFactory.getLog(getClass());
+
+	public CurveToReplicateInitialPoint(PDFPage context) {
+		super(context);
+	}
+
+	@Override
+	public void process(PDFOperator operator, List operands) throws IOException {
+		try {
+			PDFPage pdfPage = (PDFPage) context;
+
+			COSNumber x2 = (COSNumber) operands.get(0);
+			COSNumber y2 = (COSNumber) operands.get(1);
+			COSNumber x3 = (COSNumber) operands.get(2);
+			COSNumber y3 = (COSNumber) operands.get(3);
+
+	        Point2D currentPoint = pdfPage.getCurrentPath().getCurrentPoint();
+			Point2D p2 = transform(x2.doubleValue(), y2.doubleValue());
+			Point2D p3 = transform(x3.doubleValue(), y3.doubleValue());
+
+			pdfPage.getCurrentPath().curveTo(
+					(float)currentPoint.getX(), (float)currentPoint.getY(),
+					(float) p2.getX(), (float) p2.getY(),
+					(float) p3.getX(), (float) p3.getY()
+			);
+
+			if (log.isTraceEnabled()) {
+				log.trace("Appending cubic Bezier curve with x2:" + p2.getX() + ",y2:" + p2.getY() + ", x3:"
+						+ p3.getX() + ",y3:" + p3.getY() + ", using current point x:" + currentPoint.getX() + ",y:"
+						+ currentPoint.getY());
+			}
+		} catch (Exception e) {
+			log.warn("Error processing operator 'v'.", e);
+		}
+	}
+
+}
diff --git a/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/operator/path/construction/LineTo.java b/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/operator/path/construction/LineTo.java
index 94f16b7f..872cbede 100644
--- a/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/operator/path/construction/LineTo.java
+++ b/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/operator/path/construction/LineTo.java
@@ -1,70 +1,93 @@
-/**

- * <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.knowcenter.wag.egov.egiz.pdf.operator.path.construction;

-

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

-import at.knowcenter.wag.egov.egiz.pdf.operator.path.PathConstructionOperatorProcessor;

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

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

-import org.apache.pdfbox.cos.COSNumber;

-import org.apache.pdfbox.util.PDFOperator;

-

-import java.awt.geom.Point2D;

-import java.io.IOException;

-import java.util.List;

-

-/**

- * Append a straight line segment from the current point to the point (x, y). The new current point shall be (x, y).

- *

- * @see "PDF 1.7 specification, Section 8.5.2 'Path Construction Operators'"

- * @author PdfBox, modified by Datentechnik Innovation GmbH

- */

-public class LineTo extends PathConstructionOperatorProcessor {

-

-	private Log log = LogFactory.getLog(getClass());

-

-	public LineTo(PDFPage context) {

-		super(context);

-	}

-

-	@Override

-	public void process(PDFOperator operator, List operands) throws IOException {

-		try {

-			PDFPage pdfPage = (PDFPage) context;

-

-			COSNumber x = (COSNumber) operands.get(0);

-			COSNumber y = (COSNumber) operands.get(1);

-			Point2D p = transform(x.doubleValue(), y.doubleValue());

-

-			pdfPage.getCurrentPath().lineTo((float) p.getX(), (float) p.getY());

-

-			if (log.isTraceEnabled()) {

-				log.trace("Adding line to x:" + p.getX() + ",y:" + p.getY());

-			}

-		} catch (Exception e) {

-			log.warn("Error processing operator 'l'.", e);

-		}

-	}

-

-}

+/*******************************************************************************
+ * <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.knowcenter.wag.egov.egiz.pdf.operator.path.construction;
+
+import at.knowcenter.wag.egov.egiz.pdf.PDFPage;
+import at.knowcenter.wag.egov.egiz.pdf.operator.path.PathConstructionOperatorProcessor;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.pdfbox.cos.COSNumber;
+import org.apache.pdfbox.util.PDFOperator;
+
+import java.awt.geom.Point2D;
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * Append a straight line segment from the current point to the point (x, y). The new current point shall be (x, y).
+ *
+ * @see "PDF 1.7 specification, Section 8.5.2 'Path Construction Operators'"
+ * @author PdfBox, modified by Datentechnik Innovation GmbH
+ */
+public class LineTo extends PathConstructionOperatorProcessor {
+
+	private Log log = LogFactory.getLog(getClass());
+
+	public LineTo(PDFPage context) {
+		super(context);
+	}
+
+	@Override
+	public void process(PDFOperator operator, List operands) throws IOException {
+		try {
+			PDFPage pdfPage = (PDFPage) context;
+
+			COSNumber x = (COSNumber) operands.get(0);
+			COSNumber y = (COSNumber) operands.get(1);
+			Point2D p = transform(x.doubleValue(), y.doubleValue());
+
+			pdfPage.getCurrentPath().lineTo((float) p.getX(), (float) p.getY());
+
+			if (log.isTraceEnabled()) {
+				log.trace("Adding line to x:" + p.getX() + ",y:" + p.getY());
+			}
+		} catch (Exception e) {
+			log.warn("Error processing operator 'l'.", e);
+		}
+	}
+
+}
diff --git a/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/operator/path/construction/MoveTo.java b/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/operator/path/construction/MoveTo.java
index 97424e93..2b7275e4 100644
--- a/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/operator/path/construction/MoveTo.java
+++ b/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/operator/path/construction/MoveTo.java
@@ -1,72 +1,95 @@
-/**

- * <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.knowcenter.wag.egov.egiz.pdf.operator.path.construction;

-

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

-import at.knowcenter.wag.egov.egiz.pdf.operator.path.PathConstructionOperatorProcessor;

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

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

-import org.apache.pdfbox.cos.COSNumber;

-import org.apache.pdfbox.util.PDFOperator;

-

-import java.awt.geom.Point2D;

-import java.io.IOException;

-import java.util.List;

-

-/**

- * Begin a new subpath by moving the current point to coordinates (x, y), omitting any connecting line segment. If the

- * previous path construction operator in the current path was also m, the new m overrides it; no vestige of the

- * previous m operation remains in the path.

- *

- * @see "PDF 1.7 specification, Section 8.5.2 'Path Construction Operators'"

- * @author PdfBox, modified by Datentechnik Innovation GmbH

- */

-public class MoveTo extends PathConstructionOperatorProcessor {

-

-	private Log log = LogFactory.getLog(getClass());

-

-	public MoveTo(PDFPage context) {

-		super(context);

-	}

-

-	@Override

-	public void process(PDFOperator operator, List operands) throws IOException {

-		try {

-			PDFPage pdfPage = (PDFPage) context;

-

-			COSNumber x = (COSNumber) operands.get(0);

-			COSNumber y = (COSNumber) operands.get(1);

-			Point2D p = transform(x.doubleValue(), y.doubleValue());

-

-			pdfPage.getCurrentPath().moveTo((float) p.getX(), (float) p.getY());

-

-			if (log.isTraceEnabled()) {

-				log.trace("Moving current path to x:" + p.getX() + ",y:" + p.getY());

-			}

-		} catch (Exception e) {

-			log.warn("Error processing operator 'm'.", e);

-		}

-	}

-

-}

+/*******************************************************************************
+ * <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.knowcenter.wag.egov.egiz.pdf.operator.path.construction;
+
+import at.knowcenter.wag.egov.egiz.pdf.PDFPage;
+import at.knowcenter.wag.egov.egiz.pdf.operator.path.PathConstructionOperatorProcessor;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.pdfbox.cos.COSNumber;
+import org.apache.pdfbox.util.PDFOperator;
+
+import java.awt.geom.Point2D;
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * Begin a new subpath by moving the current point to coordinates (x, y), omitting any connecting line segment. If the
+ * previous path construction operator in the current path was also m, the new m overrides it; no vestige of the
+ * previous m operation remains in the path.
+ *
+ * @see "PDF 1.7 specification, Section 8.5.2 'Path Construction Operators'"
+ * @author PdfBox, modified by Datentechnik Innovation GmbH
+ */
+public class MoveTo extends PathConstructionOperatorProcessor {
+
+	private Log log = LogFactory.getLog(getClass());
+
+	public MoveTo(PDFPage context) {
+		super(context);
+	}
+
+	@Override
+	public void process(PDFOperator operator, List operands) throws IOException {
+		try {
+			PDFPage pdfPage = (PDFPage) context;
+
+			COSNumber x = (COSNumber) operands.get(0);
+			COSNumber y = (COSNumber) operands.get(1);
+			Point2D p = transform(x.doubleValue(), y.doubleValue());
+
+			pdfPage.getCurrentPath().moveTo((float) p.getX(), (float) p.getY());
+
+			if (log.isTraceEnabled()) {
+				log.trace("Moving current path to x:" + p.getX() + ",y:" + p.getY());
+			}
+		} catch (Exception e) {
+			log.warn("Error processing operator 'm'.", e);
+		}
+	}
+
+}
diff --git a/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/operator/path/painting/CloseAndStrokePath.java b/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/operator/path/painting/CloseAndStrokePath.java
index 5a8de9d0..78f2369c 100644
--- a/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/operator/path/painting/CloseAndStrokePath.java
+++ b/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/operator/path/painting/CloseAndStrokePath.java
@@ -1,58 +1,81 @@
-/**

- * <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.knowcenter.wag.egov.egiz.pdf.operator.path.painting;

-

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

-import at.knowcenter.wag.egov.egiz.pdf.operator.path.PathPaintingOperatorProcessor;

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

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

-import org.apache.pdfbox.util.PDFOperator;

-

-import java.io.IOException;

-import java.util.List;

-

-/**

- * Close and stroke the path. This operator shall have the same effect as the sequence <code>h S</code>.

- *

- * @see "PDF 1.7 specification, Section 8.5.3 'Path-Painting Operators'"

- * @author PdfBox, modified by Datentechnik Innovation GmbH

- */

-public class CloseAndStrokePath extends PathPaintingOperatorProcessor {

-

-	private Log log = LogFactory.getLog(getClass());

-

-	public CloseAndStrokePath(PDFPage context) {

-		super(context);

-	}

-

-	@Override

-	public void process(PDFOperator operator, List operands) throws IOException {

-		if (log.isTraceEnabled()) {

-			log.trace("Closing and stroking path.");

-		}

-		context.processOperator("h", operands);

-		context.processOperator("S", operands);

-	}

-

-}

+/*******************************************************************************
+ * <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.knowcenter.wag.egov.egiz.pdf.operator.path.painting;
+
+import at.knowcenter.wag.egov.egiz.pdf.PDFPage;
+import at.knowcenter.wag.egov.egiz.pdf.operator.path.PathPaintingOperatorProcessor;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.pdfbox.util.PDFOperator;
+
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * Close and stroke the path. This operator shall have the same effect as the sequence <code>h S</code>.
+ *
+ * @see "PDF 1.7 specification, Section 8.5.3 'Path-Painting Operators'"
+ * @author PdfBox, modified by Datentechnik Innovation GmbH
+ */
+public class CloseAndStrokePath extends PathPaintingOperatorProcessor {
+
+	private Log log = LogFactory.getLog(getClass());
+
+	public CloseAndStrokePath(PDFPage context) {
+		super(context);
+	}
+
+	@Override
+	public void process(PDFOperator operator, List operands) throws IOException {
+		if (log.isTraceEnabled()) {
+			log.trace("Closing and stroking path.");
+		}
+		context.processOperator("h", operands);
+		context.processOperator("S", operands);
+	}
+
+}
diff --git a/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/operator/path/painting/CloseFillEvenOddAndStrokePath.java b/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/operator/path/painting/CloseFillEvenOddAndStrokePath.java
index bdaaaa4a..3c8b55a9 100644
--- a/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/operator/path/painting/CloseFillEvenOddAndStrokePath.java
+++ b/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/operator/path/painting/CloseFillEvenOddAndStrokePath.java
@@ -1,59 +1,82 @@
-/**

- * <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.knowcenter.wag.egov.egiz.pdf.operator.path.painting;

-

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

-import at.knowcenter.wag.egov.egiz.pdf.operator.path.PathPaintingOperatorProcessor;

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

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

-import org.apache.pdfbox.util.PDFOperator;

-

-import java.io.IOException;

-import java.util.List;

-

-/**

- * Close, fill, and then stroke the path, using the even-odd rule to determine the region to fill. This operator shall

- * have the same effect as the sequence <code>h B*</code>.

- *

- * @see "PDF 1.7 specification, Section 8.5.3 'Path-Painting Operators'"

- * @author PdfBox, modified by Datentechnik Innovation GmbH

- */

-public class CloseFillEvenOddAndStrokePath extends PathPaintingOperatorProcessor {

-

-	private Log log = LogFactory.getLog(getClass());

-

-	public CloseFillEvenOddAndStrokePath(PDFPage context) {

-		super(context);

-	}

-

-	@Override

-	public void process(PDFOperator operator, List operands) throws IOException {

-		if (log.isTraceEnabled()) {

-			log.trace("Closing, filling (even odd rule) and stroking path.");

-		}

-		context.processOperator("h", operands);

-		context.processOperator("B*", operands);

-	}

-

-}

+/*******************************************************************************
+ * <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.knowcenter.wag.egov.egiz.pdf.operator.path.painting;
+
+import at.knowcenter.wag.egov.egiz.pdf.PDFPage;
+import at.knowcenter.wag.egov.egiz.pdf.operator.path.PathPaintingOperatorProcessor;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.pdfbox.util.PDFOperator;
+
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * Close, fill, and then stroke the path, using the even-odd rule to determine the region to fill. This operator shall
+ * have the same effect as the sequence <code>h B*</code>.
+ *
+ * @see "PDF 1.7 specification, Section 8.5.3 'Path-Painting Operators'"
+ * @author PdfBox, modified by Datentechnik Innovation GmbH
+ */
+public class CloseFillEvenOddAndStrokePath extends PathPaintingOperatorProcessor {
+
+	private Log log = LogFactory.getLog(getClass());
+
+	public CloseFillEvenOddAndStrokePath(PDFPage context) {
+		super(context);
+	}
+
+	@Override
+	public void process(PDFOperator operator, List operands) throws IOException {
+		if (log.isTraceEnabled()) {
+			log.trace("Closing, filling (even odd rule) and stroking path.");
+		}
+		context.processOperator("h", operands);
+		context.processOperator("B*", operands);
+	}
+
+}
diff --git a/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/operator/path/painting/CloseFillNonZeroAndStrokePath.java b/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/operator/path/painting/CloseFillNonZeroAndStrokePath.java
index 4d4f3b68..529ad6c6 100644
--- a/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/operator/path/painting/CloseFillNonZeroAndStrokePath.java
+++ b/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/operator/path/painting/CloseFillNonZeroAndStrokePath.java
@@ -1,59 +1,82 @@
-/**

- * <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.knowcenter.wag.egov.egiz.pdf.operator.path.painting;

-

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

-import at.knowcenter.wag.egov.egiz.pdf.operator.path.PathPaintingOperatorProcessor;

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

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

-import org.apache.pdfbox.util.PDFOperator;

-

-import java.io.IOException;

-import java.util.List;

-

-/**

- * Close, fill, and then stroke the path, using the nonzero winding number rule to determine the region to fill. This

- * operator shall have the same effect as the sequence <code>h B</code>.

- *

- * @see "PDF 1.7 specification, Section 8.5.3 'Path-Painting Operators'"

- * @author PdfBox, modified by Datentechnik Innovation GmbH

- */

-public class CloseFillNonZeroAndStrokePath extends PathPaintingOperatorProcessor {

-

-	private Log log = LogFactory.getLog(getClass());

-

-	public CloseFillNonZeroAndStrokePath(PDFPage context) {

-		super(context);

-	}

-

-	@Override

-	public void process(PDFOperator operator, List operands) throws IOException {

-		if (log.isTraceEnabled()) {

-			log.trace("Closing, filling (non zero rule) and stroking path.");

-		}

-		context.processOperator("h", operands);

-		context.processOperator("B", operands);

-	}

-

-}

+/*******************************************************************************
+ * <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.knowcenter.wag.egov.egiz.pdf.operator.path.painting;
+
+import at.knowcenter.wag.egov.egiz.pdf.PDFPage;
+import at.knowcenter.wag.egov.egiz.pdf.operator.path.PathPaintingOperatorProcessor;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.pdfbox.util.PDFOperator;
+
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * Close, fill, and then stroke the path, using the nonzero winding number rule to determine the region to fill. This
+ * operator shall have the same effect as the sequence <code>h B</code>.
+ *
+ * @see "PDF 1.7 specification, Section 8.5.3 'Path-Painting Operators'"
+ * @author PdfBox, modified by Datentechnik Innovation GmbH
+ */
+public class CloseFillNonZeroAndStrokePath extends PathPaintingOperatorProcessor {
+
+	private Log log = LogFactory.getLog(getClass());
+
+	public CloseFillNonZeroAndStrokePath(PDFPage context) {
+		super(context);
+	}
+
+	@Override
+	public void process(PDFOperator operator, List operands) throws IOException {
+		if (log.isTraceEnabled()) {
+			log.trace("Closing, filling (non zero rule) and stroking path.");
+		}
+		context.processOperator("h", operands);
+		context.processOperator("B", operands);
+	}
+
+}
diff --git a/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/operator/path/painting/EndPath.java b/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/operator/path/painting/EndPath.java
index 291175aa..0812c3e4 100644
--- a/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/operator/path/painting/EndPath.java
+++ b/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/operator/path/painting/EndPath.java
@@ -1,67 +1,90 @@
-/**

- * <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.knowcenter.wag.egov.egiz.pdf.operator.path.painting;

-

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

-import at.knowcenter.wag.egov.egiz.pdf.operator.path.PathPaintingOperatorProcessor;

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

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

-import org.apache.pdfbox.util.PDFOperator;

-

-import java.io.IOException;

-import java.util.List;

-

-/**

- * End the path object without filling or stroking it. This operator shall be a path-painting no-op, used primarily for

- * the side effect of changing the current clipping path.

- *

- * @see "PDF 1.7 specification, Section 8.5.3 'Path-Painting Operators'"

- * @author PdfBox, modified by Datentechnik Innovation GmbH

- */

-public class EndPath extends PathPaintingOperatorProcessor {

-

-	private Log log = LogFactory.getLog(getClass());

-

-	public EndPath(PDFPage context) {

-		super(context);

-	}

-

-	@Override

-	public void process(PDFOperator operator, List operands) throws IOException {

-		try {

-			PDFPage pdfPage = (PDFPage) context;

-

-			log.debug("Ending path " + pdfPage.getCurrentPath());

-			pdfPage.getCurrentPath().reset();

-

-			if (log.isTraceEnabled()) {

-				log.trace("End path without filling or stroking.");

-			}

-

-		} catch (Exception e) {

-			log.warn("Error processing operator 'n'.", e);

-		}

-	}

-

-}

+/*******************************************************************************
+ * <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.knowcenter.wag.egov.egiz.pdf.operator.path.painting;
+
+import at.knowcenter.wag.egov.egiz.pdf.PDFPage;
+import at.knowcenter.wag.egov.egiz.pdf.operator.path.PathPaintingOperatorProcessor;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.pdfbox.util.PDFOperator;
+
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * End the path object without filling or stroking it. This operator shall be a path-painting no-op, used primarily for
+ * the side effect of changing the current clipping path.
+ *
+ * @see "PDF 1.7 specification, Section 8.5.3 'Path-Painting Operators'"
+ * @author PdfBox, modified by Datentechnik Innovation GmbH
+ */
+public class EndPath extends PathPaintingOperatorProcessor {
+
+	private Log log = LogFactory.getLog(getClass());
+
+	public EndPath(PDFPage context) {
+		super(context);
+	}
+
+	@Override
+	public void process(PDFOperator operator, List operands) throws IOException {
+		try {
+			PDFPage pdfPage = (PDFPage) context;
+
+			log.debug("Ending path " + pdfPage.getCurrentPath());
+			pdfPage.getCurrentPath().reset();
+
+			if (log.isTraceEnabled()) {
+				log.trace("End path without filling or stroking.");
+			}
+
+		} catch (Exception e) {
+			log.warn("Error processing operator 'n'.", e);
+		}
+	}
+
+}
diff --git a/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/operator/path/painting/FillEvenOddAndStrokePath.java b/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/operator/path/painting/FillEvenOddAndStrokePath.java
index b1e836d5..f03bc31f 100644
--- a/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/operator/path/painting/FillEvenOddAndStrokePath.java
+++ b/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/operator/path/painting/FillEvenOddAndStrokePath.java
@@ -1,71 +1,94 @@
-/**

- * <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.knowcenter.wag.egov.egiz.pdf.operator.path.painting;

-

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

-import at.knowcenter.wag.egov.egiz.pdf.operator.path.PathPaintingOperatorProcessor;

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

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

-import org.apache.pdfbox.util.PDFOperator;

-

-import java.awt.geom.GeneralPath;

-import java.io.IOException;

-import java.util.List;

-

-/**

- * Fill and then stroke the path, using the even-odd rule to determine the region to fill. This operator shall produce

- * the same result as <code>B</code>, except that the path is filled as if with <code>f*</code> instead of

- * <code>f</code>.

- *

- * @see "PDF 1.7 specification, Section 8.5.3 'Path-Painting Operators'"

- * @author PdfBox, modified by Datentechnik Innovation GmbH

- */

-public class FillEvenOddAndStrokePath extends PathPaintingOperatorProcessor {

-

-	private Log log = LogFactory.getLog(getClass());

-

-	public FillEvenOddAndStrokePath(PDFPage context) {

-		super(context);

-	}

-

-	@Override

-	public void process(PDFOperator operator, List operands) throws IOException {

-		try {

-			PDFPage pdfPage = (PDFPage) context;

-

-			if (log.isTraceEnabled()) {

-				log.trace("Filling (even odd rule) and stroking path.");

-			}

-

-			GeneralPath currentPath = (GeneralPath) pdfPage.getCurrentPath().clone();

-			context.processOperator("f*", operands);

-			pdfPage.setCurrentPath(currentPath);

-			context.processOperator("S", operands);

-

-		} catch (Exception e) {

-			log.warn("Error processing operator 'B*'.", e);

-		}

-	}

-

-}

+/*******************************************************************************
+ * <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.knowcenter.wag.egov.egiz.pdf.operator.path.painting;
+
+import at.knowcenter.wag.egov.egiz.pdf.PDFPage;
+import at.knowcenter.wag.egov.egiz.pdf.operator.path.PathPaintingOperatorProcessor;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.pdfbox.util.PDFOperator;
+
+import java.awt.geom.GeneralPath;
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * Fill and then stroke the path, using the even-odd rule to determine the region to fill. This operator shall produce
+ * the same result as <code>B</code>, except that the path is filled as if with <code>f*</code> instead of
+ * <code>f</code>.
+ *
+ * @see "PDF 1.7 specification, Section 8.5.3 'Path-Painting Operators'"
+ * @author PdfBox, modified by Datentechnik Innovation GmbH
+ */
+public class FillEvenOddAndStrokePath extends PathPaintingOperatorProcessor {
+
+	private Log log = LogFactory.getLog(getClass());
+
+	public FillEvenOddAndStrokePath(PDFPage context) {
+		super(context);
+	}
+
+	@Override
+	public void process(PDFOperator operator, List operands) throws IOException {
+		try {
+			PDFPage pdfPage = (PDFPage) context;
+
+			if (log.isTraceEnabled()) {
+				log.trace("Filling (even odd rule) and stroking path.");
+			}
+
+			GeneralPath currentPath = (GeneralPath) pdfPage.getCurrentPath().clone();
+			context.processOperator("f*", operands);
+			pdfPage.setCurrentPath(currentPath);
+			context.processOperator("S", operands);
+
+		} catch (Exception e) {
+			log.warn("Error processing operator 'B*'.", e);
+		}
+	}
+
+}
diff --git a/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/operator/path/painting/FillNonZeroAndStrokePath.java b/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/operator/path/painting/FillNonZeroAndStrokePath.java
index 72719ec3..911169a9 100644
--- a/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/operator/path/painting/FillNonZeroAndStrokePath.java
+++ b/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/operator/path/painting/FillNonZeroAndStrokePath.java
@@ -1,71 +1,94 @@
-/**

- * <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.knowcenter.wag.egov.egiz.pdf.operator.path.painting;

-

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

-import at.knowcenter.wag.egov.egiz.pdf.operator.path.PathPaintingOperatorProcessor;

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

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

-import org.apache.pdfbox.util.PDFOperator;

-

-import java.awt.geom.GeneralPath;

-import java.io.IOException;

-import java.util.List;

-

-/**

- * Fill and then stroke the path, using the nonzero winding number rule to determine the region to fill. This operator

- * shall produce the same result as constructing two identical path objects, painting the first with <code>f</code> and

- * the second with <code>S</code>.

- *

- * @see "PDF 1.7 specification, Section 8.5.3 'Path-Painting Operators'"

- * @author PdfBox, modified by Datentechnik Innovation GmbH

- */

-public class FillNonZeroAndStrokePath extends PathPaintingOperatorProcessor {

-

-	private Log log = LogFactory.getLog(getClass());

-

-	public FillNonZeroAndStrokePath(PDFPage context) {

-		super(context);

-	}

-

-	@Override

-	public void process(PDFOperator operator, List operands) throws IOException {

-		try {

-			PDFPage pdfPage = (PDFPage) context;

-

-			if (log.isTraceEnabled()) {

-				log.trace("Filling (non zero rule) and stroking path.");

-			}

-

-			GeneralPath currentPath = (GeneralPath) pdfPage.getCurrentPath().clone();

-			context.processOperator("f", operands);

-			pdfPage.setCurrentPath(currentPath);

-			context.processOperator("S", operands);

-

-		} catch (Exception e) {

-			log.warn("Error processing operator 'B'.", e);

-		}

-	}

-

-}

+/*******************************************************************************
+ * <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.knowcenter.wag.egov.egiz.pdf.operator.path.painting;
+
+import at.knowcenter.wag.egov.egiz.pdf.PDFPage;
+import at.knowcenter.wag.egov.egiz.pdf.operator.path.PathPaintingOperatorProcessor;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.pdfbox.util.PDFOperator;
+
+import java.awt.geom.GeneralPath;
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * Fill and then stroke the path, using the nonzero winding number rule to determine the region to fill. This operator
+ * shall produce the same result as constructing two identical path objects, painting the first with <code>f</code> and
+ * the second with <code>S</code>.
+ *
+ * @see "PDF 1.7 specification, Section 8.5.3 'Path-Painting Operators'"
+ * @author PdfBox, modified by Datentechnik Innovation GmbH
+ */
+public class FillNonZeroAndStrokePath extends PathPaintingOperatorProcessor {
+
+	private Log log = LogFactory.getLog(getClass());
+
+	public FillNonZeroAndStrokePath(PDFPage context) {
+		super(context);
+	}
+
+	@Override
+	public void process(PDFOperator operator, List operands) throws IOException {
+		try {
+			PDFPage pdfPage = (PDFPage) context;
+
+			if (log.isTraceEnabled()) {
+				log.trace("Filling (non zero rule) and stroking path.");
+			}
+
+			GeneralPath currentPath = (GeneralPath) pdfPage.getCurrentPath().clone();
+			context.processOperator("f", operands);
+			pdfPage.setCurrentPath(currentPath);
+			context.processOperator("S", operands);
+
+		} catch (Exception e) {
+			log.warn("Error processing operator 'B'.", e);
+		}
+	}
+
+}
diff --git a/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/operator/path/painting/FillPathEvenOddRule.java b/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/operator/path/painting/FillPathEvenOddRule.java
index 28343c5a..7a20b52e 100644
--- a/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/operator/path/painting/FillPathEvenOddRule.java
+++ b/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/operator/path/painting/FillPathEvenOddRule.java
@@ -1,70 +1,93 @@
-/**

- * <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.knowcenter.wag.egov.egiz.pdf.operator.path.painting;

-

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

-import at.knowcenter.wag.egov.egiz.pdf.operator.path.PathPaintingOperatorProcessor;

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

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

-import org.apache.pdfbox.util.PDFOperator;

-

-import java.awt.*;

-import java.io.IOException;

-import java.util.List;

-

-/**

- * Fill the path, using the even-odd rule to determine the region to fill.

- *

- * @see "PDF 1.7 specification, Section 8.5.3 'Path-Painting Operators'"

- * @author PdfBox, modified by Datentechnik Innovation GmbH

- */

-public class FillPathEvenOddRule extends PathPaintingOperatorProcessor {

-

-	private Log log = LogFactory.getLog(getClass());

-

-	public FillPathEvenOddRule(PDFPage context) {

-		super(context);

-	}

-

-	@Override

-	public void process(PDFOperator operator, List operands) throws IOException {

-		try {

-			PDFPage pdfPage = (PDFPage) context;

-

-			pdfPage.getCurrentPath().setWindingRule(java.awt.geom.GeneralPath.WIND_EVEN_ODD);

-			Rectangle bounds = pdfPage.getCurrentPath().getBounds();

-			pdfPage.getCurrentPath().reset();

-

-			if (log.isTraceEnabled()) {

-				log.trace("Filling path, using even-odd rule.");

-			}

-

-			pdfPage.registerPathBounds(bounds);

-

-		} catch (Exception e) {

-			log.warn("Error processing operator 'f*'.", e);

-		}

-	}

-

-}

+/*******************************************************************************
+ * <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.knowcenter.wag.egov.egiz.pdf.operator.path.painting;
+
+import at.knowcenter.wag.egov.egiz.pdf.PDFPage;
+import at.knowcenter.wag.egov.egiz.pdf.operator.path.PathPaintingOperatorProcessor;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.pdfbox.util.PDFOperator;
+
+import java.awt.*;
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * Fill the path, using the even-odd rule to determine the region to fill.
+ *
+ * @see "PDF 1.7 specification, Section 8.5.3 'Path-Painting Operators'"
+ * @author PdfBox, modified by Datentechnik Innovation GmbH
+ */
+public class FillPathEvenOddRule extends PathPaintingOperatorProcessor {
+
+	private Log log = LogFactory.getLog(getClass());
+
+	public FillPathEvenOddRule(PDFPage context) {
+		super(context);
+	}
+
+	@Override
+	public void process(PDFOperator operator, List operands) throws IOException {
+		try {
+			PDFPage pdfPage = (PDFPage) context;
+
+			pdfPage.getCurrentPath().setWindingRule(java.awt.geom.GeneralPath.WIND_EVEN_ODD);
+			Rectangle bounds = pdfPage.getCurrentPath().getBounds();
+			pdfPage.getCurrentPath().reset();
+
+			if (log.isTraceEnabled()) {
+				log.trace("Filling path, using even-odd rule.");
+			}
+
+			pdfPage.registerPathBounds(bounds);
+
+		} catch (Exception e) {
+			log.warn("Error processing operator 'f*'.", e);
+		}
+	}
+
+}
diff --git a/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/operator/path/painting/FillPathNonZeroWindingNumberRule.java b/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/operator/path/painting/FillPathNonZeroWindingNumberRule.java
index 28e5c373..4a2f4ff9 100644
--- a/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/operator/path/painting/FillPathNonZeroWindingNumberRule.java
+++ b/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/operator/path/painting/FillPathNonZeroWindingNumberRule.java
@@ -1,71 +1,94 @@
-/**

- * <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.knowcenter.wag.egov.egiz.pdf.operator.path.painting;

-

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

-import at.knowcenter.wag.egov.egiz.pdf.operator.path.PathPaintingOperatorProcessor;

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

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

-import org.apache.pdfbox.util.PDFOperator;

-

-import java.awt.*;

-import java.io.IOException;

-import java.util.List;

-

-/**

- * Fill the path, using the nonzero winding number rule to determine the region to fill. Any subpaths that are open

- * shall be implicitly closed before being filled.

- *

- * @see "PDF 1.7 specification, Section 8.5.3 'Path-Painting Operators'"

- * @author PdfBox, modified by Datentechnik Innovation GmbH

- */

-public class FillPathNonZeroWindingNumberRule extends PathPaintingOperatorProcessor {

-

-	private Log log = LogFactory.getLog(getClass());

-

-	public FillPathNonZeroWindingNumberRule(PDFPage context) {

-		super(context);

-	}

-

-	@Override

-	public void process(PDFOperator operator, List operands) throws IOException {

-		try {

-			PDFPage pdfPage = (PDFPage) context;

-

-			pdfPage.getCurrentPath().setWindingRule(java.awt.geom.GeneralPath.WIND_NON_ZERO);

-			Rectangle bounds = pdfPage.getCurrentPath().getBounds();

-			pdfPage.getCurrentPath().reset();

-

-			if (log.isTraceEnabled()) {

-				log.trace("Filling path, using nonzero winding number rule.");

-			}

-

-			pdfPage.registerPathBounds(bounds);

-

-		} catch (Exception e) {

-			log.warn("Error processing operator 'f/F'.", e);

-		}

-	}

-

-}

+/*******************************************************************************
+ * <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.knowcenter.wag.egov.egiz.pdf.operator.path.painting;
+
+import at.knowcenter.wag.egov.egiz.pdf.PDFPage;
+import at.knowcenter.wag.egov.egiz.pdf.operator.path.PathPaintingOperatorProcessor;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.pdfbox.util.PDFOperator;
+
+import java.awt.*;
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * Fill the path, using the nonzero winding number rule to determine the region to fill. Any subpaths that are open
+ * shall be implicitly closed before being filled.
+ *
+ * @see "PDF 1.7 specification, Section 8.5.3 'Path-Painting Operators'"
+ * @author PdfBox, modified by Datentechnik Innovation GmbH
+ */
+public class FillPathNonZeroWindingNumberRule extends PathPaintingOperatorProcessor {
+
+	private Log log = LogFactory.getLog(getClass());
+
+	public FillPathNonZeroWindingNumberRule(PDFPage context) {
+		super(context);
+	}
+
+	@Override
+	public void process(PDFOperator operator, List operands) throws IOException {
+		try {
+			PDFPage pdfPage = (PDFPage) context;
+
+			pdfPage.getCurrentPath().setWindingRule(java.awt.geom.GeneralPath.WIND_NON_ZERO);
+			Rectangle bounds = pdfPage.getCurrentPath().getBounds();
+			pdfPage.getCurrentPath().reset();
+
+			if (log.isTraceEnabled()) {
+				log.trace("Filling path, using nonzero winding number rule.");
+			}
+
+			pdfPage.registerPathBounds(bounds);
+
+		} catch (Exception e) {
+			log.warn("Error processing operator 'f/F'.", e);
+		}
+	}
+
+}
diff --git a/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/operator/path/painting/StrokePath.java b/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/operator/path/painting/StrokePath.java
index 0530a925..240a5967 100644
--- a/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/operator/path/painting/StrokePath.java
+++ b/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/operator/path/painting/StrokePath.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.knowcenter.wag.egov.egiz.pdf.operator.path.painting;

-

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

-import at.knowcenter.wag.egov.egiz.pdf.operator.path.PathPaintingOperatorProcessor;

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

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

-import org.apache.pdfbox.util.PDFOperator;

-

-import java.awt.*;

-import java.io.IOException;

-import java.util.List;

-

-/**

- * Strokes the path.

- *

- * @see "PDF 1.7 specification, Section 8.5.3 'Path-Painting Operators'"

- * @author PdfBox, modified by Datentechnik Innovation GmbH

- */

-public class StrokePath extends PathPaintingOperatorProcessor {

-

-	private Log log = LogFactory.getLog(getClass());

-

-	public StrokePath(PDFPage context) {

-		super(context);

-	}

-

-	@Override

-	public void process(PDFOperator operator, List operands) throws IOException {

-		try {

-			PDFPage pdfPage = (PDFPage) context;

-

-			Rectangle bounds = pdfPage.getCurrentPath().getBounds();

-			pdfPage.getCurrentPath().reset();

-

-			if (log.isTraceEnabled()) {

-				log.trace("Stroking path.");

-			}

-

-			pdfPage.registerPathBounds(bounds);

-

-		} catch (Exception e) {

-			log.warn("Error processing operator 'S'.", e);

-		}

-	}

-

-}

+/*******************************************************************************
+ * <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.knowcenter.wag.egov.egiz.pdf.operator.path.painting;
+
+import at.knowcenter.wag.egov.egiz.pdf.PDFPage;
+import at.knowcenter.wag.egov.egiz.pdf.operator.path.PathPaintingOperatorProcessor;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.pdfbox.util.PDFOperator;
+
+import java.awt.*;
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * Strokes the path.
+ *
+ * @see "PDF 1.7 specification, Section 8.5.3 'Path-Painting Operators'"
+ * @author PdfBox, modified by Datentechnik Innovation GmbH
+ */
+public class StrokePath extends PathPaintingOperatorProcessor {
+
+	private Log log = LogFactory.getLog(getClass());
+
+	public StrokePath(PDFPage context) {
+		super(context);
+	}
+
+	@Override
+	public void process(PDFOperator operator, List operands) throws IOException {
+		try {
+			PDFPage pdfPage = (PDFPage) context;
+
+			Rectangle bounds = pdfPage.getCurrentPath().getBounds();
+			pdfPage.getCurrentPath().reset();
+
+			if (log.isTraceEnabled()) {
+				log.trace("Stroking path.");
+			}
+
+			pdfPage.registerPathBounds(bounds);
+
+		} catch (Exception e) {
+			log.warn("Error processing operator 'S'.", e);
+		}
+	}
+
+}
diff --git a/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/sig/SignatureEntry.java b/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/sig/SignatureEntry.java
index 957e947f..5dbff50b 100644
--- a/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/sig/SignatureEntry.java
+++ b/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/sig/SignatureEntry.java
@@ -1,163 +1,186 @@
-/**

- * <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.

- *

- * $Id: SignatureEntry.java,v 1.3 2006/08/25 17:09:41 wprinz Exp $

- */

-package at.knowcenter.wag.egov.egiz.pdf.sig;

-

-import java.io.Serializable;

-

-/**

- * This class is to store a signature entry. The signature entry is 3-tupel. A key that is defined

- * or declarated in the settings file, an optional caption or a value. <br>

- * An additional helper value is a marker for the start index of the key, if the key is found in an

- * analysing process extracting captions and values from a raw signature text.

- * 

- * @author wlackner

- * @see at.knowcenter.wag.egov.egiz.sig.SignatureObject

- */

-public class SignatureEntry implements Serializable {

-

-  /**

-   * SVUID.

-   */

-  private static final long serialVersionUID = 4640380069301731879L;

-  

-  /**

-   * The signature key.

-   */

-  private String key_ = null;

-  /**

-   * The signature caption for the key found or set in the signature text.

-   */

-  private String caption_ = null;

-  /**

-   * The signature value for the key found or set in the signature text.

-   */

-  private String value_ = null;

-  /**

-   * The starting index position of the key if it is found in the signature text.

-   */

-  private int startIndex_ = -1;

-  

-  public boolean isPlaceholder = false;

-

-  /**

-   * The empty constructor.

-   */

-  public SignatureEntry() {

-  }

-

-  /**

-   * A new <code>SignatureEntry</code> init with the key.

-   * 

-   * @param key

-   */

-  public SignatureEntry(String key) {

-    key_ = key;

-  }

-

-  /**

-   * Returns the caption off the current key.

-   * 

-   * @return Returns the caption.

-   */

-  public String getCaption() {

-    return caption_;

-  }

-

-  /**

-   * Set the caption of the current key.

-   * 

-   * @param caption The caption to set.

-   */

-  public void setCaption(String caption) {

-    caption_ = caption;

-  }

-

-  /**

-   * Return the current key.

-   * 

-   * @return Returns the key.

-   */

-  public String getKey() {

-    return key_;

-  }

-

-  /**

-   * Set the current key.

-   * 

-   * @param key The key to set.

-   */

-  public void setKey(String key) {

-    key_ = key;

-  }

-

-  /**

-   * Return the start position of the key that caption is found in the signature text.

-   * 

-   * @return Returns the startIndex.

-   */

-  public int getStartIndex() {

-    return startIndex_;

-  }

-

-  /**

-   * Set the start position of the current key.

-   * 

-   * @param startIndex The startIndex to set.

-   */

-  public void setStartIndex(int startIndex) {

-    startIndex_ = startIndex;

-  }

-

-  /**

-   * Return the value of the current key.

-   * 

-   * @return Returns the value.

-   */

-  public String getValue() {

-    return value_;

-  }

-

-  /**

-   * Set the value of the current key.

-   * 

-   * @param value The value to set.

-   */

-  public void setValue(String value) {

-    value_ = value;

-  }

-

-  /**

-   * The toString method, used for tests or debugging.

-   */

-  public String toString() {

-    String the_string = "";

-    the_string += "\n    Key:" + key_;

-    the_string += "\nCaption:" + caption_;

-    the_string += "\n  Value:" + value_;

-//    the_string += "\nStart I:" + startIndex_;

-    return the_string;

-  }

-}
\ No newline at end of file
+/*******************************************************************************
+ * <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.
+ *
+ * $Id: SignatureEntry.java,v 1.3 2006/08/25 17:09:41 wprinz Exp $
+ */
+package at.knowcenter.wag.egov.egiz.pdf.sig;
+
+import java.io.Serializable;
+
+/**
+ * This class is to store a signature entry. The signature entry is 3-tupel. A key that is defined
+ * or declarated in the settings file, an optional caption or a value. <br>
+ * An additional helper value is a marker for the start index of the key, if the key is found in an
+ * analysing process extracting captions and values from a raw signature text.
+ * 
+ * @author wlackner
+ * @see at.knowcenter.wag.egov.egiz.sig.SignatureObject
+ */
+public class SignatureEntry implements Serializable {
+
+  /**
+   * SVUID.
+   */
+  private static final long serialVersionUID = 4640380069301731879L;
+  
+  /**
+   * The signature key.
+   */
+  private String key_ = null;
+  /**
+   * The signature caption for the key found or set in the signature text.
+   */
+  private String caption_ = null;
+  /**
+   * The signature value for the key found or set in the signature text.
+   */
+  private String value_ = null;
+  /**
+   * The starting index position of the key if it is found in the signature text.
+   */
+  private int startIndex_ = -1;
+  
+  public boolean isPlaceholder = false;
+
+  /**
+   * The empty constructor.
+   */
+  public SignatureEntry() {
+  }
+
+  /**
+   * A new <code>SignatureEntry</code> init with the key.
+   * 
+   * @param key
+   */
+  public SignatureEntry(String key) {
+    key_ = key;
+  }
+
+  /**
+   * Returns the caption off the current key.
+   * 
+   * @return Returns the caption.
+   */
+  public String getCaption() {
+    return caption_;
+  }
+
+  /**
+   * Set the caption of the current key.
+   * 
+   * @param caption The caption to set.
+   */
+  public void setCaption(String caption) {
+    caption_ = caption;
+  }
+
+  /**
+   * Return the current key.
+   * 
+   * @return Returns the key.
+   */
+  public String getKey() {
+    return key_;
+  }
+
+  /**
+   * Set the current key.
+   * 
+   * @param key The key to set.
+   */
+  public void setKey(String key) {
+    key_ = key;
+  }
+
+  /**
+   * Return the start position of the key that caption is found in the signature text.
+   * 
+   * @return Returns the startIndex.
+   */
+  public int getStartIndex() {
+    return startIndex_;
+  }
+
+  /**
+   * Set the start position of the current key.
+   * 
+   * @param startIndex The startIndex to set.
+   */
+  public void setStartIndex(int startIndex) {
+    startIndex_ = startIndex;
+  }
+
+  /**
+   * Return the value of the current key.
+   * 
+   * @return Returns the value.
+   */
+  public String getValue() {
+    return value_;
+  }
+
+  /**
+   * Set the value of the current key.
+   * 
+   * @param value The value to set.
+   */
+  public void setValue(String value) {
+    value_ = value;
+  }
+
+  /**
+   * The toString method, used for tests or debugging.
+   */
+  public String toString() {
+    String the_string = "";
+    the_string += "\n    Key:" + key_;
+    the_string += "\nCaption:" + caption_;
+    the_string += "\n  Value:" + value_;
+//    the_string += "\nStart I:" + startIndex_;
+    return the_string;
+  }
+}
diff --git a/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/table/Entry.java b/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/table/Entry.java
index 289a7f6f..a9089d66 100644
--- a/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/table/Entry.java
+++ b/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/table/Entry.java
@@ -1,235 +1,258 @@
-/**

- * <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.

- *

- * $Id: Entry.java,v 1.3 2006/08/25 17:08:19 wprinz Exp $

- */

-package at.knowcenter.wag.egov.egiz.table;

-

-import java.io.Serializable;

-

-/**

- * This class implements a table entry for different types. A table entry can be

- * styled and setting there column dimensions. The default value for the column

- * dimension is 1. To declare the type of the entry use the public

- * <code>TYPE_</code> definitions.

- * 

- * @author wlackner

- */

-public class Entry implements Serializable

-{

-

-  /**

-   * SVUID.

-   */

-  private static final long serialVersionUID = -7952755200668528348L;

-

-  /**

-   * Type for a text entry.

-   */

-  public final static int TYPE_CAPTION = 0;

-

-  /**

-   * Type for a text entry.

-   */

-  public final static int TYPE_VALUE = 1;

-

-  /**

-   * Type for an image entry.

-   */

-  public final static int TYPE_IMAGE = 2;

-

-  /**

-   * Type for a table entry.

-   */

-  public final static int TYPE_TABLE = 3;

-

-  /**

-   * The type info holder, default value is 0!

-   */

-  private int type_ = 0;

-

-  /**

-   * The entry value.

-   */

-  private Object value_ = null;

-

-  /**

-   * The key value

-   */

-  private String key_ = null;

-

-  /**

-   * The entry style information.

-   */

-  private Style style_ = null;

-

-  /**

-   * The column dimension.

-   */

-  private int colSpan_ = 1;

-

-  /**

-   * Text wrap indicator, default is <code>false</code>.

-   */

-  private boolean noWrap_ = false;

-

-  /**

-   * The empty constructor.

-   */

-  public Entry()

-  {

-  }

-

-  /**

-   * A constructor setting the type and the value.

-   * 

-   * @param type

-   *          the entry type to set

-   * @param value

-   *          the entry value to set

-   */

-  public Entry(int type, Object value, String key)

-  {

-    type_ = type;

-    value_ = value;

-    key_ = key;

-  }

-

-  /**

-   * @return Returns the entry style.

-   */

-  public Style getStyle()

-  {

-    return style_;

-  }

-

-  /**

-   * @param style

-   *          The style to set.

-   */

-  public void setStyle(Style style)

-  {

-    style_ = style;

-  }

-

-  /**

-   * @return Returns the entry type.

-   */

-  public int getType()

-  {

-    return type_;

-  }

-

-  /**

-   * @param type

-   *          The type to set.

-   */

-  public void setType(int type)

-  {

-    type_ = type;

-  }

-

-  /**

-   * @return Returns the entry value.

-   */

-  public Object getValue()

-  {

-    return value_;

-  }

-

-  /**

-   * @param value

-   *          The value to set.

-   */

-  public void setValue(Object value)

-  {

-    value_ = value;

-  }

-

-  /**

-   * @return Returns the key.

-   */

-

-  public String getKey()

-  {

-    return key_;

-  }

-

-  /**

-   * @param key

-   *          The key to set.

-   */

-  public void setKey(String key)

-  {

-    key_ = key;

-  }

-

-  /**

-   * @return Returns the colSpan.

-   */

-  public int getColSpan()

-  {

-    return colSpan_;

-  }

-

-  /**

-   * @param colSpan

-   *          The colSpan to set.

-   */

-  public void setColSpan(int colSpan)

-  {

-    colSpan_ = colSpan;

-  }

-

-  /**

-   * @return Returns the wrap indicator.

-   */

-  public boolean isNoWrap()

-  {

-    return noWrap_;

-  }

-

-  /**

-   * @param noWrap

-   *          The wrap indicator to set.

-   */

-  public void setNoWrap(boolean noWrap)

-  {

-    noWrap_ = noWrap;

-  }

-

-  /**

-   * The toString method, used for tests or debugging.

-   */

-  public String toString()

-  {

-    Object obj = getValue();

-    String value = null;

-    if (obj != null)

-    {

-      value = obj.toString();

-    }

-    return "Type:" + getType() + " Value:" + value + " ColSpan:" + getColSpan();

-  }

-

-}
\ No newline at end of file
+/*******************************************************************************
+ * <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.
+ *
+ * $Id: Entry.java,v 1.3 2006/08/25 17:08:19 wprinz Exp $
+ */
+package at.knowcenter.wag.egov.egiz.table;
+
+import java.io.Serializable;
+
+/**
+ * This class implements a table entry for different types. A table entry can be
+ * styled and setting there column dimensions. The default value for the column
+ * dimension is 1. To declare the type of the entry use the public
+ * <code>TYPE_</code> definitions.
+ * 
+ * @author wlackner
+ */
+public class Entry implements Serializable
+{
+
+  /**
+   * SVUID.
+   */
+  private static final long serialVersionUID = -7952755200668528348L;
+
+  /**
+   * Type for a text entry.
+   */
+  public final static int TYPE_CAPTION = 0;
+
+  /**
+   * Type for a text entry.
+   */
+  public final static int TYPE_VALUE = 1;
+
+  /**
+   * Type for an image entry.
+   */
+  public final static int TYPE_IMAGE = 2;
+
+  /**
+   * Type for a table entry.
+   */
+  public final static int TYPE_TABLE = 3;
+
+  /**
+   * The type info holder, default value is 0!
+   */
+  private int type_ = 0;
+
+  /**
+   * The entry value.
+   */
+  private Object value_ = null;
+
+  /**
+   * The key value
+   */
+  private String key_ = null;
+
+  /**
+   * The entry style information.
+   */
+  private Style style_ = null;
+
+  /**
+   * The column dimension.
+   */
+  private int colSpan_ = 1;
+
+  /**
+   * Text wrap indicator, default is <code>false</code>.
+   */
+  private boolean noWrap_ = false;
+
+  /**
+   * The empty constructor.
+   */
+  public Entry()
+  {
+  }
+
+  /**
+   * A constructor setting the type and the value.
+   * 
+   * @param type
+   *          the entry type to set
+   * @param value
+   *          the entry value to set
+   */
+  public Entry(int type, Object value, String key)
+  {
+    type_ = type;
+    value_ = value;
+    key_ = key;
+  }
+
+  /**
+   * @return Returns the entry style.
+   */
+  public Style getStyle()
+  {
+    return style_;
+  }
+
+  /**
+   * @param style
+   *          The style to set.
+   */
+  public void setStyle(Style style)
+  {
+    style_ = style;
+  }
+
+  /**
+   * @return Returns the entry type.
+   */
+  public int getType()
+  {
+    return type_;
+  }
+
+  /**
+   * @param type
+   *          The type to set.
+   */
+  public void setType(int type)
+  {
+    type_ = type;
+  }
+
+  /**
+   * @return Returns the entry value.
+   */
+  public Object getValue()
+  {
+    return value_;
+  }
+
+  /**
+   * @param value
+   *          The value to set.
+   */
+  public void setValue(Object value)
+  {
+    value_ = value;
+  }
+
+  /**
+   * @return Returns the key.
+   */
+
+  public String getKey()
+  {
+    return key_;
+  }
+
+  /**
+   * @param key
+   *          The key to set.
+   */
+  public void setKey(String key)
+  {
+    key_ = key;
+  }
+
+  /**
+   * @return Returns the colSpan.
+   */
+  public int getColSpan()
+  {
+    return colSpan_;
+  }
+
+  /**
+   * @param colSpan
+   *          The colSpan to set.
+   */
+  public void setColSpan(int colSpan)
+  {
+    colSpan_ = colSpan;
+  }
+
+  /**
+   * @return Returns the wrap indicator.
+   */
+  public boolean isNoWrap()
+  {
+    return noWrap_;
+  }
+
+  /**
+   * @param noWrap
+   *          The wrap indicator to set.
+   */
+  public void setNoWrap(boolean noWrap)
+  {
+    noWrap_ = noWrap;
+  }
+
+  /**
+   * The toString method, used for tests or debugging.
+   */
+  public String toString()
+  {
+    Object obj = getValue();
+    String value = null;
+    if (obj != null)
+    {
+      value = obj.toString();
+    }
+    return "Type:" + getType() + " Value:" + value + " ColSpan:" + getColSpan();
+  }
+
+}
diff --git a/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/table/Style.java b/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/table/Style.java
index 489c9419..50be815d 100644
--- a/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/table/Style.java
+++ b/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/table/Style.java
@@ -1,630 +1,653 @@
-/**

- * <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.

- *

- * $Id: Style.java,v 1.3 2006/08/25 17:08:19 wprinz Exp $

- */

-package at.knowcenter.wag.egov.egiz.table;

-

-import java.awt.Color;

-import java.io.Serializable;

-

-/**

- * This class implements an abstract style definiton used in tables or table entrys. Predefined

- * values exists for valign and halign. Color definitions uses the native awt color declarations.

- * <br>

- * The predefined keys are used in the setting definition file to style tables and table entries.

- * <br>

- * It provides an static method to inherit style informations from a given style object.

- * {@link Style#doInherit}

- * 

- * 

- * @author wlackner

- * @see java.awt.Color

- */

-public class Style implements Serializable {

-

-// 03.11.2010 changed by exthex - added valuevalign and valuehalign to allow separate layout for value and non-value cells.

-// Also the hardcoded default values for halign and valign were removed to allow proper inheritment.

-// 04.11.2010 changed by exthex - added imagevalign and imagehalign analog to valuevalign/valuehalign

-

-  /**

-   * SVUID.

-   */

-  private static final long serialVersionUID = 5855722896712428387L;

-  

-  /**

-   * valign statement key top

-   */

-  public final static String TOP = "top";

-  /**

-   * valign statement key middle

-   */

-  public final static String MIDDLE = "middle";

-  /**

-   * valign statement key bottom

-   */

-  public final static String BOTTOM = "bottom";

-  /**

-   * halign statement key left

-   */

-  public final static String LEFT = "left";

-  /**

-   * halign statement key center

-   */

-  public final static String CENTER = "center";

-  /**

-   * halign statement key right

-   */

-  public final static String RIGHT = "right";

-

-  /**

-   * bgcolor key

-   */

-  public final static String BGCOLOR = "bgcolor";

-  /**

-   * halign key

-   */

-  public final static String HALIGN = "halign";

-  /**

-   * valign key

-   */

-  public final static String VALIGN = "valign";

-

-  /**

-   * value halign key

-   */

-  public final static String VALUEHALIGN = "valuehalign";

-  /**

-   * value valign key

-   */

-  public final static String VALUEVALIGN = "valuevalign";

-

-  /**

-   * image halign key

-   */

-  public final static String IMAGEHALIGN = "imagehalign";

-  /**

-   * image valign key

-   */

-  public final static String IMAGEVALIGN = "imagevalign";

-  /**

-   * padding key, default padding = 1

-   */

-  public final static String PADDING = "padding";

-  /**

-   * border key, default border = 1;<br>

-   * The border value is one value for all border lines of an entry or table! <br>

-   * No separte definitions for top, right, bottom or left are possible.

-   */

-  public final static String BORDER = "border";

-  

-  /**

-   * Font key

-   */

-  public final static String FONT = "font";

-  

-  /**

-   * The value font key.

-   */

-  public final static String VALUEFONT = "valuefont";

-  

-  /**

-   * The imageScaleToFit key.

-   */

-  public final static String IMAGE_SCALE_TO_FIT = "imagescaletofit";

-  

-  /**

-   * Font name HELVETICA

-   */

-  public final static String HELVETICA = "HELVETICA";

-  /**

-   * Font name TIMES_ROMAN

-   */

-  public final static String TIMES_ROMAN = "TIMES_ROMAN";

-  /**

-   * Font name COURIER

-   */

-  public final static String COURIER = "COURIER";

-  /**

-   * Font type NORMAL

-   */

-  public final static String NORMAL = "NORMAL";

-  /**

-   * Font type BOLD

-   */

-  public final static String BOLD = "BOLD";

-  /**

-   * Font type ITALIC

-   */

-  public final static String ITALIC = "ITALIC";

-  /**

-   * Font type BOLDITALIC

-   */

-  public final static String BOLDITALIC = "BOLDITALIC";

-  /**

-   * Font type UNDERLINE

-   */

-  public final static String UNDERLINE = "UNDERLINE";

-  /**

-   * Font type STRIKETHRU

-   */

-  public final static String STRIKETHRU = "STRIKETHRU";

-  

-

-  /**

-   * all paddings initialized with the default padding value (1)

-   */

-  private static final float DEFAULT_PADDING = 1;

-  /**

-   * all borders initialized with the default border value (1)

-   */

-  private static final float DEFAULT_BORDER = 1;

-  /**

-   * The background color definition.

-   */

-  private Color bgColor_ = null;

-  /**

-   * The current padding value -> initialized with the default padding value

-   */

-  private float padding_ = DEFAULT_PADDING;

-  /**

-   * The current halign value

-   */

-  private String hAlign_ = null;

-  /**

-   * The current valign value

-   */

-  private String vAlign_ = null;

-  /**

-   * The current valuehalign value

-   */

-  private String valueHAlign_ = null;

-  /**

-   * The current valuevalign value

-   */

-  private String valueVAlign_ = null;

-  /**

-   * The current imagehalign value

-   */

-  private String imageHAlign_ = null;

-  /**

-   * The current imagevalign value

-   */

-  private String imageVAlign_ = null;

-  /**

-   * The current border value -> initialized with the default border value

-   */

-  private float border_ = DEFAULT_BORDER;

-  /**

-   * The font string of the style definition

-   */

-  private String font_ = null;

-  /**

-   * The font string of the value font.

-   */

-  private String valuefont_ = null;

-  /**

-   * The scaleToFit dimensions to be applied for image-cells.

-   */

-  private ImageScaleToFit imageScaleToFit_ = null;

-

-  /**

-   * The empty constructor.

-   */

-  public Style() {

-  }

-

-  /**

-   * Set a style attribute. The style attribute must be one of the public definitions

-   * 

-   * @param id the style attribute to set

-   * @param value the style value to set for the given attribute

-   */

-  public void setStyle(String id, String value) {

-    if (BGCOLOR.equals(id)) {

-      String[] col_strg = value.split(" ");

-      if (col_strg.length == 3) {

-        int r = Integer.parseInt(col_strg[0]);

-        int g = Integer.parseInt(col_strg[1]);

-        int b = Integer.parseInt(col_strg[2]);

-        if (r < 256 && g < 256 && b < 256 && r >= 0 && g >= 0 && b >= 0) {

-          bgColor_ = new Color(r, g, b);

-        }

-      }

-    }

-    if (HALIGN.equals(id)) {

-      if (LEFT.equals(value) || CENTER.equals(value) || RIGHT.equals(value)) {

-        hAlign_ = value;

-      }

-    }

-    if (VALIGN.equals(id)) {

-      if (TOP.equals(value) || MIDDLE.equals(value) || BOTTOM.equals(value)) {

-        vAlign_ = value;

-      }

-    }

-    if (VALUEHALIGN.equals(id)) {

-      if (LEFT.equals(value) || CENTER.equals(value) || RIGHT.equals(value)) {

-        valueHAlign_ = value;

-      }

-    }

-    if (VALUEVALIGN.equals(id)) {

-      if (TOP.equals(value) || MIDDLE.equals(value) || BOTTOM.equals(value)) {

-        valueVAlign_ = value;

-      }

-    }

-    if (IMAGEHALIGN.equals(id)) {

-      if (LEFT.equals(value) || CENTER.equals(value) || RIGHT.equals(value)) {

-        imageHAlign_ = value;

-      }

-    }

-    if (IMAGEVALIGN.equals(id)) {

-      if (TOP.equals(value) || MIDDLE.equals(value) || BOTTOM.equals(value)) {

-        imageVAlign_ = value;

-      }

-    }

-    if (PADDING.equals(id)) {

-      padding_ = Float.parseFloat(value);

-    }

-    if (BORDER.equals(id)) {

-      border_ = Float.parseFloat(value);

-    }

-    if (FONT.equals(id)) {

-      font_ = value;

-    }

-    if (VALUEFONT.equals(id)) {

-      valuefont_ = value;

-    }

-    if (IMAGE_SCALE_TO_FIT.equals(id))

-    {

-      imageScaleToFit_ = parseImageScaleToFit(value);

-    }

-  }

-

-  /**

-   * @return Returns the bgColor.

-   */

-  public Color getBgColor() {

-    return bgColor_;

-  }

-

-  /**

-   * @param bgColor The bgColor to set.

-   */

-  public void setBgColor(Color bgColor) {

-    bgColor_ = bgColor;

-  }

-

-  /**

-   * @return Returns the hAlign.

-   */

-  public String getHAlign() {

-    return hAlign_;

-  }

-

-  /**

-   * @param align The hAlign to set.

-   */

-  public void setHAlign(String align) {

-    hAlign_ = align;

-  }

-

-  /**

-   * @return Returns the padding.

-   */

-  public float getPadding() {

-    return padding_;

-  }

-

-  /**

-   * @param padding The padding to set.

-   */

-  public void setPadding(float padding) {

-    padding_ = padding;

-  }

-

-  /**

-   * @return Returns the vAlign.

-   */

-  public String getVAlign() {

-    return vAlign_;

-  }

-

-  /**

-   * @param align The vAlign to set.

-   */

-  public void setVAlign(String align) {

-    vAlign_ = align;

-  }

-

-  /**

-   * @return Returns the border.

-   */

-  public float getBorder() {

-    return border_;

-  }

-

-  /**

-   * @param border The border to set.

-   */

-  public void setBorder(float border) {

-    border_ = border;

-  }

-

-  

-  /**

-   * @return Returns the font.

-   */

-  public String getFont() {

-    return font_;

-  }

-  

-  /**

-   * @param font The font to set.

-   */

-  public void setFont(String font) {

-    font_ = font;

-  }

-  

-  

-  /**

-   * Returns the value font.

-   * @return Returns the value font.

-   */

-  public String getValueFont()

-  {

-    return valuefont_;

-  }

-

-  /**

-   * Sets the value font.

-   * @param valuefont The value font to be set.

-   */

-  public void setValueFont(String valuefont)

-  {

-    this.valuefont_ = valuefont;

-  }

-  

-  /**

-   * @param align The valueHAlign to set.

-   */

-  public void setValueHAlign(String align) {

-    valueHAlign_ = align;

-  }

-

-  /**

-   * Returns the value halign

-   * @return Returns the value halign

-   */

-  public String getValueHAlign() {

-    return valueHAlign_;

-  }

-

-  /**

-   * @param align The valueVAlign to set.

-   */

-  public void setValueVAlign(String align) {

-    valueVAlign_ = align;

-  }

-

-  /**

-   * Returns the value valign

-   * @return Returns the value valign

-   */

-  public String getValueVAlign() {

-    return valueVAlign_;

-  }

-  

-  /**

-   * @param align The imageHAlign to set.

-   */

-  public void setImageHAlign(String align) {

-    imageHAlign_ = align;

-  }

-

-  /**

-   * Returns the image halign

-   * @return Returns the image halign

-   */

-  public String getImageHAlign() {

-    return imageHAlign_;

-  }

-

-  /**

-   * @param align The imageVAlign to set.

-   */

-  public void setImageVAlign(String align) {

-    imageVAlign_ = align;

-  }

-

-  /**

-   * Returns the image valign

-   * @return Returns the image valign

-   */

-  public String getImageVAlign() {

-    return imageVAlign_;

-  }

-

-  /**

-   * Returns the scaleToFit dimensions to be applied for image-cells.

-   * @return Returns the scaleToFit dimensions to be applied for image-cells.

-   */

-  public ImageScaleToFit getImageScaleToFit()

-  {

-    return this.imageScaleToFit_;

-  }

-

-  /**

-   * Sets the scaleToFit dimensions to be applied for image-cells.

-   * @param imageScaleToFit_ The scaleToFit dimensions to be applied for image-cells.

-   */

-  public void setImageScaleToFit(ImageScaleToFit imageScaleToFit)

-  {

-    this.imageScaleToFit_ = imageScaleToFit;

-  }

-

-  /**

-   * The toString method, used for tests or debugging.

-   */

-  public String toString() {

-    return "bgcolor:" + getBgColor() + " halign:" + getHAlign() + " valign:" + getVAlign() + " padding:" + getPadding() + " border:" + getBorder() + " font:" + getFont() + " valuefont:" + getValueFont() + " imageScaleToFit:" + getImageScaleToFit();

-  }

-

-  /**

-   * This method inherits all style attributes (values) from a given style object.

-   * 

-   * <p>

-   * A new style object is created that receives the properly inherited styles.

-   * </p>

-   * <p>

-   * If a value is not defined in the <code>baseStyle</code> object it would be inhert from the <code>inheritStyle</code> object.

-   * </p>

-   * 

-   * @param baseStyle the style object that serves as a primary style source.

-   * @param inheritStyle the style object that serves as a secondary style source in case a style attribute is not defined on the primary style source. 

-   * @param isValue 

-   * @return Returns a new Style object being fully equipped with styles.

-   */

-  public static Style doInherit(Style baseStyle, Style inheritStyle) {

-    Style newStyle = new Style();

-    

-    if (baseStyle != null)

-    {

-      newStyle.setBgColor(baseStyle.getBgColor());

-      newStyle.setBorder(baseStyle.getBorder());

-      newStyle.setFont(baseStyle.getFont());

-      newStyle.setHAlign(baseStyle.getHAlign());

-      newStyle.setImageHAlign(baseStyle.getImageHAlign());

-      newStyle.setImageVAlign(baseStyle.getImageVAlign());

-      newStyle.setPadding(baseStyle.getPadding());

-      newStyle.setVAlign(baseStyle.getVAlign());

-      newStyle.setValueFont(baseStyle.getValueFont());

-      newStyle.setValueHAlign(baseStyle.getValueHAlign());

-      newStyle.setValueVAlign(baseStyle.getValueVAlign());

-      newStyle.setImageScaleToFit(baseStyle.getImageScaleToFit());

-    }

-    

-    if (inheritStyle != null)

-    {

-      if (newStyle.getBgColor() == null) { newStyle.setBgColor(inheritStyle.getBgColor()); }

-      if (newStyle.getBorder() == DEFAULT_BORDER) { newStyle.setBorder(inheritStyle.getBorder()); }

-      if (newStyle.getFont() == null) { newStyle.setFont(inheritStyle.getFont()); }

-      if (newStyle.getHAlign() == null) { newStyle.setHAlign(inheritStyle.getHAlign()); }

-      if (newStyle.getImageHAlign() == null) { newStyle.setImageHAlign(inheritStyle.getImageHAlign()); }

-      if (newStyle.getImageVAlign() == null) { newStyle.setImageVAlign(inheritStyle.getImageVAlign()); }

-      if (newStyle.getPadding() == DEFAULT_PADDING) { newStyle.setPadding(inheritStyle.getPadding()); }

-      if (newStyle.getVAlign() == null) { newStyle.setVAlign(inheritStyle.getVAlign()); }

-      if (newStyle.getValueFont() == null) { newStyle.setValueFont(inheritStyle.getValueFont()); }

-      if (newStyle.getValueHAlign() == null) { newStyle.setValueHAlign(inheritStyle.getValueHAlign()); }

-      if (newStyle.getValueVAlign() == null) { newStyle.setValueVAlign(inheritStyle.getValueVAlign()); }

-      if (newStyle.getImageScaleToFit() == null) { newStyle.setImageScaleToFit(inheritStyle.getImageScaleToFit()); }

-   }

-    

-   return newStyle;

-  }

-  

-  protected static ImageScaleToFit parseImageScaleToFit (String imageScaleToFit)

-  {

-    if (imageScaleToFit == null || imageScaleToFit.length() == 0 || imageScaleToFit.trim().length() == 0)

-    {

-      return null;

-    }

-    

-    String [] dimensions = imageScaleToFit.split(";");

-    if (dimensions.length != 2)

-    {

-      return null;

-    }

-    

-    float width = Float.parseFloat(dimensions[0]);

-    float height = Float.parseFloat(dimensions[0]);

-    

-    return new ImageScaleToFit(width, height);

-  }

-  

-  /**

-   * Holds the width and the height an image can be scaled to fit.

-   * 

-   * @author wprinz

-   */

-  public static class ImageScaleToFit

-  {

-    /**

-     * The width.

-     */

-    protected float width;

-    

-    /**

-     * The height.

-     */

-    protected float height;

-

-    /**

-     * Constructor.

-     * 

-     * @param width The width.

-     * @param height The height.

-     */

-    public ImageScaleToFit(float width, float height)

-    {

-      this.width = width;

-      this.height = height;

-    }

-

-    /**

-     * Returns the width.

-     * @return Returns the width.

-     */

-    public float getWidth()

-    {

-      return this.width;

-    }

-

-    /**

-     * Sets the width.

-     * @param width The width to set.

-     */

-    public void setWidth(float width)

-    {

-      this.width = width;

-    }

-

-    /**

-     * Returns the height.

-     * @return Returns the height.

-     */

-    public float getHeight()

-    {

-      return this.height;

-    }

-

-    /**

-     * Sets the height.

-     * @param height The height to set.

-     */

-    public void setHeight(float height)

-    {

-      this.height = height;

-    }

-     

-  }

-}
\ No newline at end of file
+/*******************************************************************************
+ * <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.
+ *
+ * $Id: Style.java,v 1.3 2006/08/25 17:08:19 wprinz Exp $
+ */
+package at.knowcenter.wag.egov.egiz.table;
+
+import java.awt.Color;
+import java.io.Serializable;
+
+/**
+ * This class implements an abstract style definiton used in tables or table entrys. Predefined
+ * values exists for valign and halign. Color definitions uses the native awt color declarations.
+ * <br>
+ * The predefined keys are used in the setting definition file to style tables and table entries.
+ * <br>
+ * It provides an static method to inherit style informations from a given style object.
+ * {@link Style#doInherit}
+ * 
+ * 
+ * @author wlackner
+ * @see java.awt.Color
+ */
+public class Style implements Serializable {
+
+// 03.11.2010 changed by exthex - added valuevalign and valuehalign to allow separate layout for value and non-value cells.
+// Also the hardcoded default values for halign and valign were removed to allow proper inheritment.
+// 04.11.2010 changed by exthex - added imagevalign and imagehalign analog to valuevalign/valuehalign
+
+  /**
+   * SVUID.
+   */
+  private static final long serialVersionUID = 5855722896712428387L;
+  
+  /**
+   * valign statement key top
+   */
+  public final static String TOP = "top";
+  /**
+   * valign statement key middle
+   */
+  public final static String MIDDLE = "middle";
+  /**
+   * valign statement key bottom
+   */
+  public final static String BOTTOM = "bottom";
+  /**
+   * halign statement key left
+   */
+  public final static String LEFT = "left";
+  /**
+   * halign statement key center
+   */
+  public final static String CENTER = "center";
+  /**
+   * halign statement key right
+   */
+  public final static String RIGHT = "right";
+
+  /**
+   * bgcolor key
+   */
+  public final static String BGCOLOR = "bgcolor";
+  /**
+   * halign key
+   */
+  public final static String HALIGN = "halign";
+  /**
+   * valign key
+   */
+  public final static String VALIGN = "valign";
+
+  /**
+   * value halign key
+   */
+  public final static String VALUEHALIGN = "valuehalign";
+  /**
+   * value valign key
+   */
+  public final static String VALUEVALIGN = "valuevalign";
+
+  /**
+   * image halign key
+   */
+  public final static String IMAGEHALIGN = "imagehalign";
+  /**
+   * image valign key
+   */
+  public final static String IMAGEVALIGN = "imagevalign";
+  /**
+   * padding key, default padding = 1
+   */
+  public final static String PADDING = "padding";
+  /**
+   * border key, default border = 1;<br>
+   * The border value is one value for all border lines of an entry or table! <br>
+   * No separte definitions for top, right, bottom or left are possible.
+   */
+  public final static String BORDER = "border";
+  
+  /**
+   * Font key
+   */
+  public final static String FONT = "font";
+  
+  /**
+   * The value font key.
+   */
+  public final static String VALUEFONT = "valuefont";
+  
+  /**
+   * The imageScaleToFit key.
+   */
+  public final static String IMAGE_SCALE_TO_FIT = "imagescaletofit";
+  
+  /**
+   * Font name HELVETICA
+   */
+  public final static String HELVETICA = "HELVETICA";
+  /**
+   * Font name TIMES_ROMAN
+   */
+  public final static String TIMES_ROMAN = "TIMES_ROMAN";
+  /**
+   * Font name COURIER
+   */
+  public final static String COURIER = "COURIER";
+  /**
+   * Font type NORMAL
+   */
+  public final static String NORMAL = "NORMAL";
+  /**
+   * Font type BOLD
+   */
+  public final static String BOLD = "BOLD";
+  /**
+   * Font type ITALIC
+   */
+  public final static String ITALIC = "ITALIC";
+  /**
+   * Font type BOLDITALIC
+   */
+  public final static String BOLDITALIC = "BOLDITALIC";
+  /**
+   * Font type UNDERLINE
+   */
+  public final static String UNDERLINE = "UNDERLINE";
+  /**
+   * Font type STRIKETHRU
+   */
+  public final static String STRIKETHRU = "STRIKETHRU";
+  
+
+  /**
+   * all paddings initialized with the default padding value (1)
+   */
+  private static final float DEFAULT_PADDING = 1;
+  /**
+   * all borders initialized with the default border value (1)
+   */
+  private static final float DEFAULT_BORDER = 1;
+  /**
+   * The background color definition.
+   */
+  private Color bgColor_ = null;
+  /**
+   * The current padding value -> initialized with the default padding value
+   */
+  private float padding_ = DEFAULT_PADDING;
+  /**
+   * The current halign value
+   */
+  private String hAlign_ = null;
+  /**
+   * The current valign value
+   */
+  private String vAlign_ = null;
+  /**
+   * The current valuehalign value
+   */
+  private String valueHAlign_ = null;
+  /**
+   * The current valuevalign value
+   */
+  private String valueVAlign_ = null;
+  /**
+   * The current imagehalign value
+   */
+  private String imageHAlign_ = null;
+  /**
+   * The current imagevalign value
+   */
+  private String imageVAlign_ = null;
+  /**
+   * The current border value -> initialized with the default border value
+   */
+  private float border_ = DEFAULT_BORDER;
+  /**
+   * The font string of the style definition
+   */
+  private String font_ = null;
+  /**
+   * The font string of the value font.
+   */
+  private String valuefont_ = null;
+  /**
+   * The scaleToFit dimensions to be applied for image-cells.
+   */
+  private ImageScaleToFit imageScaleToFit_ = null;
+
+  /**
+   * The empty constructor.
+   */
+  public Style() {
+  }
+
+  /**
+   * Set a style attribute. The style attribute must be one of the public definitions
+   * 
+   * @param id the style attribute to set
+   * @param value the style value to set for the given attribute
+   */
+  public void setStyle(String id, String value) {
+    if (BGCOLOR.equals(id)) {
+      String[] col_strg = value.split(" ");
+      if (col_strg.length == 3) {
+        int r = Integer.parseInt(col_strg[0]);
+        int g = Integer.parseInt(col_strg[1]);
+        int b = Integer.parseInt(col_strg[2]);
+        if (r < 256 && g < 256 && b < 256 && r >= 0 && g >= 0 && b >= 0) {
+          bgColor_ = new Color(r, g, b);
+        }
+      }
+    }
+    if (HALIGN.equals(id)) {
+      if (LEFT.equals(value) || CENTER.equals(value) || RIGHT.equals(value)) {
+        hAlign_ = value;
+      }
+    }
+    if (VALIGN.equals(id)) {
+      if (TOP.equals(value) || MIDDLE.equals(value) || BOTTOM.equals(value)) {
+        vAlign_ = value;
+      }
+    }
+    if (VALUEHALIGN.equals(id)) {
+      if (LEFT.equals(value) || CENTER.equals(value) || RIGHT.equals(value)) {
+        valueHAlign_ = value;
+      }
+    }
+    if (VALUEVALIGN.equals(id)) {
+      if (TOP.equals(value) || MIDDLE.equals(value) || BOTTOM.equals(value)) {
+        valueVAlign_ = value;
+      }
+    }
+    if (IMAGEHALIGN.equals(id)) {
+      if (LEFT.equals(value) || CENTER.equals(value) || RIGHT.equals(value)) {
+        imageHAlign_ = value;
+      }
+    }
+    if (IMAGEVALIGN.equals(id)) {
+      if (TOP.equals(value) || MIDDLE.equals(value) || BOTTOM.equals(value)) {
+        imageVAlign_ = value;
+      }
+    }
+    if (PADDING.equals(id)) {
+      padding_ = Float.parseFloat(value);
+    }
+    if (BORDER.equals(id)) {
+      border_ = Float.parseFloat(value);
+    }
+    if (FONT.equals(id)) {
+      font_ = value;
+    }
+    if (VALUEFONT.equals(id)) {
+      valuefont_ = value;
+    }
+    if (IMAGE_SCALE_TO_FIT.equals(id))
+    {
+      imageScaleToFit_ = parseImageScaleToFit(value);
+    }
+  }
+
+  /**
+   * @return Returns the bgColor.
+   */
+  public Color getBgColor() {
+    return bgColor_;
+  }
+
+  /**
+   * @param bgColor The bgColor to set.
+   */
+  public void setBgColor(Color bgColor) {
+    bgColor_ = bgColor;
+  }
+
+  /**
+   * @return Returns the hAlign.
+   */
+  public String getHAlign() {
+    return hAlign_;
+  }
+
+  /**
+   * @param align The hAlign to set.
+   */
+  public void setHAlign(String align) {
+    hAlign_ = align;
+  }
+
+  /**
+   * @return Returns the padding.
+   */
+  public float getPadding() {
+    return padding_;
+  }
+
+  /**
+   * @param padding The padding to set.
+   */
+  public void setPadding(float padding) {
+    padding_ = padding;
+  }
+
+  /**
+   * @return Returns the vAlign.
+   */
+  public String getVAlign() {
+    return vAlign_;
+  }
+
+  /**
+   * @param align The vAlign to set.
+   */
+  public void setVAlign(String align) {
+    vAlign_ = align;
+  }
+
+  /**
+   * @return Returns the border.
+   */
+  public float getBorder() {
+    return border_;
+  }
+
+  /**
+   * @param border The border to set.
+   */
+  public void setBorder(float border) {
+    border_ = border;
+  }
+
+  
+  /**
+   * @return Returns the font.
+   */
+  public String getFont() {
+    return font_;
+  }
+  
+  /**
+   * @param font The font to set.
+   */
+  public void setFont(String font) {
+    font_ = font;
+  }
+  
+  
+  /**
+   * Returns the value font.
+   * @return Returns the value font.
+   */
+  public String getValueFont()
+  {
+    return valuefont_;
+  }
+
+  /**
+   * Sets the value font.
+   * @param valuefont The value font to be set.
+   */
+  public void setValueFont(String valuefont)
+  {
+    this.valuefont_ = valuefont;
+  }
+  
+  /**
+   * @param align The valueHAlign to set.
+   */
+  public void setValueHAlign(String align) {
+    valueHAlign_ = align;
+  }
+
+  /**
+   * Returns the value halign
+   * @return Returns the value halign
+   */
+  public String getValueHAlign() {
+    return valueHAlign_;
+  }
+
+  /**
+   * @param align The valueVAlign to set.
+   */
+  public void setValueVAlign(String align) {
+    valueVAlign_ = align;
+  }
+
+  /**
+   * Returns the value valign
+   * @return Returns the value valign
+   */
+  public String getValueVAlign() {
+    return valueVAlign_;
+  }
+  
+  /**
+   * @param align The imageHAlign to set.
+   */
+  public void setImageHAlign(String align) {
+    imageHAlign_ = align;
+  }
+
+  /**
+   * Returns the image halign
+   * @return Returns the image halign
+   */
+  public String getImageHAlign() {
+    return imageHAlign_;
+  }
+
+  /**
+   * @param align The imageVAlign to set.
+   */
+  public void setImageVAlign(String align) {
+    imageVAlign_ = align;
+  }
+
+  /**
+   * Returns the image valign
+   * @return Returns the image valign
+   */
+  public String getImageVAlign() {
+    return imageVAlign_;
+  }
+
+  /**
+   * Returns the scaleToFit dimensions to be applied for image-cells.
+   * @return Returns the scaleToFit dimensions to be applied for image-cells.
+   */
+  public ImageScaleToFit getImageScaleToFit()
+  {
+    return this.imageScaleToFit_;
+  }
+
+  /**
+   * Sets the scaleToFit dimensions to be applied for image-cells.
+   * @param imageScaleToFit_ The scaleToFit dimensions to be applied for image-cells.
+   */
+  public void setImageScaleToFit(ImageScaleToFit imageScaleToFit)
+  {
+    this.imageScaleToFit_ = imageScaleToFit;
+  }
+
+  /**
+   * The toString method, used for tests or debugging.
+   */
+  public String toString() {
+    return "bgcolor:" + getBgColor() + " halign:" + getHAlign() + " valign:" + getVAlign() + " padding:" + getPadding() + " border:" + getBorder() + " font:" + getFont() + " valuefont:" + getValueFont() + " imageScaleToFit:" + getImageScaleToFit();
+  }
+
+  /**
+   * This method inherits all style attributes (values) from a given style object.
+   * 
+   * <p>
+   * A new style object is created that receives the properly inherited styles.
+   * </p>
+   * <p>
+   * If a value is not defined in the <code>baseStyle</code> object it would be inhert from the <code>inheritStyle</code> object.
+   * </p>
+   * 
+   * @param baseStyle the style object that serves as a primary style source.
+   * @param inheritStyle the style object that serves as a secondary style source in case a style attribute is not defined on the primary style source. 
+   * @param isValue 
+   * @return Returns a new Style object being fully equipped with styles.
+   */
+  public static Style doInherit(Style baseStyle, Style inheritStyle) {
+    Style newStyle = new Style();
+    
+    if (baseStyle != null)
+    {
+      newStyle.setBgColor(baseStyle.getBgColor());
+      newStyle.setBorder(baseStyle.getBorder());
+      newStyle.setFont(baseStyle.getFont());
+      newStyle.setHAlign(baseStyle.getHAlign());
+      newStyle.setImageHAlign(baseStyle.getImageHAlign());
+      newStyle.setImageVAlign(baseStyle.getImageVAlign());
+      newStyle.setPadding(baseStyle.getPadding());
+      newStyle.setVAlign(baseStyle.getVAlign());
+      newStyle.setValueFont(baseStyle.getValueFont());
+      newStyle.setValueHAlign(baseStyle.getValueHAlign());
+      newStyle.setValueVAlign(baseStyle.getValueVAlign());
+      newStyle.setImageScaleToFit(baseStyle.getImageScaleToFit());
+    }
+    
+    if (inheritStyle != null)
+    {
+      if (newStyle.getBgColor() == null) { newStyle.setBgColor(inheritStyle.getBgColor()); }
+      if (newStyle.getBorder() == DEFAULT_BORDER) { newStyle.setBorder(inheritStyle.getBorder()); }
+      if (newStyle.getFont() == null) { newStyle.setFont(inheritStyle.getFont()); }
+      if (newStyle.getHAlign() == null) { newStyle.setHAlign(inheritStyle.getHAlign()); }
+      if (newStyle.getImageHAlign() == null) { newStyle.setImageHAlign(inheritStyle.getImageHAlign()); }
+      if (newStyle.getImageVAlign() == null) { newStyle.setImageVAlign(inheritStyle.getImageVAlign()); }
+      if (newStyle.getPadding() == DEFAULT_PADDING) { newStyle.setPadding(inheritStyle.getPadding()); }
+      if (newStyle.getVAlign() == null) { newStyle.setVAlign(inheritStyle.getVAlign()); }
+      if (newStyle.getValueFont() == null) { newStyle.setValueFont(inheritStyle.getValueFont()); }
+      if (newStyle.getValueHAlign() == null) { newStyle.setValueHAlign(inheritStyle.getValueHAlign()); }
+      if (newStyle.getValueVAlign() == null) { newStyle.setValueVAlign(inheritStyle.getValueVAlign()); }
+      if (newStyle.getImageScaleToFit() == null) { newStyle.setImageScaleToFit(inheritStyle.getImageScaleToFit()); }
+   }
+    
+   return newStyle;
+  }
+  
+  protected static ImageScaleToFit parseImageScaleToFit (String imageScaleToFit)
+  {
+    if (imageScaleToFit == null || imageScaleToFit.length() == 0 || imageScaleToFit.trim().length() == 0)
+    {
+      return null;
+    }
+    
+    String [] dimensions = imageScaleToFit.split(";");
+    if (dimensions.length != 2)
+    {
+      return null;
+    }
+    
+    float width = Float.parseFloat(dimensions[0]);
+    float height = Float.parseFloat(dimensions[0]);
+    
+    return new ImageScaleToFit(width, height);
+  }
+  
+  /**
+   * Holds the width and the height an image can be scaled to fit.
+   * 
+   * @author wprinz
+   */
+  public static class ImageScaleToFit
+  {
+    /**
+     * The width.
+     */
+    protected float width;
+    
+    /**
+     * The height.
+     */
+    protected float height;
+
+    /**
+     * Constructor.
+     * 
+     * @param width The width.
+     * @param height The height.
+     */
+    public ImageScaleToFit(float width, float height)
+    {
+      this.width = width;
+      this.height = height;
+    }
+
+    /**
+     * Returns the width.
+     * @return Returns the width.
+     */
+    public float getWidth()
+    {
+      return this.width;
+    }
+
+    /**
+     * Sets the width.
+     * @param width The width to set.
+     */
+    public void setWidth(float width)
+    {
+      this.width = width;
+    }
+
+    /**
+     * Returns the height.
+     * @return Returns the height.
+     */
+    public float getHeight()
+    {
+      return this.height;
+    }
+
+    /**
+     * Sets the height.
+     * @param height The height to set.
+     */
+    public void setHeight(float height)
+    {
+      this.height = height;
+    }
+     
+  }
+}
diff --git a/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/table/Table.java b/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/table/Table.java
index c5a0c58f..de471e11 100644
--- a/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/table/Table.java
+++ b/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/table/Table.java
@@ -1,223 +1,246 @@
-/**

- * <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.

- *

- * $Id: Table.java,v 1.2 2006/08/25 17:08:19 wprinz Exp $

- */

-package at.knowcenter.wag.egov.egiz.table;

-

-import java.io.Serializable;

-import java.util.Map;

-import java.util.HashMap;

-import java.util.ArrayList;

-

-/**

- * This class implements an abstract table definition. The table contains table

- * rows and the table rows contains the table entries. A table can be styled and

- * a relative column width can be set.

- * 

- * @author wlackner

- * @see Style

- * @see at.knowcenter.wag.egov.egiz.table.Entry

- */

-public class Table implements Serializable

-{

-

-  /**

-   * SVUID.

-   */

-  private static final long serialVersionUID = 8488947943674086618L;

-

-  /**

-   * The table column settings.

-   */

-  private float[] colsRelativeWith_ = null;

-

-  /**

-   * The row definitions.

-   */

-  private Map rows_ = new HashMap();

-

-  /**

-   * The table width.

-   */

-  private float width_ = 100;

-

-  /**

-   * The table style.

-   */

-  private Style style_ = null;

-

-  /**

-   * Number of columns that are defined for the current table.

-   */

-  private int maxCols_ = 0;

-

-  /**

-   * A table name.

-   */

-  private String name_ = null;

-

-  /**

-   * The table constructor init by a table name.

-   * 

-   * @param name

-   *          the name for the table.

-   */

-  public Table(String name)

-  {

-    name_ = name;

-  }

-

-  /**

-   * The width of the columns are relative to each other. This means the values

-   * are summarized and divided into portions of columns used. <br>

-   * Example: <code>[1,4]</code> means the second column is four times wider

-   * than the first column.

-   * 

-   * @return Returns the relative width of the columns

-   */

-  public float[] getColsRelativeWith()

-  {

-    return colsRelativeWith_;

-  }

-

-  /**

-   * The width of the columns are relative to each other. This means the values

-   * are summarized and divided into portions of columns used. <br>

-   * Example: <code>[10,90]</code> means the first colum consumes 10% and the

-   * second column consumes 90% of the table width. <br>

-   * The relative width of the columns to set.

-   */

-  public void setColsRelativeWith(float[] cols)

-  {

-    colsRelativeWith_ = cols;

-  }

-

-  /**

-   * @return Returns the style.

-   */

-  public Style getStyle()

-  {

-    return style_;

-  }

-

-  /**

-   * @param style

-   *          The style to set.

-   */

-  public void setStyle(Style style)

-  {

-    style_ = style;

-  }

-

-  /**

-   * @return Returns the width.

-   */

-  public float getWidth()

-  {

-    return width_;

-  }

-

-  /**

-   * @param width

-   *          The width to set.

-   */

-  public void setWidth(float width)

-  {

-    width_ = width;

-  }

-

-  /**

-   * @return Returns the maxCols.

-   */

-  public int getMaxCols()

-  {

-    return maxCols_;

-  }

-

-  /**

-   * @return Returns the name.

-   */

-  public String getName()

-  {

-    return name_;

-  }

-

-  /**

-   * This method returns a sorted row list beginning with the row number 1. The

-   * entrys in a row also stored in a <code>{@link java.util.ArrayList}</code>.

-   * 

-   * @return Returns the sorted (by row number) table rows.

-   */

-  public ArrayList getRows()

-  {

-    ArrayList rows = new ArrayList();

-    for (int row_idx = 1; row_idx <= rows_.size(); row_idx++)

-    {

-      ArrayList row = (ArrayList) rows_.get("" + row_idx);

-      rows.add(row);

-    }

-    return rows;

-  }

-

-  /**

-   * Add a comlete table row to the current table. Be carefull usding the

-   * correct row number because no check is done if a row with the given row

-   * number does exist! In that case the stored row would be replaced!

-   * 

-   * @param rowNumber

-   *          the row number to store the row entries

-   * @param row

-   *          the entry list to store

-   */

-  public void addRow(String rowNumber, ArrayList row)

-  {

-    rows_.put(rowNumber, row);

-    if (row.size() > maxCols_)

-    {

-      maxCols_ = row.size();

-    }

-  }

-

-  /**

-   * The toString method, used for tests or debugging.

-   */

-  public String toString()

-  {

-    String the_string = "\n#### TABLE " + name_ + " BEGIN #####";

-    the_string += " Width:" + width_ + " max cols:" + maxCols_ + " cols:" + colsRelativeWith_;

-    the_string += "\nStyle:" + style_;

-    ArrayList rows = getRows();

-    for (int row_idx = 0; row_idx < rows.size(); row_idx++)

-    {

-      ArrayList row = (ArrayList) rows.get(row_idx);

-      String row_prefix = "\n ++ ROW " + row_idx + " ++ ";

-      for (int entry_idx = 0; entry_idx < row.size(); entry_idx++)

-      {

-        the_string += row_prefix + ((Entry) row.get(entry_idx)).toString();

-      }

-    }

-    the_string += "\n#### TABLE " + name_ + " END #####";

-    return the_string;

-  }

-}
\ No newline at end of file
+/*******************************************************************************
+ * <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.
+ *
+ * $Id: Table.java,v 1.2 2006/08/25 17:08:19 wprinz Exp $
+ */
+package at.knowcenter.wag.egov.egiz.table;
+
+import java.io.Serializable;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.ArrayList;
+
+/**
+ * This class implements an abstract table definition. The table contains table
+ * rows and the table rows contains the table entries. A table can be styled and
+ * a relative column width can be set.
+ * 
+ * @author wlackner
+ * @see Style
+ * @see at.knowcenter.wag.egov.egiz.table.Entry
+ */
+public class Table implements Serializable
+{
+
+  /**
+   * SVUID.
+   */
+  private static final long serialVersionUID = 8488947943674086618L;
+
+  /**
+   * The table column settings.
+   */
+  private float[] colsRelativeWith_ = null;
+
+  /**
+   * The row definitions.
+   */
+  private Map rows_ = new HashMap();
+
+  /**
+   * The table width.
+   */
+  private float width_ = 100;
+
+  /**
+   * The table style.
+   */
+  private Style style_ = null;
+
+  /**
+   * Number of columns that are defined for the current table.
+   */
+  private int maxCols_ = 0;
+
+  /**
+   * A table name.
+   */
+  private String name_ = null;
+
+  /**
+   * The table constructor init by a table name.
+   * 
+   * @param name
+   *          the name for the table.
+   */
+  public Table(String name)
+  {
+    name_ = name;
+  }
+
+  /**
+   * The width of the columns are relative to each other. This means the values
+   * are summarized and divided into portions of columns used. <br>
+   * Example: <code>[1,4]</code> means the second column is four times wider
+   * than the first column.
+   * 
+   * @return Returns the relative width of the columns
+   */
+  public float[] getColsRelativeWith()
+  {
+    return colsRelativeWith_;
+  }
+
+  /**
+   * The width of the columns are relative to each other. This means the values
+   * are summarized and divided into portions of columns used. <br>
+   * Example: <code>[10,90]</code> means the first colum consumes 10% and the
+   * second column consumes 90% of the table width. <br>
+   * The relative width of the columns to set.
+   */
+  public void setColsRelativeWith(float[] cols)
+  {
+    colsRelativeWith_ = cols;
+  }
+
+  /**
+   * @return Returns the style.
+   */
+  public Style getStyle()
+  {
+    return style_;
+  }
+
+  /**
+   * @param style
+   *          The style to set.
+   */
+  public void setStyle(Style style)
+  {
+    style_ = style;
+  }
+
+  /**
+   * @return Returns the width.
+   */
+  public float getWidth()
+  {
+    return width_;
+  }
+
+  /**
+   * @param width
+   *          The width to set.
+   */
+  public void setWidth(float width)
+  {
+    width_ = width;
+  }
+
+  /**
+   * @return Returns the maxCols.
+   */
+  public int getMaxCols()
+  {
+    return maxCols_;
+  }
+
+  /**
+   * @return Returns the name.
+   */
+  public String getName()
+  {
+    return name_;
+  }
+
+  /**
+   * This method returns a sorted row list beginning with the row number 1. The
+   * entrys in a row also stored in a <code>{@link java.util.ArrayList}</code>.
+   * 
+   * @return Returns the sorted (by row number) table rows.
+   */
+  public ArrayList getRows()
+  {
+    ArrayList rows = new ArrayList();
+    for (int row_idx = 1; row_idx <= rows_.size(); row_idx++)
+    {
+      ArrayList row = (ArrayList) rows_.get("" + row_idx);
+      rows.add(row);
+    }
+    return rows;
+  }
+
+  /**
+   * Add a comlete table row to the current table. Be carefull usding the
+   * correct row number because no check is done if a row with the given row
+   * number does exist! In that case the stored row would be replaced!
+   * 
+   * @param rowNumber
+   *          the row number to store the row entries
+   * @param row
+   *          the entry list to store
+   */
+  public void addRow(String rowNumber, ArrayList row)
+  {
+    rows_.put(rowNumber, row);
+    if (row.size() > maxCols_)
+    {
+      maxCols_ = row.size();
+    }
+  }
+
+  /**
+   * The toString method, used for tests or debugging.
+   */
+  public String toString()
+  {
+    String the_string = "\n#### TABLE " + name_ + " BEGIN #####";
+    the_string += " Width:" + width_ + " max cols:" + maxCols_ + " cols:" + colsRelativeWith_;
+    the_string += "\nStyle:" + style_;
+    ArrayList rows = getRows();
+    for (int row_idx = 0; row_idx < rows.size(); row_idx++)
+    {
+      ArrayList row = (ArrayList) rows.get(row_idx);
+      String row_prefix = "\n ++ ROW " + row_idx + " ++ ";
+      for (int entry_idx = 0; entry_idx < row.size(); entry_idx++)
+      {
+        the_string += row_prefix + ((Entry) row.get(entry_idx)).toString();
+      }
+    }
+    the_string += "\n#### TABLE " + name_ + " END #####";
+    return the_string;
+  }
+}
diff --git a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/config/WebConfiguration.java b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/config/WebConfiguration.java
index b978b361..f073ca56 100644
--- a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/config/WebConfiguration.java
+++ b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/config/WebConfiguration.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.
+ ******************************************************************************/
 package at.gv.egiz.pdfas.web.config;
 
 import java.io.File;
diff --git a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/config/package-info.java b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/config/package-info.java
index 6334ff83..f7bb5755 100644
--- a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/config/package-info.java
+++ b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/config/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.web.config;
\ No newline at end of file
+package at.gv.egiz.pdfas.web.config;
diff --git a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/exception/PdfAsSecurityLayerException.java b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/exception/PdfAsSecurityLayerException.java
index e499302d..08577034 100644
--- a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/exception/PdfAsSecurityLayerException.java
+++ b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/exception/PdfAsSecurityLayerException.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.
+ ******************************************************************************/
 package at.gv.egiz.pdfas.web.exception;
 
 public class PdfAsSecurityLayerException extends Exception {
diff --git a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/exception/PdfAsWebException.java b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/exception/PdfAsWebException.java
index 3e734265..93161a07 100644
--- a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/exception/PdfAsWebException.java
+++ b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/exception/PdfAsWebException.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.
+ ******************************************************************************/
 package at.gv.egiz.pdfas.web.exception;
 
 public class PdfAsWebException extends Exception {
diff --git a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/exception/package-info.java b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/exception/package-info.java
index 206f5f40..fb83dfb1 100644
--- a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/exception/package-info.java
+++ b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/exception/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.web.exception;
\ No newline at end of file
+package at.gv.egiz.pdfas.web.exception;
diff --git a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/filter/ExceptionCatchFilter.java b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/filter/ExceptionCatchFilter.java
index d782c4dc..beac8a09 100644
--- a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/filter/ExceptionCatchFilter.java
+++ b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/filter/ExceptionCatchFilter.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.
+ ******************************************************************************/
 package at.gv.egiz.pdfas.web.filter;
 
 import java.io.IOException;
diff --git a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/helper/DigestHelper.java b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/helper/DigestHelper.java
index af002da4..50ed92f1 100644
--- a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/helper/DigestHelper.java
+++ b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/helper/DigestHelper.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.
+ ******************************************************************************/
 package at.gv.egiz.pdfas.web.helper;
 
 import java.security.MessageDigest;
diff --git a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/helper/HTMLFormater.java b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/helper/HTMLFormater.java
index fe2c9271..2ac3b716 100644
--- a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/helper/HTMLFormater.java
+++ b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/helper/HTMLFormater.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.
+ ******************************************************************************/
 package at.gv.egiz.pdfas.web.helper;
 
 public class HTMLFormater {
diff --git a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/helper/PDFASSession.java b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/helper/PDFASSession.java
index dd914384..99e51d31 100644
--- a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/helper/PDFASSession.java
+++ b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/helper/PDFASSession.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.
+ ******************************************************************************/
 package at.gv.egiz.pdfas.web.helper;
 
 import java.io.Serializable;
diff --git a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/helper/PdfAsHelper.java b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/helper/PdfAsHelper.java
index 631ca15e..450908a9 100644
--- a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/helper/PdfAsHelper.java
+++ b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/helper/PdfAsHelper.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.
+ ******************************************************************************/
 package at.gv.egiz.pdfas.web.helper;
 
 import java.io.File;
diff --git a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/helper/PdfAsParameterExtractor.java b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/helper/PdfAsParameterExtractor.java
index 500266be..dbdb3716 100644
--- a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/helper/PdfAsParameterExtractor.java
+++ b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/helper/PdfAsParameterExtractor.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.
+ ******************************************************************************/
 package at.gv.egiz.pdfas.web.helper;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/helper/RemotePDFFetcher.java b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/helper/RemotePDFFetcher.java
index cb404b66..e48a4eee 100644
--- a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/helper/RemotePDFFetcher.java
+++ b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/helper/RemotePDFFetcher.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.
+ ******************************************************************************/
 package at.gv.egiz.pdfas.web.helper;
 
 import java.io.InputStream;
diff --git a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/helper/package-info.java b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/helper/package-info.java
index 5f9a6b5d..c600bc4c 100644
--- a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/helper/package-info.java
+++ b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/helper/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.web.helper;
\ No newline at end of file
+package at.gv.egiz.pdfas.web.helper;
diff --git a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/package-info.java b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/package-info.java
index 937390f0..b8ade785 100644
--- a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/package-info.java
+++ b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/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.web;
\ No newline at end of file
+package at.gv.egiz.pdfas.web;
diff --git a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/DataURLServlet.java b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/DataURLServlet.java
index dcb93fb1..ecdc4a8c 100644
--- a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/DataURLServlet.java
+++ b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/DataURLServlet.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.
+ ******************************************************************************/
 package at.gv.egiz.pdfas.web.servlets;
 
 import java.io.IOException;
diff --git a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/ErrorPage.java b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/ErrorPage.java
index 68e143a3..5403c9ab 100644
--- a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/ErrorPage.java
+++ b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/ErrorPage.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.
+ ******************************************************************************/
 package at.gv.egiz.pdfas.web.servlets;
 
 import java.io.IOException;
diff --git a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/ExternSignServlet.java b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/ExternSignServlet.java
index b2649a57..8b36f3a5 100644
--- a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/ExternSignServlet.java
+++ b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/ExternSignServlet.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.
+ ******************************************************************************/
 package at.gv.egiz.pdfas.web.servlets;
 
 import java.io.File;
diff --git a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/PDFData.java b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/PDFData.java
index 0800c05c..745e5ca8 100644
--- a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/PDFData.java
+++ b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/PDFData.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.
+ ******************************************************************************/
 package at.gv.egiz.pdfas.web.servlets;
 
 import java.io.IOException;
diff --git a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/ProvidePDFServlet.java b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/ProvidePDFServlet.java
index 0f949d1d..71772efa 100644
--- a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/ProvidePDFServlet.java
+++ b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/ProvidePDFServlet.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.
+ ******************************************************************************/
 package at.gv.egiz.pdfas.web.servlets;
 
 import java.io.IOException;
diff --git a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/VerifyServlet.java b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/VerifyServlet.java
index 0dd96e78..1f84e151 100644
--- a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/VerifyServlet.java
+++ b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/VerifyServlet.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.
+ ******************************************************************************/
 package at.gv.egiz.pdfas.web.servlets;
 
 import iaik.x509.X509Certificate;
diff --git a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/package-info.java b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/package-info.java
index 6be370f0..80a1b720 100644
--- a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/package-info.java
+++ b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/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.web.servlets;
\ No newline at end of file
+package at.gv.egiz.pdfas.web.servlets;
diff --git a/signature-standards/sigs-pades/src/main/java/at/gv/egiz/pdfas/sigs/pades/PAdESSigner.java b/signature-standards/sigs-pades/src/main/java/at/gv/egiz/pdfas/sigs/pades/PAdESSigner.java
index 7fc0081b..7c6269e0 100644
--- a/signature-standards/sigs-pades/src/main/java/at/gv/egiz/pdfas/sigs/pades/PAdESSigner.java
+++ b/signature-standards/sigs-pades/src/main/java/at/gv/egiz/pdfas/sigs/pades/PAdESSigner.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.
+ ******************************************************************************/
 package at.gv.egiz.pdfas.sigs.pades;
 
 import iaik.x509.X509Certificate;
diff --git a/signature-standards/sigs-pades/src/main/java/at/gv/egiz/pdfas/sigs/pades/PAdESSignerKeystore.java b/signature-standards/sigs-pades/src/main/java/at/gv/egiz/pdfas/sigs/pades/PAdESSignerKeystore.java
index 89293fa1..0a29c588 100644
--- a/signature-standards/sigs-pades/src/main/java/at/gv/egiz/pdfas/sigs/pades/PAdESSignerKeystore.java
+++ b/signature-standards/sigs-pades/src/main/java/at/gv/egiz/pdfas/sigs/pades/PAdESSignerKeystore.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.
+ ******************************************************************************/
 package at.gv.egiz.pdfas.sigs.pades;
 
 import iaik.asn1.ASN1Object;
@@ -152,4 +175,4 @@ public class PAdESSignerKeystore implements IPlainSigner {
 		return PDSignature.FILTER_ADOBE_PPKLITE.getName();
 	}
 
-}
\ No newline at end of file
+}
diff --git a/signature-standards/sigs-pades/src/main/java/at/gv/egiz/pdfas/sigs/pades/PAdESVerifier.java b/signature-standards/sigs-pades/src/main/java/at/gv/egiz/pdfas/sigs/pades/PAdESVerifier.java
index dcd7f45b..e39db2c6 100644
--- a/signature-standards/sigs-pades/src/main/java/at/gv/egiz/pdfas/sigs/pades/PAdESVerifier.java
+++ b/signature-standards/sigs-pades/src/main/java/at/gv/egiz/pdfas/sigs/pades/PAdESVerifier.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.
+ ******************************************************************************/
 package at.gv.egiz.pdfas.sigs.pades;
 
 import iaik.x509.X509Certificate;
diff --git a/signature-standards/sigs-pkcs7detached/src/main/java/at/gv/egiz/pdfas/sigs/pkcs7detached/PKCS7DetachedSigner.java b/signature-standards/sigs-pkcs7detached/src/main/java/at/gv/egiz/pdfas/sigs/pkcs7detached/PKCS7DetachedSigner.java
index df792256..85446486 100644
--- a/signature-standards/sigs-pkcs7detached/src/main/java/at/gv/egiz/pdfas/sigs/pkcs7detached/PKCS7DetachedSigner.java
+++ b/signature-standards/sigs-pkcs7detached/src/main/java/at/gv/egiz/pdfas/sigs/pkcs7detached/PKCS7DetachedSigner.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.
+ ******************************************************************************/
 package at.gv.egiz.pdfas.sigs.pkcs7detached;
 
 import iaik.asn1.ASN1Object;
diff --git a/signature-standards/sigs-pkcs7detached/src/main/java/at/gv/egiz/pdfas/sigs/pkcs7detached/PKCS7DetachedVerifier.java b/signature-standards/sigs-pkcs7detached/src/main/java/at/gv/egiz/pdfas/sigs/pkcs7detached/PKCS7DetachedVerifier.java
index 7de51d7e..605142a6 100644
--- a/signature-standards/sigs-pkcs7detached/src/main/java/at/gv/egiz/pdfas/sigs/pkcs7detached/PKCS7DetachedVerifier.java
+++ b/signature-standards/sigs-pkcs7detached/src/main/java/at/gv/egiz/pdfas/sigs/pkcs7detached/PKCS7DetachedVerifier.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.
+ ******************************************************************************/
 package at.gv.egiz.pdfas.sigs.pkcs7detached;
 
 import iaik.asn1.ObjectID;
diff --git a/stamper/stmp-itext/src/main/java/at/gv/egiz/pdfas/stmp/itext/ITextStamper.java b/stamper/stmp-itext/src/main/java/at/gv/egiz/pdfas/stmp/itext/ITextStamper.java
index afcac94c..cf179439 100644
--- a/stamper/stmp-itext/src/main/java/at/gv/egiz/pdfas/stmp/itext/ITextStamper.java
+++ b/stamper/stmp-itext/src/main/java/at/gv/egiz/pdfas/stmp/itext/ITextStamper.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.
+ ******************************************************************************/
 package at.gv.egiz.pdfas.stmp.itext;
 
 import java.io.ByteArrayOutputStream;
@@ -554,4 +577,4 @@ public class ITextStamper implements IPDFStamper {
 	public void setSettings(ISettings settings) {
 		this.settings = settings;
 	}
-}
\ No newline at end of file
+}
diff --git a/stamper/stmp-itext/src/main/java/at/gv/egiz/pdfas/stmp/itext/ITextVisualObject.java b/stamper/stmp-itext/src/main/java/at/gv/egiz/pdfas/stmp/itext/ITextVisualObject.java
index 76b8b0fc..b2c20668 100644
--- a/stamper/stmp-itext/src/main/java/at/gv/egiz/pdfas/stmp/itext/ITextVisualObject.java
+++ b/stamper/stmp-itext/src/main/java/at/gv/egiz/pdfas/stmp/itext/ITextVisualObject.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.
+ ******************************************************************************/
 package at.gv.egiz.pdfas.stmp.itext;
 
 import at.gv.egiz.pdfas.lib.impl.stamping.IPDFVisualObject;
diff --git a/stamper/stmp-itext/src/main/java/com/lowagie/text/pdf/ITextStamperAccess.java b/stamper/stmp-itext/src/main/java/com/lowagie/text/pdf/ITextStamperAccess.java
index 171e7420..e50f1552 100644
--- a/stamper/stmp-itext/src/main/java/com/lowagie/text/pdf/ITextStamperAccess.java
+++ b/stamper/stmp-itext/src/main/java/com/lowagie/text/pdf/ITextStamperAccess.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.
+ ******************************************************************************/
 package com.lowagie.text.pdf;
 
 import java.io.IOException;