From 9141f6359d65447bd80e9227e8fe2e9f82e1cc64 Mon Sep 17 00:00:00 2001 From: Christian Maierhofer Date: Fri, 26 Aug 2016 12:16:21 +0200 Subject: changed sql queries to support eidas status cert status granted and regongizedatnationallevel --- .../java/at/gv/egovernment/moa/spss/tsl/connector/TSLConnector.java | 2 +- .../at/gv/egovernment/moa/spss/tsl/timer/TSLUpdaterTimerTask.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/tsl/connector/TSLConnector.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/tsl/connector/TSLConnector.java index fee6ebe..5620a20 100644 --- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/tsl/connector/TSLConnector.java +++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/tsl/connector/TSLConnector.java @@ -627,7 +627,7 @@ public class TSLConnector implements TSLConnectorInterface { certsExporter = tslEngine.createCertsExporter( readConnection, countries, - new String[]{_STYPETEMPLATE_CAQC}, + null,//new String[]{_STYPETEMPLATE_CAQC}, serviceLevelStatus ); diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/tsl/timer/TSLUpdaterTimerTask.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/tsl/timer/TSLUpdaterTimerTask.java index c42d406..61e305b 100644 --- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/tsl/timer/TSLUpdaterTimerTask.java +++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/tsl/timer/TSLUpdaterTimerTask.java @@ -97,7 +97,7 @@ public class TSLUpdaterTimerTask extends TimerTask { TSLConfiguration tslconfig = config.getTSLConfiguration(); if (tslconfig != null) { - tslconnector_.updateTSLs(new Date(), new String[]{"accredited","undersupervision"}); + tslconnector_.updateTSLs(new Date(), new String[]{"granted","recognisedatnationallevel"}); Logger.info(new LogMsg(msg.getMessage("config.42", null))); @@ -124,7 +124,7 @@ public class TSLUpdaterTimerTask extends TimerTask { Logger.debug(new LogMsg(msg.getMessage("config.44", null))); // get certificates from TSL from all countries - tsl_certs = tslconnector_.getQualifiedCACertificates(new Date(), new String[]{"accredited","undersupervision"}); + tsl_certs = tslconnector_.getQualifiedCACertificates(new Date(), new String[]{"granted","recognisedatnationallevel"}); } else { Logger.debug(new LogMsg(msg.getMessage("config.44", null))); @@ -135,7 +135,7 @@ public class TSLUpdaterTimerTask extends TimerTask { array[i] = array[i].trim(); // get certificates from TSL from given countries - tsl_certs = tslconnector_.getQualifiedCACertificates(new Date(), array, new String[]{"accredited","undersupervision"}); + tsl_certs = tslconnector_.getQualifiedCACertificates(new Date(), array, new String[]{"granted","recognisedatnationallevel"}); } // create store updater for each TSL enabled truststore -- cgit v1.2.3