diff options
8 files changed, 41 insertions, 42 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 82dd4609..f97b1f15 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,5 @@ -image: maven:latest +#image: maven:latest +image: maven:3.6.3-jdk-11 variables: LC_ALL: "en_US.UTF-8" diff --git a/eaaf_modules/eaaf_module_moa-sig/pom.xml b/eaaf_modules/eaaf_module_moa-sig/pom.xml index 178de6e4..20d7050b 100644 --- a/eaaf_modules/eaaf_module_moa-sig/pom.xml +++ b/eaaf_modules/eaaf_module_moa-sig/pom.xml @@ -75,8 +75,8 @@ </dependency> <dependency> - <groupId>MOA.spss.server</groupId> - <artifactId>moa-sig-lib</artifactId> + <groupId>moaSig</groupId> + <artifactId>moa-sig-lib</artifactId> <exclusions> <exclusion> <groupId>commons-logging</groupId> @@ -89,12 +89,12 @@ </exclusions> </dependency> <dependency> - <groupId>MOA.spss</groupId> + <groupId>moaSig</groupId> <artifactId>common</artifactId> </dependency> <dependency> - <groupId>MOA.spss</groupId> - <artifactId>tsl_lib</artifactId> + <groupId>at.gv.egovernment.moa.sig</groupId> + <artifactId>tsl-lib</artifactId> </dependency> <dependency> <groupId>iaik.prod</groupId> diff --git a/eaaf_modules/eaaf_module_moa-sig/repository/iaik/prod/iaik_cms/5.1.1/iaik_cms-5.1.1.jar b/eaaf_modules/eaaf_module_moa-sig/repository/iaik/prod/iaik_cms/5.1.1/iaik_cms-5.1.1.jar Binary files differnew file mode 100644 index 00000000..127160d1 --- /dev/null +++ b/eaaf_modules/eaaf_module_moa-sig/repository/iaik/prod/iaik_cms/5.1.1/iaik_cms-5.1.1.jar diff --git a/eaaf_modules/eaaf_module_moa-sig/repository/iaik/prod/iaik_cms/5.1.1/iaik_cms-5.1.1.pom b/eaaf_modules/eaaf_module_moa-sig/repository/iaik/prod/iaik_cms/5.1.1/iaik_cms-5.1.1.pom new file mode 100644 index 00000000..bc56e9d2 --- /dev/null +++ b/eaaf_modules/eaaf_module_moa-sig/repository/iaik/prod/iaik_cms/5.1.1/iaik_cms-5.1.1.pom @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <groupId>iaik.prod</groupId> + <artifactId>iaik_cms</artifactId> + <version>5.1.1</version> + <description>POM was created from install:install-file</description> +</project> diff --git a/eaaf_modules/eaaf_module_moa-sig/src/main/java/at/gv/egiz/eaaf/modules/sigverify/moasig/impl/AbstractSignatureService.java b/eaaf_modules/eaaf_module_moa-sig/src/main/java/at/gv/egiz/eaaf/modules/sigverify/moasig/impl/AbstractSignatureService.java index b9219ee4..942cd35c 100644 --- a/eaaf_modules/eaaf_module_moa-sig/src/main/java/at/gv/egiz/eaaf/modules/sigverify/moasig/impl/AbstractSignatureService.java +++ b/eaaf_modules/eaaf_module_moa-sig/src/main/java/at/gv/egiz/eaaf/modules/sigverify/moasig/impl/AbstractSignatureService.java @@ -53,7 +53,7 @@ public abstract class AbstractSignatureService { if (txMgr.getTransactionContext() == null) { log.debug("Set not MOA-Sig transaction context"); final TransactionContext ctx = - new TransactionContext(transactionID, null, moaSigConfig.getMoaSigConfig()); + new TransactionContext(transactionID, null, moaSigConfig.getConfigHolder().getMoaSpssConfig()); txMgr.setTransactionContext(ctx); } @@ -72,7 +72,7 @@ public abstract class AbstractSignatureService { } - new IaikConfigurator().configure(moaSigConfig.getMoaSigConfig()); + new IaikConfigurator().configure(moaSigConfig.getConfigHolder().getMoaSpssConfig()); } diff --git a/eaaf_modules/eaaf_module_moa-sig/src/main/java/at/gv/egiz/eaaf/modules/sigverify/moasig/impl/MoaSigInitializer.java b/eaaf_modules/eaaf_module_moa-sig/src/main/java/at/gv/egiz/eaaf/modules/sigverify/moasig/impl/MoaSigInitializer.java index 80244b40..dc4aa4c0 100644 --- a/eaaf_modules/eaaf_module_moa-sig/src/main/java/at/gv/egiz/eaaf/modules/sigverify/moasig/impl/MoaSigInitializer.java +++ b/eaaf_modules/eaaf_module_moa-sig/src/main/java/at/gv/egiz/eaaf/modules/sigverify/moasig/impl/MoaSigInitializer.java @@ -15,9 +15,8 @@ import org.springframework.beans.factory.annotation.Autowired; import at.gv.egiz.eaaf.modules.sigverify.moasig.api.data.ISchemaRessourceProvider; import at.gv.egiz.eaaf.modules.sigverify.moasig.exceptions.MoaSigServiceConfigurationException; -import at.gv.egovernment.moa.spss.MOAException; -import at.gv.egovernment.moa.spss.api.Configurator; -import at.gv.egovernment.moa.spss.server.config.ConfigurationProvider; +import at.gv.egovernment.moa.spss.server.init.StartupConfigurationHolder; +import at.gv.egovernment.moa.spss.server.init.SystemInitializer; import at.gv.egovernment.moaspss.logging.LoggingContext; import at.gv.egovernment.moaspss.logging.LoggingContextManager; import at.gv.egovernment.moaspss.util.DOMUtils; @@ -36,10 +35,7 @@ public class MoaSigInitializer { * Get MOA-Sig configuration object. */ @Getter - private Configurator moaSigConfigurator; - - @Getter - private ConfigurationProvider moaSigConfig; + private StartupConfigurationHolder configHolder; @PostConstruct @@ -53,13 +49,7 @@ public class MoaSigInitializer { try { LoggingContextManager.getInstance().setLoggingContext(new LoggingContext("startup")); log.debug("MOA-Sig library initialization process ... "); - moaSigConfigurator = Configurator.getInstance(); - moaSigConfigurator.init(); - - //TODO: update initialization if switch to next MOA-SPSS version - - moaSigConfig = ConfigurationProvider.getInstance(); - + configHolder = SystemInitializer.init(); log.info("MOA-Sig library initialization complete "); fixJava8_141ProblemWithSslAlgorithms(); @@ -94,8 +84,8 @@ public class MoaSigInitializer { } } - } catch (final MOAException e) { - log.error("MOA-SP initialization FAILED!", e.getWrapped()); + } catch (final RuntimeException e) { + log.error("MOA-SP initialization FAILED!", e); throw new MoaSigServiceConfigurationException("service.moasig.04", new Object[] { e.toString() }, e); } diff --git a/eaaf_modules/eaaf_module_moa-sig/src/main/java/at/gv/egiz/eaaf/modules/sigverify/moasig/impl/SignatureVerificationService.java b/eaaf_modules/eaaf_module_moa-sig/src/main/java/at/gv/egiz/eaaf/modules/sigverify/moasig/impl/SignatureVerificationService.java index 9ee6d0aa..854718e5 100644 --- a/eaaf_modules/eaaf_module_moa-sig/src/main/java/at/gv/egiz/eaaf/modules/sigverify/moasig/impl/SignatureVerificationService.java +++ b/eaaf_modules/eaaf_module_moa-sig/src/main/java/at/gv/egiz/eaaf/modules/sigverify/moasig/impl/SignatureVerificationService.java @@ -9,6 +9,16 @@ import java.util.Map; import javax.annotation.PostConstruct; +import org.apache.commons.lang3.time.DateFormatUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.lang.Nullable; +import org.springframework.stereotype.Service; +import org.springframework.util.Base64Utils; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.Node; + import at.gv.egiz.eaaf.modules.sigverify.moasig.api.ISignatureVerificationService; import at.gv.egiz.eaaf.modules.sigverify.moasig.api.data.ICmsSignatureVerificationResponse; import at.gv.egiz.eaaf.modules.sigverify.moasig.api.data.IXmlSignatureVerificationResponse; @@ -28,16 +38,6 @@ import at.gv.egovernment.moa.spss.server.invoke.CMSSignatureVerificationInvoker; import at.gv.egovernment.moa.spss.server.invoke.XMLSignatureVerificationInvoker; import at.gv.egovernment.moaspss.util.Constants; -import org.apache.commons.lang3.time.DateFormatUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.lang.Nullable; -import org.springframework.stereotype.Service; -import org.springframework.util.Base64Utils; -import org.w3c.dom.Document; -import org.w3c.dom.Element; -import org.w3c.dom.Node; - /** * MOA-Sig based signature verification implementation. * @@ -396,7 +396,6 @@ public class SignatureVerificationService extends AbstractSignatureService t); } - } @PostConstruct @@ -23,11 +23,11 @@ <at.gv.egiz.components.eventlog-api.version>0.4</at.gv.egiz.components.eventlog-api.version> <at.gv.egiz.components.egiz-spring-api>0.3.1</at.gv.egiz.components.egiz-spring-api> - <MOA.spss.server.moa-sig-lib.version>3.1.4-RC1</MOA.spss.server.moa-sig-lib.version> - <MOA.spss.tsl_lib.version>2.0.3</MOA.spss.tsl_lib.version> + <MOA.spss.server.moa-sig-lib.version>3.1.4-RC2</MOA.spss.server.moa-sig-lib.version> + <MOA.spss.tsl_lib.version>2.0.4.1</MOA.spss.tsl_lib.version> <!-- IAIK libs --> - <iaik.prod.iaik_cms.version>5.1</iaik.prod.iaik_cms.version> + <iaik.prod.iaik_cms.version>5.1.1</iaik.prod.iaik_cms.version> <iaik.prod.iaik_cpades.version>2.4_moa</iaik.prod.iaik_cpades.version> <iaik.prod.iaik_cpxlevel.version>0.9_moa</iaik.prod.iaik_cpxlevel.version> <iaik.prod.iaik_eccelerate.version>6.02</iaik.prod.iaik_eccelerate.version> @@ -276,7 +276,7 @@ <dependency> - <groupId>MOA.spss.server</groupId> + <groupId>moaSig</groupId> <artifactId>moa-sig-lib</artifactId> <version>${MOA.spss.server.moa-sig-lib.version}</version> <exclusions> @@ -291,13 +291,13 @@ </exclusions> </dependency> <dependency> - <groupId>MOA.spss</groupId> + <groupId>moaSig</groupId> <artifactId>common</artifactId> <version>${MOA.spss.server.moa-sig-lib.version}</version> </dependency> <dependency> - <groupId>MOA.spss</groupId> - <artifactId>tsl_lib</artifactId> + <groupId>at.gv.egovernment.moa.sig</groupId> + <artifactId>tsl-lib</artifactId> <version>${MOA.spss.tsl_lib.version}</version> </dependency> |