34 files changed, 272 insertions, 262 deletions
diff --git a/pdf-as-web/src/test/java/at/gv/egiz/pdfas/web/servlets/SimpleSignServletTest.java b/pdf-as-web/src/test/java/at/gv/egiz/pdfas/web/servlets/SimpleSignServletTest.java
index da735c8c..a311429d 100644
--- a/pdf-as-web/src/test/java/at/gv/egiz/pdfas/web/servlets/SimpleSignServletTest.java
+++ b/pdf-as-web/src/test/java/at/gv/egiz/pdfas/web/servlets/SimpleSignServletTest.java
@@ -3,10 +3,7 @@ package at.gv.egiz.pdfas.web.servlets;
 import static org.junit.Assert.assertNotNull;
 
 import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
 
-import at.gv.egiz.pdfas.web.config.PdfAsWebSpringConfiguration;
-import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.SneakyThrows;
@@ -26,7 +23,6 @@ import at.gv.egiz.pdfas.web.stats.StatisticEvent.Operation;
 import at.gv.egiz.pdfas.web.stats.StatisticEvent.Source;
 import org.springframework.mock.web.MockServletConfig;
 import org.springframework.mock.web.MockServletContext;
-import org.springframework.stereotype.Component;
 import org.springframework.test.context.junit4.SpringRunner;
 
 //@Ignore
diff --git a/pdf-as-web/src/test/java/at/gv/egiz/pdfas/web/servlets/SimpleVerifyServletTest.java b/pdf-as-web/src/test/java/at/gv/egiz/pdfas/web/servlets/SimpleVerifyServletTest.java
index 3b5d223c..b9d7c152 100644
--- a/pdf-as-web/src/test/java/at/gv/egiz/pdfas/web/servlets/SimpleVerifyServletTest.java
+++ b/pdf-as-web/src/test/java/at/gv/egiz/pdfas/web/servlets/SimpleVerifyServletTest.java
@@ -9,9 +9,6 @@ import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.Enumeration;
 
-import jakarta.servlet.ServletConfig;
-import jakarta.servlet.ServletContext;
-import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 
@@ -22,18 +19,12 @@ import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.junit.runners.BlockJUnit4ClassRunner;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
 
-import at.gv.egiz.pdfas.common.exceptions.PdfAsSettingsValidationException;
-import at.gv.egiz.pdfas.common.settings.ISettings;
-import at.gv.egiz.pdfas.lib.api.PdfAsFactory;
-import at.gv.egiz.pdfas.web.config.WebConfiguration;
 import at.gv.egiz.pdfas.web.filter.UserAgentFilter;
-import at.gv.egiz.pdfas.web.helper.PdfAsHelper;
 import at.gv.egiz.pdfas.web.stats.StatisticEvent;
 import at.gv.egiz.pdfas.web.stats.StatisticEvent.Operation;
 import at.gv.egiz.pdfas.web.stats.StatisticEvent.Source;
diff --git a/pdf-as-web/src/test/java/at/gv/egiz/pdfas/web/test/JsonApiTest.java b/pdf-as-web/src/test/java/at/gv/egiz/pdfas/web/test/JsonApiTest.java
index 71761e1d..cfb0a375 100644
--- a/pdf-as-web/src/test/java/at/gv/egiz/pdfas/web/test/JsonApiTest.java
+++ b/pdf-as-web/src/test/java/at/gv/egiz/pdfas/web/test/JsonApiTest.java
@@ -32,7 +32,7 @@ import java.util.UUID;
     "management.endpoints.web.exposure.include=metrics"
 })
 @AutoConfigureMockMvc
-public class JsonApiTest {
+public class JsonApiTest extends TestUtils.CanWatchOperationCount {
   @Autowired MockMvc mvc;
   @Autowired ObjectMapper om;
 
@@ -48,7 +48,7 @@ public class JsonApiTest {
   @Test
   @SneakyThrows
   public void sign_single_jks() {
-    try (val watcher = TestUtils.OperationCountWatcher(mvc, "operation:sign", "status:ok")) {
+    try (val watcher = OperationCountWatcher("operation:sign", "status:ok")) {
       final String pdf = Base64.getEncoder().encodeToString(
           IOUtils.toByteArray(JsonApiTest.class.getResourceAsStream("/data/enc_own.pdf")));
 
@@ -86,7 +86,7 @@ public class JsonApiTest {
   @Test
   @SneakyThrows
   public void verify_single() {
-    try (val watcher = TestUtils.OperationCountWatcher(mvc, "operation:verify", "status:ok")) {
+    try (val watcher = OperationCountWatcher("operation:verify", "status:ok")) {
       final String pdf = Base64.getEncoder().encodeToString(
           IOUtils.toByteArray(JsonApiTest.class.getResourceAsStream("/data/dummy-pdf-signed.pdf")));
 
diff --git a/pdf-as-web/src/test/java/at/gv/egiz/pdfas/web/test/JsonSoapParameterNamingTest.java b/pdf-as-web/src/test/java/at/gv/egiz/pdfas/web/test/JsonSoapParameterNamingTest.java
new file mode 100644
index 00000000..cd775eda
--- /dev/null
+++ b/pdf-as-web/src/test/java/at/gv/egiz/pdfas/web/test/JsonSoapParameterNamingTest.java
@@ -0,0 +1,207 @@
+package at.gv.egiz.pdfas.web.test;
+
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import at.gv.egiz.pdfas.api.ws.PDFASSignParameters;
+import at.gv.egiz.pdfas.api.ws.PDFASSignRequest;
+import at.gv.egiz.pdfas.api.ws.PDFASVerifyRequest;
+import at.gv.egiz.pdfas.api.ws.PdfasSignMultipleRequest;
+import at.gv.egiz.pdfas.api.ws.PdfasSignMultipleResponse;
+import at.gv.egiz.pdfas.api.ws.PdfasSignedDocument;
+import at.gv.egiz.pdfas.api.ws.VerificationLevel;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import java.io.File;
+import java.nio.charset.StandardCharsets;
+import java.util.Base64;
+import java.util.List;
+import lombok.Lombok;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+/**
+ * Verifies that the JSON API wire names match the SOAP/JAXB wire names.
+ *
+ * <p>The web documentation says that the JSON API parameters are identical to the SOAP parameters. These
+ * tests lock that down for fields where the Java bean property name differs from the JAXB name, such as
+ * {@code invoke-url}, {@code preprocessorArguments}, {@code configurationOverrides}, and {@code documents}.
+ *
+ * <p>Expected current-state behavior: this test fails until the SOAP DTOs either carry explicit Jackson
+ * annotations or the web ObjectMapper is configured to honor JAXB annotations for JSON naming. Keep old JSON
+ * names as aliases when implementing the fix so existing clients remain compatible.
+ */
+@RunWith(SpringRunner.class)
+@SpringBootTest(properties = {
+    "management.endpoint.metrics.enabled=true",
+    "management.endpoints.web.exposure.include=metrics"
+})
+public class JsonSoapParameterNamingTest {
+  @Autowired ObjectMapper om;
+
+  static {
+    try {
+      System.setProperty("pdf-as-web.conf",
+          (new File(".").getCanonicalPath()) + "/src/test/resources/config/pdfas/pdf-as-web.properties");
+    } catch (Throwable t) {
+      throw Lombok.sneakyThrow(t);
+    }
+  }
+
+  @Test
+  public void signSingleUsesSoapParameterNamesForInputAndOutput() throws Exception {
+    final byte[] input = "pdf".getBytes(StandardCharsets.UTF_8);
+    final String json = "{"
+        + "\"requestID\":\"req-1\","
+        + "\"inputData\":\"" + Base64.getEncoder().encodeToString(input) + "\","
+        + "\"verificationLevel\":\"intOnly\","
+        + "\"parameters\":{"
+        + "\"connector\":\"jks\","
+        + "\"position\":\"x:auto;y:auto;w:auto;p:auto;f:0\","
+        + "\"profile\":\"SIGNATURBLOCK_DE\","
+        + "\"invoke-url\":\"https://example.invalid/success\","
+        + "\"invoke-target\":\"_self\","
+        + "\"invoke-error-url\":\"https://example.invalid/error\","
+        + "\"transactionId\":\"tx-1\","
+        + "\"keyIdentifier\":\"key-1\","
+        + "\"qrCodeContent\":\"QR-CONTENT\","
+        + "\"preprocessorArguments\":{\"propertyEntries\":[{\"key\":\"pre\",\"value\":\"one\"}]},"
+        + "\"configurationOverrides\":{\"propertyEntries\":[{\"key\":\"cfg\",\"value\":\"two\"}]}"
+        + "},"
+        + "\"signatureBlockParameter\":{\"subject\":\"Test User\"}"
+        + "}";
+
+    final PDFASSignRequest request = om.readValue(json, PDFASSignRequest.class);
+
+    assertEquals("req-1", request.getRequestID());
+    assertArrayEquals(input, request.getInputData());
+    assertEquals(VerificationLevel.INTEGRITY_ONLY, request.getVerificationLevel());
+    assertEquals("Test User", request.getSignatureBlockParameters().get("subject"));
+
+    final PDFASSignParameters parameters = request.getParameters();
+    assertNotNull(parameters);
+    assertEquals(PDFASSignParameters.Connector.JKS, parameters.getConnector());
+    assertEquals("https://example.invalid/success", parameters.getInvokeURL());
+    assertEquals("_self", parameters.getInvokeTarget());
+    assertEquals("https://example.invalid/error", parameters.getInvokeErrorURL());
+    assertEquals("tx-1", parameters.getTransactionId());
+    assertEquals("key-1", parameters.getKeyIdentifier());
+    assertEquals("QR-CONTENT", parameters.getQRCodeContent());
+    assertEquals("one", parameters.getPreprocessor().getMap().get("pre"));
+    assertEquals("two", parameters.getOverrides().getMap().get("cfg"));
+
+    final JsonNode serialized = om.valueToTree(request);
+    assertTrue(serialized.has("signatureBlockParameter"));
+    assertFalse(serialized.has("signatureBlockParameters"));
+
+    final JsonNode serializedParameters = serialized.get("parameters");
+    assertJsonHasOnlySoapName(serializedParameters, "invoke-url", "invokeURL", "invokeUrl");
+    assertJsonHasOnlySoapName(serializedParameters, "invoke-target", "invokeTarget");
+    assertJsonHasOnlySoapName(serializedParameters, "invoke-error-url", "invokeErrorURL", "invokeErrorUrl");
+    assertJsonHasOnlySoapName(serializedParameters, "preprocessorArguments", "preprocessor");
+    assertJsonHasOnlySoapName(serializedParameters, "configurationOverrides", "overrides");
+    assertJsonHasOnlySoapName(serializedParameters, "qrCodeContent", "QRCodeContent", "qrcodecontent");
+    assertEquals("jks", serializedParameters.get("connector").asText());
+  }
+
+  @Test
+  public void signMultipleUsesSoapDocumentsNameForInputAndOutput() throws Exception {
+    final byte[] input = "pdf-1".getBytes(StandardCharsets.UTF_8);
+    final String json = "{"
+        + "\"requestID\":\"multi-1\","
+        + "\"transactionId\":\"tx-multi\","
+        + "\"connector\":\"mobilebku\","
+        + "\"invoke-url\":\"https://example.invalid/success\","
+        + "\"invoke-target\":\"_top\","
+        + "\"invoke-error-url\":\"https://example.invalid/error\","
+        + "\"keyIdentifier\":\"kid\","
+        + "\"preprocessorArguments\":{\"propertyEntries\":[{\"key\":\"pre\",\"value\":\"one\"}]},"
+        + "\"configurationOverrides\":{\"propertyEntries\":[{\"key\":\"cfg\",\"value\":\"two\"}]},"
+        + "\"signatureBlockParameter\":{\"subject\":\"Test User\"},"
+        + "\"verificationLevel\":\"full\","
+        + "\"documents\":[{"
+        + "\"inputData\":\"" + Base64.getEncoder().encodeToString(input) + "\","
+        + "\"fileName\":\"one.pdf\","
+        + "\"position\":\"x:auto;y:auto\","
+        + "\"qrCodeContent\":\"QR\","
+        + "\"profile\":\"SIGNATURBLOCK_DE\""
+        + "}]"
+        + "}";
+
+    final PdfasSignMultipleRequest request = om.readValue(json, PdfasSignMultipleRequest.class);
+
+    assertEquals("multi-1", request.getRequestID());
+    assertEquals("tx-multi", request.getTransactionId());
+    assertEquals(PDFASSignParameters.Connector.MOBILEBKU, request.getConnector());
+    assertEquals("https://example.invalid/success", request.getInvokeUrl());
+    assertEquals("_top", request.getInvokeTarget());
+    assertEquals("https://example.invalid/error", request.getInvokeErrorUrl());
+    assertEquals("kid", request.getKeyIdentifier());
+    assertEquals("one", request.getPreprocessor().getMap().get("pre"));
+    assertEquals("two", request.getOverrides().getMap().get("cfg"));
+    assertEquals("Test User", request.getSignatureBlockParameters().get("subject"));
+    assertEquals(VerificationLevel.FULL_CERT_PATH, request.getVerificationLevel());
+    assertEquals(1, request.getInput().size());
+    assertArrayEquals(input, request.getInput().get(0).getInputData());
+    assertEquals("one.pdf", request.getInput().get(0).getFileName());
+
+    final JsonNode serialized = om.valueToTree(request);
+    assertJsonHasOnlySoapName(serialized, "invoke-url", "invokeUrl");
+    assertJsonHasOnlySoapName(serialized, "invoke-target", "invokeTarget");
+    assertJsonHasOnlySoapName(serialized, "invoke-error-url", "invokeErrorUrl");
+    assertJsonHasOnlySoapName(serialized, "preprocessorArguments", "preprocessor");
+    assertJsonHasOnlySoapName(serialized, "configurationOverrides", "overrides");
+    assertJsonHasOnlySoapName(serialized, "signatureBlockParameter", "signatureBlockParameters");
+    assertJsonHasOnlySoapName(serialized, "documents", "input");
+    assertEquals("mobilebku", serialized.get("connector").asText());
+
+    final PdfasSignedDocument signedDocument = new PdfasSignedDocument();
+    signedDocument.setFileName("one.pdf");
+    signedDocument.setOutputData("signed".getBytes(StandardCharsets.UTF_8));
+
+    final PdfasSignMultipleResponse response = new PdfasSignMultipleResponse();
+    response.setRequestID("multi-1");
+    response.setOutput(List.of(signedDocument));
+
+    final JsonNode serializedResponse = om.valueToTree(response);
+    assertJsonHasOnlySoapName(serializedResponse, "documents", "output");
+    assertEquals("one.pdf", serializedResponse.get("documents").get(0).get("fileName").asText());
+  }
+
+  @Test
+  public void verifyUsesSoapPreprocessorArgumentsNameForInputAndOutput() throws Exception {
+    final byte[] input = "signed-pdf".getBytes(StandardCharsets.UTF_8);
+    final String json = "{"
+        + "\"requestID\":\"verify-1\","
+        + "\"inputData\":\"" + Base64.getEncoder().encodeToString(input) + "\","
+        + "\"verificationLevel\":\"intOnly\","
+        + "\"signatureIndex\":0,"
+        + "\"preprocessorArguments\":{\"propertyEntries\":[{\"key\":\"pre\",\"value\":\"one\"}]}"
+        + "}";
+
+    final PDFASVerifyRequest request = om.readValue(json, PDFASVerifyRequest.class);
+
+    assertEquals("verify-1", request.getRequestID());
+    assertArrayEquals(input, request.getInputData());
+    assertEquals(VerificationLevel.INTEGRITY_ONLY, request.getVerificationLevel());
+    assertEquals(Integer.valueOf(0), request.getSignatureIndex());
+    assertEquals("one", request.getPreprocessor().getMap().get("pre"));
+
+    final JsonNode serialized = om.valueToTree(request);
+    assertJsonHasOnlySoapName(serialized, "preprocessorArguments", "preprocessor");
+  }
+
+  private static void assertJsonHasOnlySoapName(JsonNode node, String soapName, String... oldJsonNames) {
+    assertTrue("Expected SOAP/JAXB JSON property " + soapName + " in " + node, node.has(soapName));
+    for (String oldJsonName : oldJsonNames) {
+      assertFalse("Did not expect legacy Java-bean JSON property " + oldJsonName + " in " + node,
+          node.has(oldJsonName));
+    }
+  }
+}
diff --git a/pdf-as-web/src/test/java/at/gv/egiz/pdfas/web/test/MockMoaSigningTest.java b/pdf-as-web/src/test/java/at/gv/egiz/pdfas/web/test/MockMoaSigningTest.java
index 10e87af6..46b0e405 100644
--- a/pdf-as-web/src/test/java/at/gv/egiz/pdfas/web/test/MockMoaSigningTest.java
+++ b/pdf-as-web/src/test/java/at/gv/egiz/pdfas/web/test/MockMoaSigningTest.java
@@ -2,17 +2,11 @@ package at.gv.egiz.pdfas.web.test;
 
 import at.gv.e_government.reference.namespace.moa._20020822_.*;
 import at.gv.egiz.pdfas.common.exceptions.PdfAsException;
-import at.gv.egiz.pdfas.lib.api.Configuration;
-import at.gv.egiz.pdfas.lib.api.IConfigurationConstants;
 import at.gv.egiz.pdfas.lib.api.sign.IPlainSigner;
-import at.gv.egiz.pdfas.lib.impl.configuration.ConfigurationImpl;
-import at.gv.egiz.pdfas.moa.MOAConnector;
 import at.gv.egiz.pdfas.sigs.pades.PAdESSignerKeystore;
-import at.gv.egiz.pdfas.sigs.pkcs7detached.PKCS7DetachedSigner;
 import at.gv.egiz.pdfas.web.config.PdfAsWebSpringConfiguration;
 import at.gv.egiz.pdfas.web.config.WebConfiguration;
 import at.gv.egiz.pdfas.web.helper.PdfAsHelper;
-import at.gv.egiz.pdfas.web.servlets.ExternSignServlet;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.jayway.jsonpath.JsonPath;
 import iaik.x509.X509Certificate;
@@ -25,14 +19,11 @@ import org.apache.commons.io.IOUtils;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.parallel.Execution;
-import org.junit.jupiter.api.parallel.ExecutionMode;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.http.MediaType;
-import org.springframework.test.context.event.annotation.BeforeTestClass;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.test.web.servlet.MockMvc;
 
@@ -52,7 +43,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
     "management.endpoints.web.exposure.include=metrics"
 })
 @AutoConfigureMockMvc
-public class MockMoaSigningTest {
+public class MockMoaSigningTest extends TestUtils.CanWatchOperationCount {
   @Autowired MockMvc mvc;
   @Autowired ObjectMapper om;
   @Autowired PdfAsWebSpringConfiguration config;
@@ -184,42 +175,40 @@ public class MockMoaSigningTest {
   @Test
   @SneakyThrows
   public void signWithMockMOA() {
-    try (val watcher = TestUtils.OperationCountWatcher(mvc, "operation:sign", "status:ok")) {
-      try (MockMoa moa = new MockMoa()) {
+    try (MockMoa moa = new MockMoa(); val watcher = OperationCountWatcher("operation:sign", "status:ok")) {
 
-        final String pdf = Base64.getEncoder().encodeToString(
-            IOUtils.toByteArray(JsonApiTest.class.getResourceAsStream("/data/enc_own.pdf")));
+      final String pdf = Base64.getEncoder().encodeToString(
+          IOUtils.toByteArray(JsonApiTest.class.getResourceAsStream("/data/enc_own.pdf")));
 
-        final String signRequestID = UUID.randomUUID().toString();
-        final String signRequest = om.writeValueAsString(
-            Map.of(
-                "requestID", signRequestID,
-                "inputData", pdf,
-                "parameters", Map.of(
-                    "connector", "moa",
-                    "keyIdentifier", moa.keyIdentifier,
-                    "transactionId", UUID.randomUUID().toString()
-                )
-            )
-        );
+      final String signRequestID = UUID.randomUUID().toString();
+      final String signRequest = om.writeValueAsString(
+          Map.of(
+              "requestID", signRequestID,
+              "inputData", pdf,
+              "parameters", Map.of(
+                  "connector", "moa",
+                  "keyIdentifier", moa.keyIdentifier,
+                  "transactionId", UUID.randomUUID().toString()
+              )
+          )
+      );
 
-        final String signResponse = mvc.perform(
-                post("/api/v2/sign/single")
-                    .contentType(MediaType.APPLICATION_JSON)
-                    .accept(MediaType.APPLICATION_JSON)
-                    .content(signRequest)
-            )
-            .andExpect(status().isOk())
-            .andExpect(content().contentTypeCompatibleWith(MediaType.APPLICATION_JSON))
-            .andExpect(jsonPath("$.requestID").value(signRequestID))
-            .andExpect(jsonPath("$.signedPDF").isNotEmpty())
-            .andExpect(jsonPath("$.verificationResponse").exists())
-            .andReturn().getResponse().getContentAsString();
+      final String signResponse = mvc.perform(
+              post("/api/v2/sign/single")
+                  .contentType(MediaType.APPLICATION_JSON)
+                  .accept(MediaType.APPLICATION_JSON)
+                  .content(signRequest)
+          )
+          .andExpect(status().isOk())
+          .andExpect(content().contentTypeCompatibleWith(MediaType.APPLICATION_JSON))
+          .andExpect(jsonPath("$.requestID").value(signRequestID))
+          .andExpect(jsonPath("$.signedPDF").isNotEmpty())
+          .andExpect(jsonPath("$.verificationResponse").exists())
+          .andReturn().getResponse().getContentAsString();
 
-        final byte[] signedPDF = Base64.getDecoder().decode(JsonPath.<String>read(signResponse, "$.signedPDF"));
-        assertArrayEquals("Signed data looks PDF-ish (%PDF- header)",
-            new byte[]{'%', 'P', 'D', 'F', '-'}, Arrays.copyOfRange(signedPDF, 0, 5));
-      }
+      final byte[] signedPDF = Base64.getDecoder().decode(JsonPath.<String>read(signResponse, "$.signedPDF"));
+      assertArrayEquals("Signed data looks PDF-ish (%PDF- header)",
+          new byte[]{'%', 'P', 'D', 'F', '-'}, Arrays.copyOfRange(signedPDF, 0, 5));
     }
   }
 
diff --git a/pdf-as-web/src/test/java/at/gv/egiz/pdfas/web/test/SimpleWebServiceTest.java b/pdf-as-web/src/test/java/at/gv/egiz/pdfas/web/test/SimpleWebServiceTest.java
index 7d81465a..9c65fe0d 100644
--- a/pdf-as-web/src/test/java/at/gv/egiz/pdfas/web/test/SimpleWebServiceTest.java
+++ b/pdf-as-web/src/test/java/at/gv/egiz/pdfas/web/test/SimpleWebServiceTest.java
@@ -8,7 +8,6 @@ import java.net.URL;
 import java.util.UUID;
 
 import at.gv.egiz.pdfas.api.ws.PDFASSigning;
-import at.gv.egiz.pdfas.web.servlets.ExternSignServlet;
 import at.gv.egiz.pdfas.web.servlets.SimpleVerifyServletTest;
 import jakarta.xml.ws.Service;
 import lombok.val;
@@ -16,20 +15,12 @@ import org.apache.commons.io.IOUtils;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.junit.runners.BlockJUnit4ClassRunner;
 
 import at.gv.egiz.pdfas.api.ws.PDFASSignParameters;
 import at.gv.egiz.pdfas.api.ws.PDFASSignParameters.Connector;
 import at.gv.egiz.pdfas.api.ws.PDFASSignRequest;
 import at.gv.egiz.pdfas.api.ws.PDFASSignResponse;
-import at.gv.egiz.pdfas.common.exceptions.PdfAsSettingsValidationException;
-import at.gv.egiz.pdfas.common.settings.ISettings;
-import at.gv.egiz.pdfas.lib.api.PdfAsFactory;
-import at.gv.egiz.pdfas.web.config.WebConfiguration;
-import at.gv.egiz.pdfas.web.helper.PdfAsHelper;
-import at.gv.egiz.pdfas.web.ws.PDFASSigningImpl;
 import lombok.SneakyThrows;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.web.server.LocalServerPort;
 import org.springframework.test.context.junit4.SpringRunner;
diff --git a/pdf-as-web/src/test/java/at/gv/egiz/pdfas/web/test/SimpleWebServiceWithoutVerificationTest.java b/pdf-as-web/src/test/java/at/gv/egiz/pdfas/web/test/SimpleWebServiceWithoutVerificationTest.java
index 7954415b..cd2ba077 100644
--- a/pdf-as-web/src/test/java/at/gv/egiz/pdfas/web/test/SimpleWebServiceWithoutVerificationTest.java
+++ b/pdf-as-web/src/test/java/at/gv/egiz/pdfas/web/test/SimpleWebServiceWithoutVerificationTest.java
@@ -15,22 +15,14 @@ import org.apache.commons.io.IOUtils;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.junit.runners.BlockJUnit4ClassRunner;
 
 import at.gv.egiz.pdfas.api.ws.PDFASSignParameters;
 import at.gv.egiz.pdfas.api.ws.PDFASSignParameters.Connector;
 import at.gv.egiz.pdfas.api.ws.PDFASSignRequest;
 import at.gv.egiz.pdfas.api.ws.PDFASSignResponse;
-import at.gv.egiz.pdfas.common.exceptions.PdfAsSettingsValidationException;
-import at.gv.egiz.pdfas.common.settings.ISettings;
-import at.gv.egiz.pdfas.lib.api.PdfAsFactory;
-import at.gv.egiz.pdfas.web.config.WebConfiguration;
-import at.gv.egiz.pdfas.web.helper.PdfAsHelper;
-import at.gv.egiz.pdfas.web.ws.PDFASSigningImpl;
 import lombok.SneakyThrows;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.web.server.LocalServerPort;
-import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.junit4.SpringRunner;
 
 import javax.xml.namespace.QName;
diff --git a/pdf-as-web/src/test/java/at/gv/egiz/pdfas/web/test/TestUtils.java b/pdf-as-web/src/test/java/at/gv/egiz/pdfas/web/test/TestUtils.java
index 4ee606bb..f6196ca9 100644
--- a/pdf-as-web/src/test/java/at/gv/egiz/pdfas/web/test/TestUtils.java
+++ b/pdf-as-web/src/test/java/at/gv/egiz/pdfas/web/test/TestUtils.java
@@ -1,8 +1,14 @@
 package at.gv.egiz.pdfas.web.test;
 
+import at.gv.egiz.pdfas.web.stats.impl.StatisticMicrometerBackend;
 import com.jayway.jsonpath.JsonPath;
+import io.micrometer.core.instrument.MeterRegistry;
 import lombok.val;
 import org.junit.Assert;
+import org.junit.Before;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
+import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
 
@@ -10,7 +16,7 @@ import java.util.Arrays;
 import java.util.List;
 
 public class TestUtils {
-  public static double getOperationCount(MockMvc mvc, String... tags) throws Exception {
+  private static double getOperationCount(MockMvc mvc, String... tags) throws Exception {
     val builder = MockMvcRequestBuilders.get("/actuator/metrics/pdfas_requests");
     Arrays.stream(tags).forEach(tag -> builder.param("tag", tag));
     val result =
@@ -23,8 +29,18 @@ public class TestUtils {
         .get(0);
   }
 
-  public static AutoCloseable OperationCountWatcher(MockMvc mvc, String... tags) throws Exception {
-    val initialCount = TestUtils.getOperationCount(mvc, tags);
-    return () -> Assert.assertEquals(initialCount+1.0, TestUtils.getOperationCount(mvc, tags), 0.0001);
+  @SpringBootTest
+  @AutoConfigureMockMvc
+  public static abstract class CanWatchOperationCount {
+    @Autowired MockMvc mvc;
+    @Autowired private MeterRegistry meterRegistry;
+    @Before
+    public void rebindStatisticsBackend() {
+      StatisticMicrometerBackend.SpringContextProxy.meterRegistry = meterRegistry;
+    }
+    protected AutoCloseable OperationCountWatcher(String... tags) throws Exception {
+      val initialCount = TestUtils.getOperationCount(mvc, tags);
+      return () -> Assert.assertEquals(initialCount+1.0, TestUtils.getOperationCount(mvc, tags), 0.0001);
+    }
   }
 }
diff --git a/pdf-as-web/src/test/resources/config/pdfas/cfg/advancedconfig.properties b/pdf-as-web/src/test/resources/config/pdfas/cfg/advancedconfig.properties
index 858b652f..7c5cc58d 100644
--- a/pdf-as-web/src/test/resources/config/pdfas/cfg/advancedconfig.properties
+++ b/pdf-as-web/src/test/resources/config/pdfas/cfg/advancedconfig.properties
@@ -91,10 +91,6 @@
 
 #default.verifyURL=http://www.signaturpruefung.gv.at
 
-# Standard Alternativer Text fuer den Signaturblock (WAI) (globale Einstellung)
-
-#default.sigLogoAltText=Abgebildet ist eine Standard-Signaturbildmarke.
-
 #register Verificators
 
 default.verifier.01=at.gv.egiz.pdfas.sigs.pades.PAdESVerifier
@@ -104,7 +100,7 @@ default.verifier.01=at.gv.egiz.pdfas.sigs.pades.PAdESVerifier
 #Enable background color detection
 #sigblock.placement.bgcolor.detection.enabled=true
 #sigblock.placement.debug.file=/home/user/temp/debugImg.png
-#runtime.backend=PDFBOX_2_BACKEND
+#runtime.backend=PDFBOX_3_BACKEND
 
 ##################
 # Protect PDF files from copying and extractiong content
diff --git a/pdf-as-web/src/test/resources/config/pdfas/cfg/advancedconfig.properties~ b/pdf-as-web/src/test/resources/config/pdfas/cfg/advancedconfig.properties~
deleted file mode 100644
index 02ed4fbe..00000000
--- a/pdf-as-web/src/test/resources/config/pdfas/cfg/advancedconfig.properties~
+++ /dev/null
@@ -1,83 +0,0 @@
-######################################################################
-# Fortgeschrittene PDF-AS Konfiguration
-#
-# Hier koennen fortgeschrittene Einstellungen getaetigt werden.
-# Die hier angefuehrten Eigenschaften werden grundsaetzlich durch die
-# interne Standard-Konfiguration abgedeckt und sind deshalb hier
-# lediglich als Kommentare ausgefuehrt. Die Werte entsprechen jenen
-# der Standard-Konfiguration.
-# Diese Konfiguration muss in config.properties via include-
-# Instruktion eingebunden werden:
-#    include.advancedconfig = advancedconfig.properties
-#####################################################################
-
-# Aktiviert, oder deaktiviert grundsaetzlich das - potenziell zeit- und ressourcen-aufwaendige 
-# Suchen nach Platzhalter-Bildern in PDF-Dokumenten
-# Festlegung fuer einzelnes Profil
-# sig_obj.PROFILE.enable_placeholder_search=[true|false]
-# Die Suche ist standardmaessig aus Sicherheitsgruenden deaktiviert (Defaultwert hier = false)
-# Es muss bewusst sein, dass ueber einen Platzhalter benutzerseitig bestimmte Profile zur Signatur
-# ausgewaehlt werden koennen!
-
-#enable_placeholder_search=true
-
-##################
-# Signaturdienste
-
-
-## Lokale BKU
-
-#bku.available_for_web=true
-#bku.available_for_commandline=true
-#bku.sign.KeyboxIdentifier=SecureSignatureKeypair
-
-
-## Online BKU (MOCCA)
-
-#moc.available_for_web=true
-#moc.available_for_commandline=false
-#moc.sign.KeyboxIdentifier=SecureSignatureKeypair
-
-
-## Handy
-
-#mobile.sign.KeyboxIdentifier=SecureSignatureKeypair
-#mobiletest.sign.KeyboxIdentifier=SecureSignatureKeypair
-
-
-## MOA
-
-#moa.available_for_web=true
-#moa.available_for_commandline=true
-
-# MOA Detached Signieren aus Konsole moeglich - zurzeit moeglich nur mit BKU
-
-#moa.sign.console.detached.enabled=false
-
-# PDF/A-1b Unterstuetzung fuer alle Profile einschalten
-
-#default.SIG_PDFA1B_VALID=false
-
-
-# BAIK-Signatur Unterstuetzung fuer alle Profile einschalten
-
-#default.SIG_BAIK_ENABLED=false
-
-# Standardwert fuer "Reason"-Feld der jeweiligen Signatur
-
-#default.adobeSignReasonValue=Informationen zur Pr\u00FCfung finden Sie unter http://www.signaturpruefung.gv.at
-
-
-# Standard Prueflink fuer die Adobe Signaturkennzeichnung (nur relevant falls Adobe Plugin fuer Pruefung verwendet wird)
-
-#default.verifyURL=http://www.signaturpruefung.gv.at
-
-
-# Standard Alternativer Text fuer den Signaturblock (WAI) (globale Einstellung)
-
-#default.sigLogoAltText=Abgebildet ist eine Standard-Signaturbildmarke.
-
-#register Verificators
-
-default.verifier.01=at.gv.egiz.pdfas.sigs.pkcs7detached.PKCS7DetachedVerifier
-default.verifier.02=at.gv.egiz.pdfas.sigs.pades.PAdESVerifier
diff --git a/pdf-as-web/src/test/resources/config/pdfas/cfg/config.properties b/pdf-as-web/src/test/resources/config/pdfas/cfg/config.properties
index 42193ec5..128cb883 100644
--- a/pdf-as-web/src/test/resources/config/pdfas/cfg/config.properties
+++ b/pdf-as-web/src/test/resources/config/pdfas/cfg/config.properties
@@ -30,7 +30,7 @@ bku.verify.url=http://127.0.0.1:3495/http-security-layer-request
 ##
 # Handy-Signatur
 # Signaturservice URL
-mobile.sign.url=https://www.handy-signatur.at/mobile/https-security-layer-request/default.aspx
+mobile.sign.url=https://service.a-trust.at/mobile/https-security-layer-request/default.aspx
 
 ##
 # MOA Signatur
diff --git a/pdf-as-web/src/test/resources/config/pdfas/cfg/config.properties_backup b/pdf-as-web/src/test/resources/config/pdfas/cfg/config.properties_backup
index ac894f19..7a58676b 100644
--- a/pdf-as-web/src/test/resources/config/pdfas/cfg/config.properties_backup
+++ b/pdf-as-web/src/test/resources/config/pdfas/cfg/config.properties_backup
@@ -34,12 +34,12 @@ moc.sign.url=http://127.0.0.1:8080/bkuonline/http-security-layer-request
 ##
 # Handy-Signatur
 # Signaturservice URL
-mobile.sign.url=https://www.handy-signatur.at/mobile/https-security-layer-request/default.aspx
+mobile.sign.url=https://service.a-trust.at/mobile/https-security-layer-request/default.aspx
 
 ##
 # Handy Signatur (Test)
 # Signaturservice URL
-mobiletest.sign.url=https://test1.a-trust.at/https-security-layer-request/default.aspx
+mobiletest.sign.url=https://hs-abnahme.a-trust.at/mobile/https-security-layer-request/default.aspx
 
 ##
 # MOA Signatur
diff --git a/pdf-as-web/src/test/resources/config/pdfas/cfg/profiles/AMTSSIGNATURBLOCK_BASE.properties b/pdf-as-web/src/test/resources/config/pdfas/cfg/profiles/AMTSSIGNATURBLOCK_BASE.properties
index cecd0fda..06f9073a 100644
--- a/pdf-as-web/src/test/resources/config/pdfas/cfg/profiles/AMTSSIGNATURBLOCK_BASE.properties
+++ b/pdf-as-web/src/test/resources/config/pdfas/cfg/profiles/AMTSSIGNATURBLOCK_BASE.properties
@@ -20,7 +20,5 @@ sig_obj.AMTSSIGNATURBLOCK_BASE.value.SIG_ISSUER=${issuer.T != null ? (issuer.T +
 sig_obj.AMTSSIGNATURBLOCK_BASE.value.SIG_NUMBER=${sn}
 
 sig_obj.AMTSSIGNATURBLOCK_BASE.pos=f:80
-sig_obj.AMTSSIGNATURBLOCK_BASE.adobeSignFieldValue=PDF-AS Signatur
 sig_obj.AMTSSIGNATURBLOCK_BASE.adobeSignReasonValue=Signaturpruefung unter http://www.signaturpruefung.gv.at
 sig_obj.AMTSSIGNATURBLOCK_BASE.verifyURL=http://www.signaturpruefung.gv.at
-sig_obj.AMTSSIGNATURBLOCK_BASE.sigLogoAltText=Abgebildet ist eine Standard-Signaturbildmarke.
diff --git a/pdf-as-web/src/test/resources/config/pdfas/cfg/profiles/AMTSSIGNATURBLOCK_BASE_EN.properties b/pdf-as-web/src/test/resources/config/pdfas/cfg/profiles/AMTSSIGNATURBLOCK_BASE_EN.properties
index d2d2d7c5..b4fd1a0b 100644
--- a/pdf-as-web/src/test/resources/config/pdfas/cfg/profiles/AMTSSIGNATURBLOCK_BASE_EN.properties
+++ b/pdf-as-web/src/test/resources/config/pdfas/cfg/profiles/AMTSSIGNATURBLOCK_BASE_EN.properties
@@ -16,7 +16,5 @@ sig_obj.AMTSSIGNATURBLOCK_BASE_EN.value.SIG_META=Information about the verificat
 sig_obj.AMTSSIGNATURBLOCK_BASE_EN.value.SIG_LABEL=./images/amtsignatur-logo_demo.png
 sig_obj.AMTSSIGNATURBLOCK_BASE_EN.value.SIG_NOTE=This document was signed/sealed with an official signature. According to \u00a7 20 Austrian E-Government-Act a printout of this document is assumed to be authentic.
 
-sig_obj.AMTSSIGNATURBLOCK_BASE_EN.adobeSignFieldValue=PDF-AS Signature
 sig_obj.AMTSSIGNATURBLOCK_BASE_EN.adobeSignReasonValue=Signature verification at: http://www.signature-verification.gv.at
 sig_obj.AMTSSIGNATURBLOCK_BASE_EN.verifyURL=http://www.signaturpruefung.gv.at
-sig_obj.AMTSSIGNATURBLOCK_BASE_EN.sigLogoAltText=A standard signature logo is shown.
diff --git a/pdf-as-web/src/test/resources/config/pdfas/cfg/profiles/BAIK_ARCHIV_SIGNATUR.properties b/pdf-as-web/src/test/resources/config/pdfas/cfg/profiles/BAIK_ARCHIV_SIGNATUR.properties
index d8828ff6..e702c89f 100644
--- a/pdf-as-web/src/test/resources/config/pdfas/cfg/profiles/BAIK_ARCHIV_SIGNATUR.properties
+++ b/pdf-as-web/src/test/resources/config/pdfas/cfg/profiles/BAIK_ARCHIV_SIGNATUR.properties
@@ -21,16 +21,11 @@ sig_obj.BAIK_ARCHIV_SIGNATUR.key.SIG_META=Hinweis
 sig_obj.BAIK_ARCHIV_SIGNATUR.key.SIG_TITLE=ELEKTRONISCHE ARCHIVSIGNATUR
 
 sig_obj.BAIK_ARCHIV_SIGNATUR.pos=f:80
-sig_obj.BAIK_ARCHIV_SIGNATUR.adobeSignFieldValue=ELEKTRONISCHE ARCHIVSIGNATUR
-
-# WAI
-sig_obj.BAIK_ARCHIV_SIGNATUR.sigLogoAltText=Abgebildet ist eine Signaturbildmarke mit Bundesadler.
 
 sig_obj.BAIK_ARCHIV_SIGNATUR.value.SIG_META=Dokumentenformat: ${iui.pdfVersion}
 sig_obj.BAIK_ARCHIV_SIGNATUR.value.SIG_LABEL=./images/Baik_Archiv.gif
 sig_obj.BAIK_ARCHIV_SIGNATUR.value.SIG_TITLE=ELEKTRONISCHE ARCHIVSIGNATUR
 
-sig_obj.BAIK_ARCHIV_SIGNATUR.adobeSignFieldValue=Archivsignatur
 sig_obj.BAIK_ARCHIV_SIGNATUR.adobeSignText.binary=Archivsignatur der BAIK
 sig_obj.BAIK_ARCHIV_SIGNATUR.verifyURL=http://www.signaturpruefung.gv.at
 
diff --git a/pdf-as-web/src/test/resources/config/pdfas/cfg/profiles/BAIK_URKUNDE_SIGNATUR.properties b/pdf-as-web/src/test/resources/config/pdfas/cfg/profiles/BAIK_URKUNDE_SIGNATUR.properties
index 875943ae..7c64bbea 100644
--- a/pdf-as-web/src/test/resources/config/pdfas/cfg/profiles/BAIK_URKUNDE_SIGNATUR.properties
+++ b/pdf-as-web/src/test/resources/config/pdfas/cfg/profiles/BAIK_URKUNDE_SIGNATUR.properties
@@ -20,11 +20,7 @@ sig_obj.BAIK_URKUNDE_SIGNATUR.key.SIG_KZ=Methode
 sig_obj.BAIK_URKUNDE_SIGNATUR.key.SIG_META=Hinweis:
 sig_obj.BAIK_URKUNDE_SIGNATUR.key.SIG_TITLE=ELEKTRONISCHE BEURKUNDUNGSSIGNATUR
 
-# WAI
-sig_obj.BAIK_URKUNDE_SIGNATUR.sigLogoAltText=Abgebildet ist die Signaturbildmarke eines staatlich befugten und beeideten Ziviltechnikers mit Bundesadler.
-
 sig_obj.BAIK_URKUNDE_SIGNATUR.pos=f:80
-sig_obj.BAIK_URKUNDE_SIGNATUR.adobeSignFieldValue=Urkundensignatur
 sig_obj.BAIK_URKUNDE_SIGNATUR.adobeSignText.binary=Urkundensignatur der BAIK
 sig_obj.BAIK_URKUNDE_SIGNATUR.verifyURL=http://www.signaturpruefung.gv.at
 
diff --git a/pdf-as-web/src/test/resources/config/pdfas/cfg/profiles/BASE_MINIMAL.properties b/pdf-as-web/src/test/resources/config/pdfas/cfg/profiles/BASE_MINIMAL.properties
index 76da2bfd..dd9b5d7c 100644
--- a/pdf-as-web/src/test/resources/config/pdfas/cfg/profiles/BASE_MINIMAL.properties
+++ b/pdf-as-web/src/test/resources/config/pdfas/cfg/profiles/BASE_MINIMAL.properties
@@ -7,7 +7,6 @@ sig_obj.BASE_MINIMAL.description=Minimalbasissignatur Deutsch
 sig_obj.BASE_MINIMAL.key.SIG_META=Pr\u00fcfinformation
 
 sig_obj.BASE_MINIMAL.pos=w:230.0;f:80
-sig_obj.BASE_MINIMAL.adobeSignFieldValue=PDF-AS Signatur
 sig_obj.BASE_MINIMAL.adobeSignReasonValue=Signaturpruefung unter http://www.signaturpruefung.gv.at
 sig_obj.BASE_MINIMAL.verifyURL=http://www.signaturpruefung.gv.at
 
@@ -15,9 +14,6 @@ sig_obj.BASE_MINIMAL.value.SIG_META=Informationen zur Pr\u00FCfung der elektroni
 sig_obj.BASE_MINIMAL.value.SIG_LABEL=./images/signatur-logo_de.png
 sig_obj.BASE_MINIMAL.table.main.Style.imagescaletofit=65.0;65.0
 
-# WAI
-sig_obj.BASE_MINIMAL.sigLogoAltText=Abgebildet ist eine Standard-Signaturbildmarke.
-
 #---------------------- MAIN TABLE -------------------------
 sig_obj.BASE_MINIMAL.table.main.1=SIG_LABEL-i
 sig_obj.BASE_MINIMAL.table.main.2=SIG_META-v
diff --git a/pdf-as-web/src/test/resources/config/pdfas/cfg/profiles/BASE_MINIMAL_EN.properties b/pdf-as-web/src/test/resources/config/pdfas/cfg/profiles/BASE_MINIMAL_EN.properties
index 0a1871ef..7387dd3b 100644
--- a/pdf-as-web/src/test/resources/config/pdfas/cfg/profiles/BASE_MINIMAL_EN.properties
+++ b/pdf-as-web/src/test/resources/config/pdfas/cfg/profiles/BASE_MINIMAL_EN.properties
@@ -11,6 +11,3 @@ sig_obj.BASE_MINIMAL_EN.verifyURL=http://www.signature-verification.gv.at
 
 sig_obj.BASE_MINIMAL_EN.value.SIG_META=Information about the verification of the electronic signature can be found at: https://www.signaturpruefung.gv.at
 sig_obj.BASE_MINIMAL_EN.value.SIG_LABEL=./images/signatur-logo_en.png
-
-# WAI
-sig_obj.BASE_MINIMAL_EN.sigLogoAltText=A standard signature logo is shown.
diff --git a/pdf-as-web/src/test/resources/config/pdfas/cfg/profiles/BASE_NORMAL.properties b/pdf-as-web/src/test/resources/config/pdfas/cfg/profiles/BASE_NORMAL.properties
index 36304b66..ad62f50f 100644
--- a/pdf-as-web/src/test/resources/config/pdfas/cfg/profiles/BASE_NORMAL.properties
+++ b/pdf-as-web/src/test/resources/config/pdfas/cfg/profiles/BASE_NORMAL.properties
@@ -6,10 +6,6 @@
 sig_obj.BASE_NORMAL.description=Basissignatur Deutsch
 
 # Aktiviert ("on") bzw. deaktiviert ("off") dieses Profil.
-# "verify_only" beschraenkt das Profil auf Signaturpruefung, d.h. es kann nicht zum Erstellen von
-# Signaturen verwendet werden.
-# "sign_only" beschraenkt das Profil insofern, dass es nur noch zum Signieren, nicht aber
-# zum Pruefen verwendet werden kann.
 sig_obj.types.BASE_NORMAL=on
 
 # Festlegung der einzelner Bezeichnungen im Signaturblock.
@@ -52,16 +48,12 @@ sig_obj.BASE_NORMAL.value.SIG_NOTE=Dieses mit einer qualifizierten elektronische
 #     sig_obj.PROFILE.pos=p:1;x:40.0;y:800.0;w:400.0;f:80
 sig_obj.BASE_NORMAL.pos=f:80
 
-sig_obj.BASE_NORMAL.adobeSignFieldValue=PDF-AS Signatur
 # Text, der im Adobe Reader unter "Reason" angezeigt wird.
 sig_obj.BASE_NORMAL.adobeSignReasonValue=Signaturpruefung unter http://www.signaturpruefung.gv.at
 
 # URL fuer die Signaturpruefung durch das Adobe Acrobat Professional PDF-AS Plugin.
 #sig_obj.SIGNATURBLOCK_DE.verifyURL=http://www.signaturpruefung.gv.at
 
-# WAI
-sig_obj.BASE_NORMAL.sigLogoAltText=Abgebildet ist eine Standard-Signaturbildmarke.
-
 # Pruefhinweis im Signaturblock
 #sig_obj.SIGNATURBLOCK_DE.value.SIG_META=Signaturpruefung unter: http://www.signaturpruefung.gv.at
 
@@ -107,7 +99,7 @@ sig_obj.BASE_NORMAL.table.main.Style.imagevalign=middle
 #
 #    FACE: HELVETICA | TIMES_ROMAN | COURIER
 #    WEIGHT: float value
-#    STYLE: NORMAL | BOLD | ITALIC | BOLDITALIC | UNDERLINE | STRIKETHRU
+#    STYLE: NORMAL | BOLD | ITALIC | BOLDITALIC
 #
 # z.B. sig_obj.SIGNATURBLOCK_DE.table.main.Style.valuefont=COURIER,8,NORMAL
 sig_obj.BASE_NORMAL.table.main.Style.font=HELVETICA,8,BOLD
@@ -132,14 +124,8 @@ sig_obj.BASE_NORMAL.table.info.3=SIG_META-cv
 # Name fuer die Signaturkennzeichnung (binaer)
 #    sig_obj.PROFILE.adobeSignText.textual=PDF-AS
 #
-# Name fuer die PDF-Signatur
-#    sig_obj.PROFILE.adobeSignFieldValue=PDF-AS Signatur
-#
 # "Reason"-Feld der jeweiligen Signatur
 #    sig_obj.PROFILE.adobeSignReasonValue=Informationen zur Pr\u00FCfung finden Sie unter http://www.signaturpruefung.gv.at
 #
 # Prueflink fuer die Adobe Signaturkennzeichnung (nur relevant falls Adobe Plugin fuer Pruefung verwendet wird)
 #    sig_obj.PROFILE.verifyURL=http://www.signaturpruefung.gv.at
-#
-# Alternativer Text fuer den Signaturblock (WAI) (globale Einstellung)
-#    sig_obj.PROFILE.sigLogoAltText=Abgebildet ist eine Standard-Signaturbildmarke.
diff --git a/pdf-as-web/src/test/resources/config/pdfas/cfg/profiles/BASE_NORMAL_EN.properties b/pdf-as-web/src/test/resources/config/pdfas/cfg/profiles/BASE_NORMAL_EN.properties
index 903ff7d7..dadd5ad7 100644
--- a/pdf-as-web/src/test/resources/config/pdfas/cfg/profiles/BASE_NORMAL_EN.properties
+++ b/pdf-as-web/src/test/resources/config/pdfas/cfg/profiles/BASE_NORMAL_EN.properties
@@ -26,6 +26,3 @@ sig_obj.BASE_NORMAL_EN.adobeSignReasonValue=Signature verification at http://www
 
 # URL fuer die Signaturpruefung durch das Adobe Acrobat Professional PDF-AS Plugin.
 sig_obj.BASE_NORMAL_EN.verifyURL=http://www.signature-verification.gv.at
-
-# WAI
-sig_obj.BASE_NORMAL_EN.sigLogoAltText=A standard signature logo is shown.
diff --git a/pdf-as-web/src/test/resources/config/pdfas/cfg/profiles/BASE_SMALL_EN.properties b/pdf-as-web/src/test/resources/config/pdfas/cfg/profiles/BASE_SMALL_EN.properties
index 8c57d8b5..59c61e91 100644
--- a/pdf-as-web/src/test/resources/config/pdfas/cfg/profiles/BASE_SMALL_EN.properties
+++ b/pdf-as-web/src/test/resources/config/pdfas/cfg/profiles/BASE_SMALL_EN.properties
@@ -37,9 +37,6 @@ sig_obj.BASE_SMALL_EN.table.info.ColsWidth=1 2.7
 #sig_obj.BASE_SMALL_EN.value.SIG_META=Information about the verification of the electronic signature can be found at: https://www.signaturpruefung.gv.at \nInformation about the verification of the printout can be found at: https://www.behoerde.gv.at/el_signatur/
 #sig_obj.BASE_SMALL_EN.value.SIG_LABEL=./images/signatur-logo_en.png
 
-# WAI
-#sig_obj.BASE_SMALL_EN.sigLogoAltText=A standard signature logo is shown.
-
 #---------------------- MAIN TABLE -------------------------
 #sig_obj.BASE_SMALL_EN.table.main.ColsWidth=1 4.5
 #sig_obj.BASE_SMALL_EN.table.main.Style.font=HELVETICA,5,BOLD
diff --git a/pdf-as-web/src/test/resources/config/pdfas/cfg/profiles/INVISIBLE.properties b/pdf-as-web/src/test/resources/config/pdfas/cfg/profiles/INVISIBLE.properties
index b7193343..cc02928d 100644
--- a/pdf-as-web/src/test/resources/config/pdfas/cfg/profiles/INVISIBLE.properties
+++ b/pdf-as-web/src/test/resources/config/pdfas/cfg/profiles/INVISIBLE.properties
@@ -5,7 +5,6 @@ sig_obj.INVISIBLE.description=Unsichtbarer Signaturblock
 
 sig_obj.types.INVISIBLE=on
 
-sig_obj.INVISIBLE.adobeSignFieldValue=PDF-AS Signatur
 sig_obj.INVISIBLE.adobeSignReasonValue=Informationen zur Pr\u00fcfung finden Sie unter http://www.signaturpruefung.gv.at
 sig_obj.INVISIBLE.isvisible=false
 
diff --git a/pdf-as-web/src/test/resources/config/pdfas/cfg/profiles_bkp/AMTSSIGNATURBLOCK_BASE.properties b/pdf-as-web/src/test/resources/config/pdfas/cfg/profiles_bkp/AMTSSIGNATURBLOCK_BASE.properties
index e77315c1..d1937dba 100644
--- a/pdf-as-web/src/test/resources/config/pdfas/cfg/profiles_bkp/AMTSSIGNATURBLOCK_BASE.properties
+++ b/pdf-as-web/src/test/resources/config/pdfas/cfg/profiles_bkp/AMTSSIGNATURBLOCK_BASE.properties
@@ -20,7 +20,5 @@ sig_obj.AMTSSIGNATURBLOCK_BASE.value.SIG_ISSUER=${issuer.T != null ? (issuer.T +
 sig_obj.AMTSSIGNATURBLOCK_BASE.value.SIG_NUMBER=${sn}
 
 sig_obj.AMTSSIGNATURBLOCK_BASE.pos=f:80
-sig_obj.AMTSSIGNATURBLOCK_BASE.adobeSignFieldValue=PDF-AS Signatur
 sig_obj.AMTSSIGNATURBLOCK_BASE.adobeSignReasonValue=Signaturpruefung unter http://www.signaturpruefung.gv.at
 sig_obj.AMTSSIGNATURBLOCK_BASE.verifyURL=http://www.signaturpruefung.gv.at
-sig_obj.AMTSSIGNATURBLOCK_BASE.sigLogoAltText=Abgebildet ist eine Standard-Signaturbildmarke.
diff --git a/pdf-as-web/src/test/resources/config/pdfas/cfg/profiles_bkp/AMTSSIGNATURBLOCK_BASE_EN.properties b/pdf-as-web/src/test/resources/config/pdfas/cfg/profiles_bkp/AMTSSIGNATURBLOCK_BASE_EN.properties
index 2d1b8d9f..2fe91334 100644
--- a/pdf-as-web/src/test/resources/config/pdfas/cfg/profiles_bkp/AMTSSIGNATURBLOCK_BASE_EN.properties
+++ b/pdf-as-web/src/test/resources/config/pdfas/cfg/profiles_bkp/AMTSSIGNATURBLOCK_BASE_EN.properties
@@ -16,7 +16,5 @@ sig_obj.AMTSSIGNATURBLOCK_BASE_EN.value.SIG_META=Information about the verificat
 sig_obj.AMTSSIGNATURBLOCK_BASE_EN.value.SIG_LABEL=./images/amtsignatur-logo_demo.png
 sig_obj.AMTSSIGNATURBLOCK_BASE_EN.value.SIG_NOTE=This document was signed/sealed with an official signature. According to \u00a7 20 Austrian E-Government-Act a printout of this document is assumed to be authentic.
 
-sig_obj.AMTSSIGNATURBLOCK_BASE_EN.adobeSignFieldValue=PDF-AS Signature
 sig_obj.AMTSSIGNATURBLOCK_BASE_EN.adobeSignReasonValue=Signature verification at: http://www.signature-verification.gv.at
 sig_obj.AMTSSIGNATURBLOCK_BASE_EN.verifyURL=http://www.signaturpruefung.gv.at
-sig_obj.AMTSSIGNATURBLOCK_BASE_EN.sigLogoAltText=A standard signature logo is shown.
diff --git a/pdf-as-web/src/test/resources/config/pdfas/cfg/profiles_bkp/BAIK_ARCHIV_SIGNATUR.properties b/pdf-as-web/src/test/resources/config/pdfas/cfg/profiles_bkp/BAIK_ARCHIV_SIGNATUR.properties
index d8828ff6..e702c89f 100644
--- a/pdf-as-web/src/test/resources/config/pdfas/cfg/profiles_bkp/BAIK_ARCHIV_SIGNATUR.properties
+++ b/pdf-as-web/src/test/resources/config/pdfas/cfg/profiles_bkp/BAIK_ARCHIV_SIGNATUR.properties
@@ -21,16 +21,11 @@ sig_obj.BAIK_ARCHIV_SIGNATUR.key.SIG_META=Hinweis
 sig_obj.BAIK_ARCHIV_SIGNATUR.key.SIG_TITLE=ELEKTRONISCHE ARCHIVSIGNATUR
 
 sig_obj.BAIK_ARCHIV_SIGNATUR.pos=f:80
-sig_obj.BAIK_ARCHIV_SIGNATUR.adobeSignFieldValue=ELEKTRONISCHE ARCHIVSIGNATUR
-
-# WAI
-sig_obj.BAIK_ARCHIV_SIGNATUR.sigLogoAltText=Abgebildet ist eine Signaturbildmarke mit Bundesadler.
 
 sig_obj.BAIK_ARCHIV_SIGNATUR.value.SIG_META=Dokumentenformat: ${iui.pdfVersion}
 sig_obj.BAIK_ARCHIV_SIGNATUR.value.SIG_LABEL=./images/Baik_Archiv.gif
 sig_obj.BAIK_ARCHIV_SIGNATUR.value.SIG_TITLE=ELEKTRONISCHE ARCHIVSIGNATUR
 
-sig_obj.BAIK_ARCHIV_SIGNATUR.adobeSignFieldValue=Archivsignatur
 sig_obj.BAIK_ARCHIV_SIGNATUR.adobeSignText.binary=Archivsignatur der BAIK
 sig_obj.BAIK_ARCHIV_SIGNATUR.verifyURL=http://www.signaturpruefung.gv.at
 
diff --git a/pdf-as-web/src/test/resources/config/pdfas/cfg/profiles_bkp/BAIK_URKUNDE_SIGNATUR.properties b/pdf-as-web/src/test/resources/config/pdfas/cfg/profiles_bkp/BAIK_URKUNDE_SIGNATUR.properties
index 875943ae..7c64bbea 100644
--- a/pdf-as-web/src/test/resources/config/pdfas/cfg/profiles_bkp/BAIK_URKUNDE_SIGNATUR.properties
+++ b/pdf-as-web/src/test/resources/config/pdfas/cfg/profiles_bkp/BAIK_URKUNDE_SIGNATUR.properties
@@ -20,11 +20,7 @@ sig_obj.BAIK_URKUNDE_SIGNATUR.key.SIG_KZ=Methode
 sig_obj.BAIK_URKUNDE_SIGNATUR.key.SIG_META=Hinweis:
 sig_obj.BAIK_URKUNDE_SIGNATUR.key.SIG_TITLE=ELEKTRONISCHE BEURKUNDUNGSSIGNATUR
 
-# WAI
-sig_obj.BAIK_URKUNDE_SIGNATUR.sigLogoAltText=Abgebildet ist die Signaturbildmarke eines staatlich befugten und beeideten Ziviltechnikers mit Bundesadler.
-
 sig_obj.BAIK_URKUNDE_SIGNATUR.pos=f:80
-sig_obj.BAIK_URKUNDE_SIGNATUR.adobeSignFieldValue=Urkundensignatur
 sig_obj.BAIK_URKUNDE_SIGNATUR.adobeSignText.binary=Urkundensignatur der BAIK
 sig_obj.BAIK_URKUNDE_SIGNATUR.verifyURL=http://www.signaturpruefung.gv.at
 
diff --git a/pdf-as-web/src/test/resources/config/pdfas/cfg/profiles_bkp/BASE_MINIMAL.properties b/pdf-as-web/src/test/resources/config/pdfas/cfg/profiles_bkp/BASE_MINIMAL.properties
index 76da2bfd..dd9b5d7c 100644
--- a/pdf-as-web/src/test/resources/config/pdfas/cfg/profiles_bkp/BASE_MINIMAL.properties
+++ b/pdf-as-web/src/test/resources/config/pdfas/cfg/profiles_bkp/BASE_MINIMAL.properties
@@ -7,7 +7,6 @@ sig_obj.BASE_MINIMAL.description=Minimalbasissignatur Deutsch
 sig_obj.BASE_MINIMAL.key.SIG_META=Pr\u00fcfinformation
 
 sig_obj.BASE_MINIMAL.pos=w:230.0;f:80
-sig_obj.BASE_MINIMAL.adobeSignFieldValue=PDF-AS Signatur
 sig_obj.BASE_MINIMAL.adobeSignReasonValue=Signaturpruefung unter http://www.signaturpruefung.gv.at
 sig_obj.BASE_MINIMAL.verifyURL=http://www.signaturpruefung.gv.at
 
@@ -15,9 +14,6 @@ sig_obj.BASE_MINIMAL.value.SIG_META=Informationen zur Pr\u00FCfung der elektroni
 sig_obj.BASE_MINIMAL.value.SIG_LABEL=./images/signatur-logo_de.png
 sig_obj.BASE_MINIMAL.table.main.Style.imagescaletofit=65.0;65.0
 
-# WAI
-sig_obj.BASE_MINIMAL.sigLogoAltText=Abgebildet ist eine Standard-Signaturbildmarke.
-
 #---------------------- MAIN TABLE -------------------------
 sig_obj.BASE_MINIMAL.table.main.1=SIG_LABEL-i
 sig_obj.BASE_MINIMAL.table.main.2=SIG_META-v
diff --git a/pdf-as-web/src/test/resources/config/pdfas/cfg/profiles_bkp/BASE_MINIMAL_EN.properties b/pdf-as-web/src/test/resources/config/pdfas/cfg/profiles_bkp/BASE_MINIMAL_EN.properties
index 0a1871ef..7387dd3b 100644
--- a/pdf-as-web/src/test/resources/config/pdfas/cfg/profiles_bkp/BASE_MINIMAL_EN.properties
+++ b/pdf-as-web/src/test/resources/config/pdfas/cfg/profiles_bkp/BASE_MINIMAL_EN.properties
@@ -11,6 +11,3 @@ sig_obj.BASE_MINIMAL_EN.verifyURL=http://www.signature-verification.gv.at
 
 sig_obj.BASE_MINIMAL_EN.value.SIG_META=Information about the verification of the electronic signature can be found at: https://www.signaturpruefung.gv.at
 sig_obj.BASE_MINIMAL_EN.value.SIG_LABEL=./images/signatur-logo_en.png
-
-# WAI
-sig_obj.BASE_MINIMAL_EN.sigLogoAltText=A standard signature logo is shown.
diff --git a/pdf-as-web/src/test/resources/config/pdfas/cfg/profiles_bkp/BASE_NORMAL.properties b/pdf-as-web/src/test/resources/config/pdfas/cfg/profiles_bkp/BASE_NORMAL.properties
index 36304b66..ad62f50f 100644
--- a/pdf-as-web/src/test/resources/config/pdfas/cfg/profiles_bkp/BASE_NORMAL.properties
+++ b/pdf-as-web/src/test/resources/config/pdfas/cfg/profiles_bkp/BASE_NORMAL.properties
@@ -6,10 +6,6 @@
 sig_obj.BASE_NORMAL.description=Basissignatur Deutsch
 
 # Aktiviert ("on") bzw. deaktiviert ("off") dieses Profil.
-# "verify_only" beschraenkt das Profil auf Signaturpruefung, d.h. es kann nicht zum Erstellen von
-# Signaturen verwendet werden.
-# "sign_only" beschraenkt das Profil insofern, dass es nur noch zum Signieren, nicht aber
-# zum Pruefen verwendet werden kann.
 sig_obj.types.BASE_NORMAL=on
 
 # Festlegung der einzelner Bezeichnungen im Signaturblock.
@@ -52,16 +48,12 @@ sig_obj.BASE_NORMAL.value.SIG_NOTE=Dieses mit einer qualifizierten elektronische
 #     sig_obj.PROFILE.pos=p:1;x:40.0;y:800.0;w:400.0;f:80
 sig_obj.BASE_NORMAL.pos=f:80
 
-sig_obj.BASE_NORMAL.adobeSignFieldValue=PDF-AS Signatur
 # Text, der im Adobe Reader unter "Reason" angezeigt wird.
 sig_obj.BASE_NORMAL.adobeSignReasonValue=Signaturpruefung unter http://www.signaturpruefung.gv.at
 
 # URL fuer die Signaturpruefung durch das Adobe Acrobat Professional PDF-AS Plugin.
 #sig_obj.SIGNATURBLOCK_DE.verifyURL=http://www.signaturpruefung.gv.at
 
-# WAI
-sig_obj.BASE_NORMAL.sigLogoAltText=Abgebildet ist eine Standard-Signaturbildmarke.
-
 # Pruefhinweis im Signaturblock
 #sig_obj.SIGNATURBLOCK_DE.value.SIG_META=Signaturpruefung unter: http://www.signaturpruefung.gv.at
 
@@ -107,7 +99,7 @@ sig_obj.BASE_NORMAL.table.main.Style.imagevalign=middle
 #
 #    FACE: HELVETICA | TIMES_ROMAN | COURIER
 #    WEIGHT: float value
-#    STYLE: NORMAL | BOLD | ITALIC | BOLDITALIC | UNDERLINE | STRIKETHRU
+#    STYLE: NORMAL | BOLD | ITALIC | BOLDITALIC
 #
 # z.B. sig_obj.SIGNATURBLOCK_DE.table.main.Style.valuefont=COURIER,8,NORMAL
 sig_obj.BASE_NORMAL.table.main.Style.font=HELVETICA,8,BOLD
@@ -132,14 +124,8 @@ sig_obj.BASE_NORMAL.table.info.3=SIG_META-cv
 # Name fuer die Signaturkennzeichnung (binaer)
 #    sig_obj.PROFILE.adobeSignText.textual=PDF-AS
 #
-# Name fuer die PDF-Signatur
-#    sig_obj.PROFILE.adobeSignFieldValue=PDF-AS Signatur
-#
 # "Reason"-Feld der jeweiligen Signatur
 #    sig_obj.PROFILE.adobeSignReasonValue=Informationen zur Pr\u00FCfung finden Sie unter http://www.signaturpruefung.gv.at
 #
 # Prueflink fuer die Adobe Signaturkennzeichnung (nur relevant falls Adobe Plugin fuer Pruefung verwendet wird)
 #    sig_obj.PROFILE.verifyURL=http://www.signaturpruefung.gv.at
-#
-# Alternativer Text fuer den Signaturblock (WAI) (globale Einstellung)
-#    sig_obj.PROFILE.sigLogoAltText=Abgebildet ist eine Standard-Signaturbildmarke.
diff --git a/pdf-as-web/src/test/resources/config/pdfas/cfg/profiles_bkp/BASE_NORMAL_EN.properties b/pdf-as-web/src/test/resources/config/pdfas/cfg/profiles_bkp/BASE_NORMAL_EN.properties
index 903ff7d7..dadd5ad7 100644
--- a/pdf-as-web/src/test/resources/config/pdfas/cfg/profiles_bkp/BASE_NORMAL_EN.properties
+++ b/pdf-as-web/src/test/resources/config/pdfas/cfg/profiles_bkp/BASE_NORMAL_EN.properties
@@ -26,6 +26,3 @@ sig_obj.BASE_NORMAL_EN.adobeSignReasonValue=Signature verification at http://www
 
 # URL fuer die Signaturpruefung durch das Adobe Acrobat Professional PDF-AS Plugin.
 sig_obj.BASE_NORMAL_EN.verifyURL=http://www.signature-verification.gv.at
-
-# WAI
-sig_obj.BASE_NORMAL_EN.sigLogoAltText=A standard signature logo is shown.
diff --git a/pdf-as-web/src/test/resources/config/pdfas/cfg/profiles_bkp/BASE_SMALL_EN.properties b/pdf-as-web/src/test/resources/config/pdfas/cfg/profiles_bkp/BASE_SMALL_EN.properties
index 8c57d8b5..59c61e91 100644
--- a/pdf-as-web/src/test/resources/config/pdfas/cfg/profiles_bkp/BASE_SMALL_EN.properties
+++ b/pdf-as-web/src/test/resources/config/pdfas/cfg/profiles_bkp/BASE_SMALL_EN.properties
@@ -37,9 +37,6 @@ sig_obj.BASE_SMALL_EN.table.info.ColsWidth=1 2.7
 #sig_obj.BASE_SMALL_EN.value.SIG_META=Information about the verification of the electronic signature can be found at: https://www.signaturpruefung.gv.at \nInformation about the verification of the printout can be found at: https://www.behoerde.gv.at/el_signatur/
 #sig_obj.BASE_SMALL_EN.value.SIG_LABEL=./images/signatur-logo_en.png
 
-# WAI
-#sig_obj.BASE_SMALL_EN.sigLogoAltText=A standard signature logo is shown.
-
 #---------------------- MAIN TABLE -------------------------
 #sig_obj.BASE_SMALL_EN.table.main.ColsWidth=1 4.5
 #sig_obj.BASE_SMALL_EN.table.main.Style.font=HELVETICA,5,BOLD
diff --git a/pdf-as-web/src/test/resources/config/pdfas/cfg/profiles_bkp/INVISIBLE.properties b/pdf-as-web/src/test/resources/config/pdfas/cfg/profiles_bkp/INVISIBLE.properties
index b7193343..cc02928d 100644
--- a/pdf-as-web/src/test/resources/config/pdfas/cfg/profiles_bkp/INVISIBLE.properties
+++ b/pdf-as-web/src/test/resources/config/pdfas/cfg/profiles_bkp/INVISIBLE.properties
@@ -5,7 +5,6 @@ sig_obj.INVISIBLE.description=Unsichtbarer Signaturblock
 
 sig_obj.types.INVISIBLE=on
 
-sig_obj.INVISIBLE.adobeSignFieldValue=PDF-AS Signatur
 sig_obj.INVISIBLE.adobeSignReasonValue=Informationen zur Pr\u00fcfung finden Sie unter http://www.signaturpruefung.gv.at
 sig_obj.INVISIBLE.isvisible=false
 
diff --git a/pdf-as-web/src/test/resources/config/pdfas/pdf-as-web-verify-disabled.properties b/pdf-as-web/src/test/resources/config/pdfas/pdf-as-web-verify-disabled.properties
index 168af5e9..149e4338 100644
--- a/pdf-as-web/src/test/resources/config/pdfas/pdf-as-web-verify-disabled.properties
+++ b/pdf-as-web/src/test/resources/config/pdfas/pdf-as-web-verify-disabled.properties
@@ -12,9 +12,8 @@ bku.local.url=http://127.0.0.1:3495/http-security-layer-request
 
 bku.online.url=https://demo.egiz.gv.at/bkuonline/http-security-layer-request
 
-#bku.mobile.url=https://www.handy-signatur.at/mobile/https-security-layer-request/default.aspx
-#bku.mobile.url=https://test1.a-trust.at/mobile/https-security-layer-request/Default.aspx
-bku.mobile.url=https://www.a-trust.at/mobile/https-security-layer-request/default.aspx
+#bku.mobile.url=https://hs-abnahme.a-trust.at/mobile/https-security-layer-request/default.aspx
+bku.mobile.url=https://service.a-trust.at/mobile/https-security-layer-request/default.aspx
 
 sl20.sign.enabled=true
 sl20.mobile.url=http://localhost:7080/vda/services/getCertificate
@@ -33,7 +32,7 @@ sl20.debug.signed.result.required=false
 sl20.debug.encryption.enabled=false
 sl20.debug.encryption.required=false
 
-runtime.backend=PDFBOX_2_BACKEND
+runtime.backend=PDFBOX_3_BACKEND
 
 
 qr.placeholder.generator.enabled=true
diff --git a/pdf-as-web/src/test/resources/config/pdfas/pdf-as-web.properties b/pdf-as-web/src/test/resources/config/pdfas/pdf-as-web.properties
index b25818ca..78969371 100644
--- a/pdf-as-web/src/test/resources/config/pdfas/pdf-as-web.properties
+++ b/pdf-as-web/src/test/resources/config/pdfas/pdf-as-web.properties
@@ -12,9 +12,7 @@ bku.local.url=http://127.0.0.1:3495/http-security-layer-request
 
 bku.online.url=https://demo.egiz.gv.at/bkuonline/http-security-layer-request
 
-#bku.mobile.url=https://www.handy-signatur.at/mobile/https-security-layer-request/default.aspx
-#bku.mobile.url=https://test1.a-trust.at/mobile/https-security-layer-request/Default.aspx
-bku.mobile.url=https://www.a-trust.at/mobile/https-security-layer-request/default.aspx
+bku.mobile.url=https://service.a-trust.at/mobile/https-security-layer-request/default.aspx
 
 sl20.sign.enabled=true
 sl20.mobile.url=http://localhost:7080/vda/services/getCertificate
@@ -33,7 +31,7 @@ sl20.debug.signed.result.required=false
 sl20.debug.encryption.enabled=false
 sl20.debug.encryption.required=false
 
-runtime.backend=PDFBOX_2_BACKEND
+runtime.backend=PDFBOX_3_BACKEND
 
 
 qr.placeholder.generator.enabled=true