From 9d9e9e734724c4d05757059c4dca434c07ac7c46 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <thomas.lenz@egiz.gv.at>
Date: Mon, 19 Oct 2020 17:18:48 +0200
Subject: refactor MoaSigInitializer to get MOA-Sig configuration object

---
 .../sigverify/moasig/impl/AbstractSignatureService.java  | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

(limited to 'eaaf_modules/eaaf_module_moa-sig/src/main/java/at/gv/egiz/eaaf/modules/sigverify/moasig/impl/AbstractSignatureService.java')

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 c7efc677..11881cbf 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
@@ -4,19 +4,17 @@ import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.w3c.dom.Document;
-
 import at.gv.egovernment.moa.spss.server.config.ConfigurationException;
-import at.gv.egovernment.moa.spss.server.config.ConfigurationProvider;
-import at.gv.egovernment.moa.spss.server.iaik.config.IaikConfigurator;
 import at.gv.egovernment.moa.spss.server.transaction.TransactionContext;
 import at.gv.egovernment.moa.spss.server.transaction.TransactionContextManager;
 import at.gv.egovernment.moaspss.logging.LoggingContext;
 import at.gv.egovernment.moaspss.logging.LoggingContextManager;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.w3c.dom.Document;
+
 public abstract class AbstractSignatureService {
   private static final Logger log = LoggerFactory.getLogger(AbstractSignatureService.class);
 
@@ -51,7 +49,7 @@ public abstract class AbstractSignatureService {
     if (txMgr.getTransactionContext() == null) {
       log.debug("Set not MOA-Sig transaction context");
       final TransactionContext ctx =
-          new TransactionContext(transactionID, null, ConfigurationProvider.getInstance());
+          new TransactionContext(transactionID, null, moaSigConfig.getMoaSigConfig());
       txMgr.setTransactionContext(ctx);
 
     }
@@ -62,7 +60,7 @@ public abstract class AbstractSignatureService {
 
     }
 
-    new IaikConfigurator().configure(ConfigurationProvider.getInstance());
+    //new IaikConfigurator().configure(moaSigConfig.getMoaSigConfig());
 
   }
 
-- 
cgit v1.2.3