From c6951feaf46d85fefc3a30d85c21ba09783a3a2b Mon Sep 17 00:00:00 2001 From: knowcenter Date: Tue, 17 Jul 2007 13:02:06 +0000 Subject: git-svn-id: https://joinup.ec.europa.eu/svn/pdf-as/trunk@133 7b5415b0-85f9-ee4d-85bd-d5d0c3b42d1c --- .../egov/egiz/sig/connectors/ConnectorChooser.java | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) (limited to 'src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/ConnectorChooser.java') 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 4c63ebf..32dcb72 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 @@ -249,6 +249,7 @@ 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)) { log.debug("Version is 1.1.0 -> chose a detached connector."); @@ -314,9 +315,22 @@ public final class ConnectorChooser { log.debug("sig_app is MOA ==> DetachedMOAConnector"); //$NON-NLS-1$ - String msg = "A Detached signature cannot be verified with the MOA connector (yet)."; //$NON-NLS-1$ - log.error(msg); - throw new ConnectorException(370, msg); + try + { + if(SettingsReader.getInstance().getValueFromKey(MOA_CMD_LINE_SUPPORTED_KEY).equals("false")) + { + String msg = "A Detached signature cannot be verified with the MOA connector (yet)."; //$NON-NLS-1$ + log.error(msg); + throw new ConnectorException(370, msg); + } else + { + // TODO: replace hardcoded constants + return new DetachedLocRefMOAConnector(profile, "formdata:fileupload"); + } + } catch (SettingsException e) + { + e.printStackTrace(); + } } throw new ConnectorException(310, "Unknown sig_app '" + sig_app + "'."); //$NON-NLS-1$ //$NON-NLS-2$ } -- cgit v1.2.3