flatten signer directory

15 files changed, 158 insertions, 165 deletions

diff --git a/pdf-over-gui/pom.xml b/pdf-over-gui/pom.xml
index bdb0e1bd..60f0af41 100644
--- a/pdf-over-gui/pom.xml
+++ b/pdf-over-gui/pom.xml
@@ -33,7 +33,7 @@
 		</dependency>
 		<dependency>
 			<groupId>at.a-sit</groupId>
-			<artifactId>pdf-over-sigpdfas4</artifactId>
+			<artifactId>pdf-over-signer</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
diff --git a/pdf-over-signer/.project b/pdf-over-signer/.project
index 2b698272..7cdcf912 100644
--- a/pdf-over-signer/.project
+++ b/pdf-over-signer/.project
@@ -6,12 +6,18 @@
 	</projects>
 	<buildSpec>
 		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
 			<name>org.eclipse.m2e.core.maven2Builder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 	</natures>
 	<filteredResources>
diff --git a/pdf-over-signer/.settings/org.eclipse.core.resources.prefs b/pdf-over-signer/.settings/org.eclipse.core.resources.prefs
index 99f26c02..abdea9ac 100644
--- a/pdf-over-signer/.settings/org.eclipse.core.resources.prefs
+++ b/pdf-over-signer/.settings/org.eclipse.core.resources.prefs
@@ -1,2 +1,4 @@
 eclipse.preferences.version=1
+encoding//src/main/java=UTF-8
+encoding//src/main/resources=UTF-8
 encoding/<project>=UTF-8
diff --git a/pdf-over-signer/.settings/org.eclipse.jdt.core.prefs b/pdf-over-signer/.settings/org.eclipse.jdt.core.prefs
index 3e73d18e..5621bfa1 100644
--- a/pdf-over-signer/.settings/org.eclipse.jdt.core.prefs
+++ b/pdf-over-signer/.settings/org.eclipse.jdt.core.prefs
@@ -1,9 +1,8 @@
-#Fri Aug 03 18:09:51 CEST 2012
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.compliance=17
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -18,6 +17,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
 org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
 org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
 org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
 org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
@@ -64,6 +64,7 @@ org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
 org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
 org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
 org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=warning
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
 org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
 org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
 org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
@@ -92,7 +93,9 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa
 org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.processAnnotations=disabled
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=17
 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
 org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL,LOW
 org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,NOTE
diff --git a/pdf-over-signer/pdf-over-sigpdfas4/pom.xml b/pdf-over-signer/pdf-over-sigpdfas4/pom.xml
deleted file mode 100644
index 28808999..00000000
--- a/pdf-over-signer/pdf-over-sigpdfas4/pom.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<artifactId>pdf-over-signer</artifactId>
-		<groupId>at.a-sit</groupId>
-		<version>4.4.2-SNAPSHOT</version>
-<!-- 		<relativePath>..</relativePath> -->
-	</parent>
-	<artifactId>pdf-over-sigpdfas4</artifactId>
-	<name>PDF-Over PDF-AS 4 Signer</name>
-	<properties>
-		<pdfover-build.root-dir>${project.basedir}/../..</pdfover-build.root-dir>
-		<pdfover-build.pdfas-version>4.2.1-snapshot</pdfover-build.pdfas-version>
-	</properties>
-	<dependencies>
-		<dependency>
-			<groupId>at.a-sit</groupId>
-			<artifactId>pdf-over-signator</artifactId>
-			<version>${project.parent.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>at.gv.egiz.pdfas</groupId>
-			<artifactId>pdf-as-lib</artifactId>
-			<version>${pdfover-build.pdfas-version}</version>
-		</dependency>
-		<dependency>
-			<groupId>at.gv.egiz.pdfas</groupId>
-			<artifactId>sigs-pades</artifactId>
-			<version>${pdfover-build.pdfas-version}</version>
-		</dependency>
-		<dependency>
-			<groupId>at.gv.egiz.pdfas</groupId>
-			<artifactId>pdf-as-pdfbox-2</artifactId>
-			<version>${pdfover-build.pdfas-version}</version>
-		</dependency>
-		<dependency>
-			<groupId>iaik.prod</groupId>
-			<artifactId>iaik_jce_full</artifactId>
-			<version>5.63_moa</version>
-		</dependency>
-		<dependency>
-			<groupId>iaik</groupId>
-			<artifactId>iaik_eccelerate</artifactId>
-			<version>3.01</version>
-		</dependency>
-		<dependency>
-			<groupId>iaik</groupId>
-			<artifactId>iaik_cms</artifactId>
-			<version>2.15</version>
-		</dependency>
-		<dependency>
-			<groupId>iaik</groupId>
-			<artifactId>iaik_eccelerate_cms</artifactId>
-			<version>3.01</version>
-		</dependency>
-		<dependency>
-			<groupId>at.a-sit</groupId>
-			<artifactId>pdf-over-commons</artifactId>
-			<version>${project.parent.version}</version>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.pdfbox</groupId>
-			<artifactId>pdfbox</artifactId>
-			<version>2.0.24</version>
-		</dependency>
-	</dependencies>
-	<repositories>
-		<repository>
-			<id>EGIZ Maven</id>
-			<name>EGIZ Maven Repository</name>
-			<url>https://apps.egiz.gv.at/maven/</url>
-		</repository>
-		<repository>
-			<id>local-repo</id>
-			<url>file://${pdfover-build.root-dir}/repo</url>
-		</repository>
-	</repositories>
-</project>
diff --git a/pdf-over-signer/pom.xml b/pdf-over-signer/pom.xml
index 4cfdbf90..3f7ca98f 100644
--- a/pdf-over-signer/pom.xml
+++ b/pdf-over-signer/pom.xml
@@ -7,12 +7,73 @@
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>pdf-over-signer</artifactId>
-	<name>PDF-Over PDF-Signer libraries</name>
-	<packaging>pom</packaging>
+	<name>PDF-Over PDF-AS 4 Signer</name>
 	<properties>
 		<pdfover-build.root-dir>${project.basedir}/..</pdfover-build.root-dir>
+		<pdfover-build.pdfas-version>4.2.1-snapshot</pdfover-build.pdfas-version>
 	</properties>
-	<modules>
-		<module>pdf-over-sigpdfas4</module>
-	</modules>
+    <dependencies>
+		<dependency>
+			<groupId>at.a-sit</groupId>
+			<artifactId>pdf-over-signator</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>at.gv.egiz.pdfas</groupId>
+			<artifactId>pdf-as-lib</artifactId>
+			<version>${pdfover-build.pdfas-version}</version>
+		</dependency>
+		<dependency>
+			<groupId>at.gv.egiz.pdfas</groupId>
+			<artifactId>sigs-pades</artifactId>
+			<version>${pdfover-build.pdfas-version}</version>
+		</dependency>
+		<dependency>
+			<groupId>at.gv.egiz.pdfas</groupId>
+			<artifactId>pdf-as-pdfbox-2</artifactId>
+			<version>${pdfover-build.pdfas-version}</version>
+		</dependency>
+		<dependency>
+			<groupId>iaik.prod</groupId>
+			<artifactId>iaik_jce_full</artifactId>
+			<version>5.63_moa</version>
+		</dependency>
+		<dependency>
+			<groupId>iaik</groupId>
+			<artifactId>iaik_eccelerate</artifactId>
+			<version>3.01</version>
+		</dependency>
+		<dependency>
+			<groupId>iaik</groupId>
+			<artifactId>iaik_cms</artifactId>
+			<version>2.15</version>
+		</dependency>
+		<dependency>
+			<groupId>iaik</groupId>
+			<artifactId>iaik_eccelerate_cms</artifactId>
+			<version>3.01</version>
+		</dependency>
+		<dependency>
+			<groupId>at.a-sit</groupId>
+			<artifactId>pdf-over-commons</artifactId>
+			<version>${project.parent.version}</version>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.pdfbox</groupId>
+			<artifactId>pdfbox</artifactId>
+			<version>2.0.24</version>
+		</dependency>
+	</dependencies>
+	<repositories>
+		<repository>
+			<id>EGIZ Maven</id>
+			<name>EGIZ Maven Repository</name>
+			<url>https://apps.egiz.gv.at/maven/</url>
+		</repository>
+		<repository>
+			<id>local-repo</id>
+			<url>file://${pdfover-build.root-dir}/repo</url>
+		</repository>
+	</repositories>
 </project>
diff --git a/pdf-over-signer/pdf-over-sigpdfas4/src/main/java/at/asit/pdfover/signer/pdfas/PdfAs4BKUSLConnector.java b/pdf-over-signer/src/main/java/at/asit/pdfover/signer/pdfas/PdfAs4BKUSLConnector.java
index 124bf43d..124bf43d 100644
--- a/pdf-over-signer/pdf-over-sigpdfas4/src/main/java/at/asit/pdfover/signer/pdfas/PdfAs4BKUSLConnector.java
+++ b/pdf-over-signer/src/main/java/at/asit/pdfover/signer/pdfas/PdfAs4BKUSLConnector.java
diff --git a/pdf-over-signer/pdf-over-sigpdfas4/src/main/java/at/asit/pdfover/signer/pdfas/PdfAs4Helper.java b/pdf-over-signer/src/main/java/at/asit/pdfover/signer/pdfas/PdfAs4Helper.java
index e523637f..e0b8ff46 100644
--- a/pdf-over-signer/pdf-over-sigpdfas4/src/main/java/at/asit/pdfover/signer/pdfas/PdfAs4Helper.java
+++ b/pdf-over-signer/src/main/java/at/asit/pdfover/signer/pdfas/PdfAs4Helper.java
@@ -1,76 +1,76 @@
-/*

- * Copyright 2012 by A-SIT, Secure Information Technology Center Austria

- *

- * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by

- * the European Commission - subsequent versions of the EUPL (the "Licence");

- * You may not use this work except in compliance with the Licence.

- * You may obtain a copy of the Licence at:

- * http://joinup.ec.europa.eu/software/page/eupl

- *

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the Licence is distributed on an "AS IS" basis,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the Licence for the specific language governing permissions and

- * limitations under the Licence.

- */

-package at.asit.pdfover.signer.pdfas;

-

-// Imports

-import java.io.File;

-

-import org.slf4j.Logger;

-import org.slf4j.LoggerFactory;

-

-import at.asit.pdfover.signator.SignatureException;

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

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

-

-/**

- * PDF-AS 4 Helper

- */

-public class PdfAs4Helper {

-	/**

-	 * SLF4J Logger instance

-	 **/

-	@SuppressWarnings("unused")

-	private static final Logger log = LoggerFactory

-			.getLogger(PdfAs4Helper.class);

-

-	/**

-	 * PDF-AS Object

-	 */

-	private static PdfAs pdfAs = null;

-

-	/**

-	 * Gets PDF-AS Object

-	 * @return the PDF-AS Object

-	 * @throws SignatureException

-	 */

-	public static synchronized PdfAs getPdfAs() throws SignatureException {

-		if (pdfAs == null) {

-			try {

-				pdfAs = createPdfAs();

-			} catch(Exception e) {

-				throw new SignatureException(e);

-			}

-		}

-		return pdfAs;

-	}

-

-	/**

-	 * Creates PDF-AS Object

-	 * @return the PDF-AS Object

-	 * @throws PdfAsException

-	 */

-	private static PdfAs createPdfAs() {

-		return PdfAsFactory.createPdfAs(new File(getWorkDir()));

-	}

-

-	/**

-	 * Provides the working directory

-	 * @return the working directory

-	 */

-	public static String getWorkDir() {

-		return System.getProperty("user.home") + "/.pdf-over";

-	}

-}

+/*
+ * Copyright 2012 by A-SIT, Secure Information Technology Center Austria
+ *
+ * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by
+ * the European Commission - subsequent versions of the EUPL (the "Licence");
+ * You may not use this work except in compliance with the Licence.
+ * You may obtain a copy of the Licence at:
+ * http://joinup.ec.europa.eu/software/page/eupl
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the Licence is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the Licence for the specific language governing permissions and
+ * limitations under the Licence.
+ */
+package at.asit.pdfover.signer.pdfas;
+
+// Imports
+import java.io.File;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import at.asit.pdfover.signator.SignatureException;
+import at.gv.egiz.pdfas.lib.api.PdfAs;
+import at.gv.egiz.pdfas.lib.api.PdfAsFactory;
+
+/**
+ * PDF-AS 4 Helper
+ */
+public class PdfAs4Helper {
+	/**
+	 * SLF4J Logger instance
+	 **/
+	@SuppressWarnings("unused")
+	private static final Logger log = LoggerFactory
+			.getLogger(PdfAs4Helper.class);
+
+	/**
+	 * PDF-AS Object
+	 */
+	private static PdfAs pdfAs = null;
+
+	/**
+	 * Gets PDF-AS Object
+	 * @return the PDF-AS Object
+	 * @throws SignatureException
+	 */
+	public static synchronized PdfAs getPdfAs() throws SignatureException {
+		if (pdfAs == null) {
+			try {
+				pdfAs = createPdfAs();
+			} catch(Exception e) {
+				throw new SignatureException(e);
+			}
+		}
+		return pdfAs;
+	}
+
+	/**
+	 * Creates PDF-AS Object
+	 * @return the PDF-AS Object
+	 * @throws PdfAsException
+	 */
+	private static PdfAs createPdfAs() {
+		return PdfAsFactory.createPdfAs(new File(getWorkDir()));
+	}
+
+	/**
+	 * Provides the working directory
+	 * @return the working directory
+	 */
+	public static String getWorkDir() {
+		return System.getProperty("user.home") + "/.pdf-over";
+	}
+}
diff --git a/pdf-over-signer/pdf-over-sigpdfas4/src/main/java/at/asit/pdfover/signer/pdfas/PdfAs4SLRequest.java b/pdf-over-signer/src/main/java/at/asit/pdfover/signer/pdfas/PdfAs4SLRequest.java
index 87b97ac9..87b97ac9 100644
--- a/pdf-over-signer/pdf-over-sigpdfas4/src/main/java/at/asit/pdfover/signer/pdfas/PdfAs4SLRequest.java
+++ b/pdf-over-signer/src/main/java/at/asit/pdfover/signer/pdfas/PdfAs4SLRequest.java
diff --git a/pdf-over-signer/pdf-over-sigpdfas4/src/main/java/at/asit/pdfover/signer/pdfas/PdfAs4SignatureParameter.java b/pdf-over-signer/src/main/java/at/asit/pdfover/signer/pdfas/PdfAs4SignatureParameter.java
index 032416cd..032416cd 100644
--- a/pdf-over-signer/pdf-over-sigpdfas4/src/main/java/at/asit/pdfover/signer/pdfas/PdfAs4SignatureParameter.java
+++ b/pdf-over-signer/src/main/java/at/asit/pdfover/signer/pdfas/PdfAs4SignatureParameter.java
diff --git a/pdf-over-signer/pdf-over-sigpdfas4/src/main/java/at/asit/pdfover/signer/pdfas/PdfAs4Signer.java b/pdf-over-signer/src/main/java/at/asit/pdfover/signer/pdfas/PdfAs4Signer.java
index 9943ec0e..9943ec0e 100644
--- a/pdf-over-signer/pdf-over-sigpdfas4/src/main/java/at/asit/pdfover/signer/pdfas/PdfAs4Signer.java
+++ b/pdf-over-signer/src/main/java/at/asit/pdfover/signer/pdfas/PdfAs4Signer.java
diff --git a/pdf-over-signer/pdf-over-sigpdfas4/src/main/java/at/asit/pdfover/signer/pdfas/PdfAs4SignerFactory.java b/pdf-over-signer/src/main/java/at/asit/pdfover/signer/pdfas/PdfAs4SignerFactory.java
index 3fa7ce16..3fa7ce16 100644
--- a/pdf-over-signer/pdf-over-sigpdfas4/src/main/java/at/asit/pdfover/signer/pdfas/PdfAs4SignerFactory.java
+++ b/pdf-over-signer/src/main/java/at/asit/pdfover/signer/pdfas/PdfAs4SignerFactory.java
diff --git a/pdf-over-signer/pdf-over-sigpdfas4/src/main/java/at/asit/pdfover/signer/pdfas/PdfAs4SigningState.java b/pdf-over-signer/src/main/java/at/asit/pdfover/signer/pdfas/PdfAs4SigningState.java
index f0aff1c8..f0aff1c8 100644
--- a/pdf-over-signer/pdf-over-sigpdfas4/src/main/java/at/asit/pdfover/signer/pdfas/PdfAs4SigningState.java
+++ b/pdf-over-signer/src/main/java/at/asit/pdfover/signer/pdfas/PdfAs4SigningState.java
diff --git a/pdf-over-signer/pdf-over-sigpdfas4/src/main/java/at/asit/pdfover/signer/pdfas/exceptions/PdfAs4SLRequestException.java b/pdf-over-signer/src/main/java/at/asit/pdfover/signer/pdfas/exceptions/PdfAs4SLRequestException.java
index ab50e78b..ab50e78b 100644
--- a/pdf-over-signer/pdf-over-sigpdfas4/src/main/java/at/asit/pdfover/signer/pdfas/exceptions/PdfAs4SLRequestException.java
+++ b/pdf-over-signer/src/main/java/at/asit/pdfover/signer/pdfas/exceptions/PdfAs4SLRequestException.java
diff --git a/pdf-over-signer/pdf-over-sigpdfas4/src/main/resources/qualified.cer b/pdf-over-signer/src/main/resources/qualified.cer
index e083c81e..e083c81e 100644
--- a/pdf-over-signer/pdf-over-sigpdfas4/src/main/resources/qualified.cer
+++ b/pdf-over-signer/src/main/resources/qualified.cer