1 files changed, 6 insertions, 16 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 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);
     }