diff options
Diffstat (limited to 'eaaf_modules/eaaf_module_moa-sig/src/main/java/at/gv/egiz/eaaf/modules/sigverify/moasig/impl/MoaSigInitializer.java')
-rw-r--r-- | eaaf_modules/eaaf_module_moa-sig/src/main/java/at/gv/egiz/eaaf/modules/sigverify/moasig/impl/MoaSigInitializer.java | 25 |
1 files changed, 8 insertions, 17 deletions
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 ce98c92b..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,11 +49,7 @@ public class MoaSigInitializer { try { LoggingContextManager.getInstance().setLoggingContext(new LoggingContext("startup")); log.debug("MOA-Sig library initialization process ... "); - moaSigConfigurator = Configurator.getInstance(); - moaSigConfigurator.init(); - - moaSigConfig = ConfigurationProvider.getInstance(); - + configHolder = SystemInitializer.init(); log.info("MOA-Sig library initialization complete "); fixJava8_141ProblemWithSslAlgorithms(); @@ -66,10 +58,9 @@ public class MoaSigInitializer { log.debug("Loaded Security Provider:"); final Provider[] providerList = Security.getProviders(); for (int i = 0; i < providerList.length; i++) { - log.debug( - i + ": " + providerList[i].getName() + " Version " + providerList[i].getVersion()); + log.debug("{}: {} Version {}", i, providerList[i].getName(), providerList[i].getVersion()); + } - } // Inject additional XML schemes @@ -93,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); } |