18 files changed, 146 insertions, 13 deletions
diff --git a/pdf-as-lib/src/configuration/cfg/advancedconfig.properties b/pdf-as-lib/src/configuration/cfg/advancedconfig.properties
index 02ed4fbe..cfe6ffbc 100644
--- a/pdf-as-lib/src/configuration/cfg/advancedconfig.properties
+++ b/pdf-as-lib/src/configuration/cfg/advancedconfig.properties
@@ -79,5 +79,5 @@
 
 #register Verificators
 
-default.verifier.01=at.gv.egiz.pdfas.sigs.pkcs7detached.PKCS7DetachedVerifier
-default.verifier.02=at.gv.egiz.pdfas.sigs.pades.PAdESVerifier
+default.verifier.01=at.gv.egiz.pdfas.sigs.pades.PAdESVerifier
+#default.verifier.02=at.gv.egiz.pdfas.sigs.pkcs7detached.PKCS7DetachedVerifier
+\ No newline at end of file
diff --git a/pdf-as-lib/src/configuration/cfg/profiles.zip b/pdf-as-lib/src/configuration/cfg/profiles.zip
new file mode 100644
index 00000000..c520ad43
--- /dev/null
+++ b/pdf-as-lib/src/configuration/cfg/profiles.zip
diff --git a/pdf-as-lib/src/configuration/cfg/profiles/BASE_NORMAL.properties b/pdf-as-lib/src/configuration/cfg/profiles/BASE_NORMAL.properties
index aa3a9710..c8a0d084 100644
--- a/pdf-as-lib/src/configuration/cfg/profiles/BASE_NORMAL.properties
+++ b/pdf-as-lib/src/configuration/cfg/profiles/BASE_NORMAL.properties
@@ -71,7 +71,7 @@ sig_obj.BASE_NORMAL.value.SIG_LABEL=./images/signatur-logo_de.png
 
 #---------------------- MAIN TABLE -------------------------
 sig_obj.BASE_NORMAL.table.main.1=SIG_LABEL-i|TABLE-info
-sig_obj.BASE_NORMAL.table.main.2=SIG_NOTE-cv
+#sig_obj.BASE_NORMAL.table.main.2=SIG_NOTE-cv
 
 sig_obj.BASE_NORMAL.table.main.ColsWidth=1 6
 sig_obj.BASE_NORMAL.table.main.Style.bgcolor=255 255 255
diff --git a/pdf-as-lib/src/configuration/cfg/profiles/BASE_NORMAL_EN_NOTE.properties b/pdf-as-lib/src/configuration/cfg/profiles/BASE_NORMAL_EN_NOTE.properties
new file mode 100644
index 00000000..c192257d
--- /dev/null
+++ b/pdf-as-lib/src/configuration/cfg/profiles/BASE_NORMAL_EN_NOTE.properties
@@ -0,0 +1,10 @@
+
+###################################################################################################
+# PROFIL: Signaturblock (Deutsch) mit neuem Layout
+
+# Kurzbeschreibung
+sig_obj.BASE_NORMAL_EN_NOTE.description=Standardsignatur klein Deutsch
+sig_obj.BASE_NORMAL_EN_NOTE.parent=BASE_NORMAL_EN
+sig_obj.types.BASE_NORMAL_EN_NOTE=on
+
+sig_obj.BASE_NORMAL_EN_NOTE.table.main.2=SIG_NOTE-cv
diff --git a/pdf-as-lib/src/configuration/cfg/profiles/BASE_NORMAL_NOTE.properties b/pdf-as-lib/src/configuration/cfg/profiles/BASE_NORMAL_NOTE.properties
new file mode 100644
index 00000000..738aee2c
--- /dev/null
+++ b/pdf-as-lib/src/configuration/cfg/profiles/BASE_NORMAL_NOTE.properties
@@ -0,0 +1,10 @@
+
+###################################################################################################
+# PROFIL: Signaturblock (Deutsch) mit neuem Layout
+
+# Kurzbeschreibung
+sig_obj.BASE_NORMAL_NOTE.description=Standardsignatur klein Deutsch
+sig_obj.BASE_NORMAL_NOTE.parent=BASE_NORMAL
+sig_obj.types.BASE_NORMAL_NOTE=on
+
+sig_obj.BASE_NORMAL_NOTE.table.main.2=SIG_NOTE-cv
diff --git a/pdf-as-lib/src/configuration/cfg/profiles/BASE_SMALL_EN_NOTE.properties b/pdf-as-lib/src/configuration/cfg/profiles/BASE_SMALL_EN_NOTE.properties
new file mode 100644
index 00000000..ea66fda9
--- /dev/null
+++ b/pdf-as-lib/src/configuration/cfg/profiles/BASE_SMALL_EN_NOTE.properties
@@ -0,0 +1,10 @@
+
+###################################################################################################
+# PROFIL: Signaturblock (Deutsch) mit neuem Layout
+
+# Kurzbeschreibung
+sig_obj.BASE_SMALL_EN_NOTE.description=Standardsignatur klein Deutsch
+sig_obj.BASE_SMALL_EN_NOTE.parent=BASE_SMALL_EN
+sig_obj.types.BASE_SMALL_EN_NOTE=on
+
+sig_obj.BASE_SMALL_EN_NOTE.table.main.2=SIG_NOTE-cv
diff --git a/pdf-as-lib/src/configuration/cfg/profiles/BASE_SMALL_NOTE.properties b/pdf-as-lib/src/configuration/cfg/profiles/BASE_SMALL_NOTE.properties
new file mode 100644
index 00000000..7e8da934
--- /dev/null
+++ b/pdf-as-lib/src/configuration/cfg/profiles/BASE_SMALL_NOTE.properties
@@ -0,0 +1,10 @@
+
+###################################################################################################
+# PROFIL: Signaturblock (Deutsch) mit neuem Layout
+
+# Kurzbeschreibung
+sig_obj.BASE_SMALL_NOTE.description=Standardsignatur klein Deutsch
+sig_obj.BASE_SMALL_NOTE.parent=BASE_SMALL
+sig_obj.types.BASE_SMALL_NOTE=on
+
+sig_obj.BASE_SMALL_NOTE.table.main.2=SIG_NOTE-cv
diff --git a/pdf-as-lib/src/configuration/cfg/profiles/SIGNATURBLOCK_DE_NOTE.properties b/pdf-as-lib/src/configuration/cfg/profiles/SIGNATURBLOCK_DE_NOTE.properties
index 2fa16acc..378dd525 100644
--- a/pdf-as-lib/src/configuration/cfg/profiles/SIGNATURBLOCK_DE_NOTE.properties
+++ b/pdf-as-lib/src/configuration/cfg/profiles/SIGNATURBLOCK_DE_NOTE.properties
@@ -2,7 +2,7 @@
 # PROFIL: Signaturblock (Deutsch) mit neuem Layout und Hinweistext
 
 sig_obj.SIGNATURBLOCK_DE_NOTE.description=Standardsignatur Deutsch mit neuem Layout
-sig_obj.SIGNATURBLOCK_DE_NOTE.parent=BASE_NORMAL
+sig_obj.SIGNATURBLOCK_DE_NOTE.parent=BASE_NORMAL_NOTE
 sig_obj.types.SIGNATURBLOCK_DE_NOTE=on
 
 #---------------------- INFO TABLE -------------------------
diff --git a/pdf-as-lib/src/configuration/cfg/profiles/SIGNATURBLOCK_DE_PDFA.properties b/pdf-as-lib/src/configuration/cfg/profiles/SIGNATURBLOCK_DE_PDFA.properties
index 4af4d977..54be179c 100644
--- a/pdf-as-lib/src/configuration/cfg/profiles/SIGNATURBLOCK_DE_PDFA.properties
+++ b/pdf-as-lib/src/configuration/cfg/profiles/SIGNATURBLOCK_DE_PDFA.properties
@@ -10,10 +10,6 @@ sig_obj.SIGNATURBLOCK_DE_PDFA.key.SIG_PDFA1B_VALID=true
 
 sig_obj.SIGNATURBLOCK_DE_PDFA.legacy.pos=true
 
-#---------------------- MAIN TABLE -------------------------
-sig_obj.SIGNATURBLOCK_DE_PDFA.table.main.1=SIG_LABEL-i|TABLE-info
-sig_obj.SIGNATURBLOCK_DE_PDFA.table.main.2=SIG_NOTE-cv
-
 sig_obj.SIGNATURBLOCK_DE_PDFA.table.main.ColsWidth=1 5.5
 
 sig_obj.SIGNATURBLOCK_DE_PDFA.table.main.Style.font=TTF:DejaVuSansCondensed-Bold.ttf,8
diff --git a/pdf-as-lib/src/configuration/cfg/profiles/SIGNATURBLOCK_DE_PDFA_NOTE.properties b/pdf-as-lib/src/configuration/cfg/profiles/SIGNATURBLOCK_DE_PDFA_NOTE.properties
index f69165d3..563e30b4 100644
--- a/pdf-as-lib/src/configuration/cfg/profiles/SIGNATURBLOCK_DE_PDFA_NOTE.properties
+++ b/pdf-as-lib/src/configuration/cfg/profiles/SIGNATURBLOCK_DE_PDFA_NOTE.properties
@@ -2,5 +2,18 @@
 # PROFIL: Signaturblock (Deutsch), PDF/A-1b und mit Hinweistext
 
 sig_obj.SIGNATURBLOCK_DE_PDFA_NOTE.description=Standardsignatur Deutsch, PDF/A-1b
-sig_obj.SIGNATURBLOCK_DE_PDFA_NOTE.parent=SIGNATURBLOCK_DE_PDFA
+sig_obj.SIGNATURBLOCK_DE_PDFA_NOTE.parent=BASE_NORMAL_NOTE
 sig_obj.types.SIGNATURBLOCK_DE_PDFA_NOTE=on
+
+# enable/disable PDF/A1b support for this profile
+sig_obj.SIGNATURBLOCK_DE_PDFA_NOTE.key.SIG_PDFA1B_VALID=true
+
+sig_obj.SIGNATURBLOCK_DE_PDFA_NOTE.legacy.pos=true
+
+sig_obj.SIGNATURBLOCK_DE_PDFA_NOTE.table.main.ColsWidth=1 5.5
+
+sig_obj.SIGNATURBLOCK_DE_PDFA_NOTE.table.main.Style.font=TTF:DejaVuSansCondensed-Bold.ttf,8
+sig_obj.SIGNATURBLOCK_DE_PDFA_NOTE.table.main.Style.valuefont=TTF:DejaVuSansMono.ttf,8
+
+#---------------------- INFO TABLE -------------------------
+sig_obj.SIGNATURBLOCK_DE_PDFA_NOTE.table.info.ColsWidth=1 3.5
+\ No newline at end of file
diff --git a/pdf-as-lib/src/configuration/cfg/profiles/SIGNATURBLOCK_EN_NOTE.properties b/pdf-as-lib/src/configuration/cfg/profiles/SIGNATURBLOCK_EN_NOTE.properties
index 1598232a..d80ff3c3 100644
--- a/pdf-as-lib/src/configuration/cfg/profiles/SIGNATURBLOCK_EN_NOTE.properties
+++ b/pdf-as-lib/src/configuration/cfg/profiles/SIGNATURBLOCK_EN_NOTE.properties
@@ -2,7 +2,7 @@
 # PROFIL: Signaturblock (Englisch) mit neuem Layout und Hinweistext
 
 sig_obj.SIGNATURBLOCK_EN_NOTE.description=Standardsignatur Englisch mit neuem Layout
-sig_obj.SIGNATURBLOCK_EN_NOTE.parent=SIGNATURBLOCK_EN
+sig_obj.SIGNATURBLOCK_EN_NOTE.parent=BASE_NORMAL_EN_NOTE
 sig_obj.types.SIGNATURBLOCK_EN_NOTE=on
 
 #---------------------- INFO TABLE -------------------------
diff --git a/pdf-as-lib/src/configuration/cfg/profiles/SIGNATURBLOCK_EN_PDFA_NOTE.properties b/pdf-as-lib/src/configuration/cfg/profiles/SIGNATURBLOCK_EN_PDFA_NOTE.properties
index 9a677d5f..966ab185 100644
--- a/pdf-as-lib/src/configuration/cfg/profiles/SIGNATURBLOCK_EN_PDFA_NOTE.properties
+++ b/pdf-as-lib/src/configuration/cfg/profiles/SIGNATURBLOCK_EN_PDFA_NOTE.properties
@@ -2,5 +2,17 @@
 # PROFIL: Signaturblock (Englisch), PDF/A-1b und mit Hinweistext
 
 sig_obj.SIGNATURBLOCK_EN_PDFA_NOTE.description=Standardsignatur Englisch, PDF/A-1b
-sig_obj.SIGNATURBLOCK_EN_PDFA_NOTE.parent=SIGNATURBLOCK_EN_PDFA
+sig_obj.SIGNATURBLOCK_EN_PDFA_NOTE.parent=BASE_NORMAL_EN_NOTE
 sig_obj.types.SIGNATURBLOCK_EN_PDFA_NOTE=on
+
+# enable/disable PDF/A1b support for this profile
+sig_obj.SIGNATURBLOCK_EN_PDFA_NOTE.key.SIG_PDFA1B_VALID=true
+
+#---------------------- MAIN TABLE -------------------------
+
+sig_obj.SIGNATURBLOCK_EN_PDFA_NOTE.table.main.ColsWidth=1 5.5
+sig_obj.SIGNATURBLOCK_EN_PDFA_NOTE.table.main.Style.font=TTF:DejaVuSansCondensed-Bold.ttf,8
+sig_obj.SIGNATURBLOCK_EN_PDFA_NOTE.table.main.Style.valuefont=TTF:DejaVuSansMono.ttf,8
+
+#---------------------- INFO TABLE -------------------------
+sig_obj.SIGNATURBLOCK_EN_PDFA_NOTE.table.info.ColsWidth=1 4.5
diff --git a/pdf-as-lib/src/configuration/cfg/profiles/SIGNATURBLOCK_SMALL_DE_NOTE.properties b/pdf-as-lib/src/configuration/cfg/profiles/SIGNATURBLOCK_SMALL_DE_NOTE.properties
index 41593a52..059bd06a 100644
--- a/pdf-as-lib/src/configuration/cfg/profiles/SIGNATURBLOCK_SMALL_DE_NOTE.properties
+++ b/pdf-as-lib/src/configuration/cfg/profiles/SIGNATURBLOCK_SMALL_DE_NOTE.properties
@@ -2,5 +2,5 @@
 # PROFIL: Signaturblock klein (Deutsch) mit Hinweistext
 
 sig_obj.SIGNATURBLOCK_SMALL_DE_NOTE.description=Standardsignatur klein Deutsch
-sig_obj.SIGNATURBLOCK_SMALL_DE_NOTE.parent=BASE_SMALL
+sig_obj.SIGNATURBLOCK_SMALL_DE_NOTE.parent=BASE_SMALL_NOTE
 sig_obj.types.SIGNATURBLOCK_SMALL_DE_NOTE=on
diff --git a/pdf-as-lib/src/configuration/cfg/profiles/SIGNATURBLOCK_SMALL_DE_NOTE_PDFA.properties b/pdf-as-lib/src/configuration/cfg/profiles/SIGNATURBLOCK_SMALL_DE_NOTE_PDFA.properties
new file mode 100644
index 00000000..9b0bc14b
--- /dev/null
+++ b/pdf-as-lib/src/configuration/cfg/profiles/SIGNATURBLOCK_SMALL_DE_NOTE_PDFA.properties
@@ -0,0 +1,18 @@
+###################################################################################################
+# PROFIL: Signaturblock klein (Deutsch)
+
+sig_obj.SIGNATURBLOCK_SMALL_DE_NOTE_PDFA.description=Standardsignatur klein Deutsch
+sig_obj.SIGNATURBLOCK_SMALL_DE_NOTE_PDFA.parent=BASE_SMALL_NOTE
+sig_obj.types.SIGNATURBLOCK_SMALL_DE_NOTE_PDFA=on
+
+# enable/disable PDF/A1b support for this profile
+sig_obj.SIGNATURBLOCK_SMALL_DE_NOTE_PDFA.key.SIG_PDFA1B_VALID=true
+
+#---------------------- MAIN TABLE -------------------------
+
+#sig_obj.SIGNATURBLOCK_SMALL_DE_NOTE_PDFA.table.main.ColsWidth=1 5.5
+sig_obj.SIGNATURBLOCK_SMALL_DE_NOTE_PDFA.table.main.Style.font=TTF:DejaVuSansCondensed-Bold.ttf,5
+sig_obj.SIGNATURBLOCK_SMALL_DE_NOTE_PDFA.table.main.Style.valuefont=TTF:DejaVuSansMono.ttf,5
+
+#---------------------- INFO TABLE -------------------------
+#sig_obj.SIGNATURBLOCK_SMALL_DE_NOTE_PDFA.table.info.ColsWidth=1 4.5
diff --git a/pdf-as-lib/src/configuration/cfg/profiles/SIGNATURBLOCK_SMALL_DE_PDFA.properties b/pdf-as-lib/src/configuration/cfg/profiles/SIGNATURBLOCK_SMALL_DE_PDFA.properties
new file mode 100644
index 00000000..ca078a6c
--- /dev/null
+++ b/pdf-as-lib/src/configuration/cfg/profiles/SIGNATURBLOCK_SMALL_DE_PDFA.properties
@@ -0,0 +1,18 @@
+###################################################################################################
+# PROFIL: Signaturblock klein (Deutsch)
+
+sig_obj.SIGNATURBLOCK_SMALL_DE_PDFA.description=Standardsignatur klein Deutsch
+sig_obj.SIGNATURBLOCK_SMALL_DE_PDFA.parent=BASE_SMALL
+sig_obj.types.SIGNATURBLOCK_SMALL_DE_PDFA=on
+
+# enable/disable PDF/A1b support for this profile
+sig_obj.SIGNATURBLOCK_SMALL_DE_PDFA.key.SIG_PDFA1B_VALID=true
+
+#---------------------- MAIN TABLE -------------------------
+
+#sig_obj.SIGNATURBLOCK_SMALL_DE_PDFA.table.main.ColsWidth=1 4.5
+sig_obj.SIGNATURBLOCK_SMALL_DE_PDFA.table.main.Style.font=TTF:DejaVuSansCondensed-Bold.ttf,5
+sig_obj.SIGNATURBLOCK_SMALL_DE_PDFA.table.main.Style.valuefont=TTF:DejaVuSansMono.ttf,5
+
+#---------------------- INFO TABLE -------------------------
+#sig_obj.SIGNATURBLOCK_SMALL_DE_PDFA.table.info.ColsWidth=1 4.5
diff --git a/pdf-as-lib/src/configuration/cfg/profiles/SIGNATURBLOCK_SMALL_EN_NOTE.properties b/pdf-as-lib/src/configuration/cfg/profiles/SIGNATURBLOCK_SMALL_EN_NOTE.properties
index adcb7218..41304dfa 100644
--- a/pdf-as-lib/src/configuration/cfg/profiles/SIGNATURBLOCK_SMALL_EN_NOTE.properties
+++ b/pdf-as-lib/src/configuration/cfg/profiles/SIGNATURBLOCK_SMALL_EN_NOTE.properties
@@ -2,7 +2,7 @@
 # PROFIL: Signaturblock Small (Englisch) mit Hinweistext
 
 sig_obj.SIGNATURBLOCK_SMALL_EN_NOTE.description=Standardsignatur klein Englisch
-sig_obj.SIGNATURBLOCK_SMALL_EN_NOTE.parent=BASE_SMALL_EN
+sig_obj.SIGNATURBLOCK_SMALL_EN_NOTE.parent=BASE_SMALL_EN_NOTE
 sig_obj.types.SIGNATURBLOCK_SMALL_EN_NOTE=on
 
 #---------------------- INFO TABLE -------------------------
diff --git a/pdf-as-lib/src/configuration/cfg/profiles/SIGNATURBLOCK_SMALL_EN_NOTE_PDFA.properties b/pdf-as-lib/src/configuration/cfg/profiles/SIGNATURBLOCK_SMALL_EN_NOTE_PDFA.properties
new file mode 100644
index 00000000..4a6509b7
--- /dev/null
+++ b/pdf-as-lib/src/configuration/cfg/profiles/SIGNATURBLOCK_SMALL_EN_NOTE_PDFA.properties
@@ -0,0 +1,18 @@
+###################################################################################################
+# PROFIL: Signaturblock Small (Englisch) mit Hinweistext
+
+sig_obj.SIGNATURBLOCK_SMALL_EN_NOTE_PDFA.description=Standardsignatur klein Englisch
+sig_obj.SIGNATURBLOCK_SMALL_EN_NOTE_PDFA.parent=BASE_SMALL_EN_NOTE
+sig_obj.types.SIGNATURBLOCK_SMALL_EN_NOTE_PDFA=on
+
+# enable/disable PDF/A1b support for this profile
+sig_obj.SIGNATURBLOCK_SMALL_EN_NOTE_PDFA.key.SIG_PDFA1B_VALID=true
+
+#---------------------- MAIN TABLE -------------------------
+
+#sig_obj.SIGNATURBLOCK_SMALL_EN_NOTE_PDFA.table.main.ColsWidth=1 5.5
+sig_obj.SIGNATURBLOCK_SMALL_EN_NOTE_PDFA.table.main.Style.font=TTF:DejaVuSansCondensed-Bold.ttf,5
+sig_obj.SIGNATURBLOCK_SMALL_EN_NOTE_PDFA.table.main.Style.valuefont=TTF:DejaVuSansMono.ttf,5
+
+#---------------------- INFO TABLE -------------------------
+#sig_obj.SIGNATURBLOCK_SMALL_EN_NOTE_PDFA.table.info.ColsWidth=1 4.5
diff --git a/pdf-as-lib/src/configuration/cfg/profiles/SIGNATURBLOCK_SMALL_EN_PDFA.properties b/pdf-as-lib/src/configuration/cfg/profiles/SIGNATURBLOCK_SMALL_EN_PDFA.properties
new file mode 100644
index 00000000..dea2a8d0
--- /dev/null
+++ b/pdf-as-lib/src/configuration/cfg/profiles/SIGNATURBLOCK_SMALL_EN_PDFA.properties
@@ -0,0 +1,18 @@
+###################################################################################################
+# PROFIL: Signaturblock Small (Englisch)
+
+sig_obj.SIGNATURBLOCK_SMALL_EN_PDFA.description=Standardsignatur klein Englisch
+sig_obj.SIGNATURBLOCK_SMALL_EN_PDFA.parent=BASE_SMALL_EN
+sig_obj.types.SIGNATURBLOCK_SMALL_EN_PDFA=on
+
+# enable/disable PDF/A1b support for this profile
+sig_obj.SIGNATURBLOCK_SMALL_EN_PDFA.key.SIG_PDFA1B_VALID=true
+
+#---------------------- MAIN TABLE -------------------------
+
+sig_obj.SIGNATURBLOCK_SMALL_EN_PDFA.table.main.ColsWidth=1 5.5
+sig_obj.SIGNATURBLOCK_SMALL_EN_PDFA.table.main.Style.font=TTF:DejaVuSansCondensed-Bold.ttf,5
+sig_obj.SIGNATURBLOCK_SMALL_EN_PDFA.table.main.Style.valuefont=TTF:DejaVuSansMono.ttf,5
+
+#---------------------- INFO TABLE -------------------------
+sig_obj.SIGNATURBLOCK_SMALL_EN_PDFA.table.info.ColsWidth=1 4.5