From 523a81cf86239f3c7d3bbb212dad2c779951ecba Mon Sep 17 00:00:00 2001 From: tknall Date: Mon, 18 Jan 2010 10:14:45 +0000 Subject: - bug fixed (new method v1.2.0 was not accepted by web verification connector) - minor bugs fixed in error.jsp - updating SIGNATURBLOCK.jsp (-> v1.2.0) git-svn-id: https://joinup.ec.europa.eu/svn/pdf-as/trunk@555 7b5415b0-85f9-ee4d-85bd-d5d0c3b42d1c --- src/main/java/at/knowcenter/wag/egov/egiz/PdfAS.java | 2 +- .../knowcenter/wag/egov/egiz/sig/connectors/ConnectorChooser.java | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/main/java/at') diff --git a/src/main/java/at/knowcenter/wag/egov/egiz/PdfAS.java b/src/main/java/at/knowcenter/wag/egov/egiz/PdfAS.java index 5f565e1..0ae2e8e 100644 --- a/src/main/java/at/knowcenter/wag/egov/egiz/PdfAS.java +++ b/src/main/java/at/knowcenter/wag/egov/egiz/PdfAS.java @@ -99,7 +99,7 @@ public abstract class PdfAS * The current version of the pdf-as library. This version string is logged on every invocation * of the api or the web application. */ - public static final String PDFAS_VERSION = "3.1 (20100115)"; + public static final String PDFAS_VERSION = "3.1 (20100118)"; /** * The key of the strict mode setting. diff --git a/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/ConnectorChooser.java b/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/ConnectorChooser.java index 96f2311..98d336e 100644 --- a/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/ConnectorChooser.java +++ b/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/ConnectorChooser.java @@ -156,9 +156,9 @@ public final class ConnectorChooser throw new ConnectorException(300, "The SIG_KZ version is 1.0.0, but SIG_ID is neither MOA nor Old base64 nor Hotfix base64 ???'"); } - if (sig_kz.getVersion().equals(SignatorFactory.VERSION_1_1_0)) + if (sig_kz.getVersion().equals(SignatorFactory.VERSION_1_1_0) || sig_kz.getVersion().equals(SignatorFactory.VERSION_1_2_0)) { - log.debug("sig_kz version is 1.1.0 -> choosing detached (loc ref) connector."); + log.debug("sig_kz version is 1.1.0/1.2.0 -> choosing detached (loc ref) connector."); ConnectorParameters cp = new ConnectorParameters(); cp.setProfileId(profile); @@ -191,9 +191,9 @@ public final class ConnectorChooser return new EnvelopingBase64MOAConnector(cp); } - if (sig_kz.getVersion().equals(SignatorFactory.VERSION_1_1_0)) + if (sig_kz.getVersion().equals(SignatorFactory.VERSION_1_1_0) || sig_kz.getVersion().equals(SignatorFactory.VERSION_1_2_0)) { - log.debug("sig_kz version is 1.1.0 -> choosing detached (loc ref) connector."); + log.debug("sig_kz version is 1.1.0/1.2.0 -> choosing detached (loc ref) connector."); //throw new ConnectorException(370, "The MOA detached connector is not suitable for verification."); // TODO TR: Switch her for SwA or Detached-URL Connector -- cgit v1.2.3