A new check for the existence of a configuration has been implemented. The extraction is skipped if any files or folders would be overwritten. Files like log- or temp-files may exist and do not prevent the deployment of the default configuration.

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

4 files changed, 66 insertions, 6 deletions

diff --git a/work/cfg/config.properties b/work/cfg/config.properties
index fe9b747..e5b4528 100644
--- a/work/cfg/config.properties
+++ b/work/cfg/config.properties
@@ -125,7 +125,7 @@ moa.sign.request.detached=./templates/default.moa.sign.detached.xml
 

 # MOA Verifying

 moa.verify.url=http://localhost:8080/moa-spss/services/SignatureVerification

-moa.verify.TrustProfileID=Test-Signaturdienste

+moa.verify.TrustProfileID=SecureSignature

 

 # default moa enveloping verify template files

 moa.verify.request.base64=./templates/default.moa.verify.request.enveloping.xml

@@ -173,6 +173,8 @@ sig_obj.types.AMTSSIGNATURBLOCK_DE=off
 sig_obj.types.AMTSSIGNATURBLOCK_EN=off

 sig_obj.types.SIGNATURBLOCK_DE=on

 sig_obj.types.SIGNATURBLOCK_EN=on

+sig_obj.types.SIGNATURBLOCK_MINIMAL_DE=on

+sig_obj.types.SIGNATURBLOCK_MINIMAL_EN=on

 

 

 #############################################

@@ -186,6 +188,16 @@ defaults.phlength.SIG_ID=70
 defaults.phlength.SIG_NAME=130

 

 

+#absolute positioning

+#sig_obj.PROFIL.pos=p:1;x:40.0;y:800.0;w:400.0

+

+# font definition: face,height,weight

+# default_font: HELVETICA,8,NORMAL

+# font_face: HELVETICA | TIMES_ROMAN | COURIER

+# font_height: float value

+# font_weight: NORMAL | BOLD | ITALIC | BOLDITALIC | UNDERLINE | STRIKETHRU

+

+

 ###################################################################################################

 # PROFIL: Amtssignaturblock (Deutsch)

 

@@ -213,7 +225,7 @@ sig_obj.AMTSSIGNATURBLOCK_DE.table.main.3=SIG_META-cv
 sig_obj.AMTSSIGNATURBLOCK_DE.table.main.4=SIG_NOTE-cv

 

 sig_obj.AMTSSIGNATURBLOCK_DE.table.main.ColsWidth=1 5

-sig_obj.AMTSSIGNATURBLOCK_DE.table.main.Style.bgcolor=245 245 240

+sig_obj.AMTSSIGNATURBLOCK_DE.table.main.Style.bgcolor=255 255 255

 sig_obj.AMTSSIGNATURBLOCK_DE.table.main.Style.padding=3

 sig_obj.AMTSSIGNATURBLOCK_DE.table.main.Style.border=0.1

 sig_obj.AMTSSIGNATURBLOCK_DE.table.main.Style.halign=left

@@ -258,7 +270,7 @@ sig_obj.AMTSSIGNATURBLOCK_EN.table.main.3=SIG_META-cv
 sig_obj.AMTSSIGNATURBLOCK_EN.table.main.4=SIG_NOTE-cv

 

 sig_obj.AMTSSIGNATURBLOCK_EN.table.main.ColsWidth=1 5

-sig_obj.AMTSSIGNATURBLOCK_EN.table.main.Style.bgcolor=245 245 240

+sig_obj.AMTSSIGNATURBLOCK_EN.table.main.Style.bgcolor=255 255 255

 sig_obj.AMTSSIGNATURBLOCK_EN.table.main.Style.padding=3

 sig_obj.AMTSSIGNATURBLOCK_EN.table.main.Style.border=0.1

 sig_obj.AMTSSIGNATURBLOCK_EN.table.main.Style.halign=left

@@ -299,7 +311,7 @@ sig_obj.SIGNATURBLOCK_DE.table.main.2=SIG_LABEL-i|TABLE-info
 sig_obj.SIGNATURBLOCK_DE.table.main.3=SIG_META-cv

 

 sig_obj.SIGNATURBLOCK_DE.table.main.ColsWidth=1 5

-sig_obj.SIGNATURBLOCK_DE.table.main.Style.bgcolor=245 245 240

+sig_obj.SIGNATURBLOCK_DE.table.main.Style.bgcolor=255 255 255

 sig_obj.SIGNATURBLOCK_DE.table.main.Style.padding=3

 sig_obj.SIGNATURBLOCK_DE.table.main.Style.border=0.1

 sig_obj.SIGNATURBLOCK_DE.table.main.Style.halign=left

@@ -318,6 +330,54 @@ sig_obj.SIGNATURBLOCK_DE.table.info.6=SIG_ID-cv
 

 

 ###################################################################################################

+# PROFIL: minimaler Signaturblock (Deutsch)

+

+sig_obj.SIGNATURBLOCK_MINIMAL_DE.description=minimale Standardsignatur Deutsch

+sig_obj.SIGNATURBLOCK_MINIMAL_DE.key.SIG_META=Prüfinformation

+

+sig_obj.SIGNATURBLOCK_MINIMAL_DE.value.SIG_META=Informationen zur Prüfung der elektronischen Signatur und des Ausdrucks finden Sie unter:\nhttps://www.buergerkarte.at/signature-verification

+sig_obj.SIGNATURBLOCK_MINIMAL_DE.value.SIG_LABEL=./images/signatur-logo_de.png

+

+sig_obj.SIGNATURBLOCK_MINIMAL_DE.pos=w:350.0

+

+#---------------------- MAIN TABLE -------------------------

+sig_obj.SIGNATURBLOCK_MINIMAL_DE.table.main.1=SIG_LABEL-i|SIG_META-v

+

+sig_obj.SIGNATURBLOCK_MINIMAL_DE.table.main.ColsWidth=1 4

+sig_obj.SIGNATURBLOCK_MINIMAL_DE.table.main.Style.bgcolor=255 255 255

+sig_obj.SIGNATURBLOCK_MINIMAL_DE.table.main.Style.padding=3

+sig_obj.SIGNATURBLOCK_MINIMAL_DE.table.main.Style.border=0.1

+sig_obj.SIGNATURBLOCK_MINIMAL_DE.table.main.Style.halign=left

+sig_obj.SIGNATURBLOCK_MINIMAL_DE.table.main.Style.valign=middle

+sig_obj.SIGNATURBLOCK_MINIMAL_DE.table.main.Style.font=HELVETICA,9,NORMAL

+sig_obj.SIGNATURBLOCK_MINIMAL_DE.table.main.Style.valuefont=HELVETICA,9,NORMAL

+

+

+###################################################################################################

+# PROFIL: minimaler Signaturblock (Englisch)

+

+sig_obj.SIGNATURBLOCK_MINIMAL_EN.description=minimale Standardsignatur Englisch

+sig_obj.SIGNATURBLOCK_MINIMAL_EN.key.SIG_META=Verification

+

+sig_obj.SIGNATURBLOCK_MINIMAL_EN.value.SIG_META=Information about the verification of the electronic signature and of the printout can be found at:\nhttps://www.buergerkarte.at/signature-verification

+sig_obj.SIGNATURBLOCK_MINIMAL_EN.value.SIG_LABEL=./images/signatur-logo_en.png

+

+sig_obj.SIGNATURBLOCK_MINIMAL_EN.pos=w:350.0

+

+#---------------------- MAIN TABLE -------------------------

+sig_obj.SIGNATURBLOCK_MINIMAL_EN.table.main.1=SIG_LABEL-i|SIG_META-v

+

+sig_obj.SIGNATURBLOCK_MINIMAL_EN.table.main.ColsWidth=1 4

+sig_obj.SIGNATURBLOCK_MINIMAL_EN.table.main.Style.bgcolor=255 255 255

+sig_obj.SIGNATURBLOCK_MINIMAL_EN.table.main.Style.padding=3

+sig_obj.SIGNATURBLOCK_MINIMAL_EN.table.main.Style.border=0.1

+sig_obj.SIGNATURBLOCK_MINIMAL_EN.table.main.Style.halign=left

+sig_obj.SIGNATURBLOCK_MINIMAL_EN.table.main.Style.valign=middle

+sig_obj.SIGNATURBLOCK_MINIMAL_EN.table.main.Style.font=HELVETICA,9,NORMAL

+sig_obj.SIGNATURBLOCK_MINIMAL_EN.table.main.Style.valuefont=HELVETICA,9,NORMAL

+

+

+###################################################################################################

 # PROFIL: Signaturblock (Englisch)

 

 sig_obj.SIGNATURBLOCK_EN.description=Standardsignatur Englisch

@@ -340,7 +400,7 @@ sig_obj.SIGNATURBLOCK_EN.table.main.2=SIG_LABEL-i|TABLE-info
 sig_obj.SIGNATURBLOCK_EN.table.main.3=SIG_META-cv

 

 sig_obj.SIGNATURBLOCK_EN.table.main.ColsWidth=1 5

-sig_obj.SIGNATURBLOCK_EN.table.main.Style.bgcolor=245 245 240

+sig_obj.SIGNATURBLOCK_EN.table.main.Style.bgcolor=255 255 255

 sig_obj.SIGNATURBLOCK_EN.table.main.Style.padding=3

 sig_obj.SIGNATURBLOCK_EN.table.main.Style.border=0.1

 sig_obj.SIGNATURBLOCK_EN.table.main.Style.halign=left

diff --git a/work/cfg/log4j.properties b/work/cfg/log4j.properties
index 1e964ff..2d3b0e0 100644
--- a/work/cfg/log4j.properties
+++ b/work/cfg/log4j.properties
@@ -16,7 +16,7 @@ log4j.appender.CONSOLE.Target                   = System.out
 
 # ROLLINGFILE
 log4j.appender.ROLLINGFILE                          = org.apache.log4j.RollingFileAppender
-log4j.appender.ROLLINGFILE.File                     = ${catalina.base}/logs/pdf-as.log
+log4j.appender.ROLLINGFILE.File                     = ${pdf-as.work-dir}/logs/pdf-as.log
 log4j.appender.ROLLINGFILE.MaxFileSize              = 10240KB
 log4j.appender.ROLLINGFILE.MaxBackupIndex           = 1
 log4j.appender.ROLLINGFILE.layout                   = org.apache.log4j.PatternLayout
diff --git a/work/images/signatur-logo_de.png b/work/images/signatur-logo_de.png
index 4307f6a..1d55b60 100644
--- a/work/images/signatur-logo_de.png
+++ b/work/images/signatur-logo_de.png
diff --git a/work/images/signatur-logo_en.png b/work/images/signatur-logo_en.png
index bcbe177..845bc07 100644
--- a/work/images/signatur-logo_en.png
+++ b/work/images/signatur-logo_en.png