1 files changed, 10 insertions, 3 deletions
diff --git a/eaaf_modules/eaaf_module_moa-sig/src/main/java/at/gv/egiz/eid/authhandler/modules/sigverify/moasig/impl/SignatureCreationService.java b/eaaf_modules/eaaf_module_moa-sig/src/main/java/at/gv/egiz/eid/authhandler/modules/sigverify/moasig/impl/SignatureCreationService.java
index 0dcb0960..59e7b516 100644
--- a/eaaf_modules/eaaf_module_moa-sig/src/main/java/at/gv/egiz/eid/authhandler/modules/sigverify/moasig/impl/SignatureCreationService.java
+++ b/eaaf_modules/eaaf_module_moa-sig/src/main/java/at/gv/egiz/eid/authhandler/modules/sigverify/moasig/impl/SignatureCreationService.java
@@ -1,21 +1,28 @@
 package at.gv.egiz.eid.authhandler.modules.sigverify.moasig.impl;
 
+import javax.annotation.PostConstruct;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 
 import at.gv.egiz.eid.authhandler.modules.sigverify.moasig.api.ISignatureCreationService;
+import at.gv.egovernment.moa.spss.server.invoke.CMSSignatureCreationInvoker;
+import at.gv.egovernment.moa.spss.server.invoke.XMLSignatureCreationInvoker;
 
 @Service(value="moaSigCreateService")
 public class SignatureCreationService extends AbstractSignatureService implements ISignatureCreationService{
 	private static final Logger log = LoggerFactory.getLogger(SignatureCreationService.class);
 	
-	private at.gv.egovernment.moa.spss.api.SignatureCreationService scs = null;
+	private XMLSignatureCreationInvoker xadesInvoker;
+	private CMSSignatureCreationInvoker cadesInvoker;
+	
 	
-	@Override
+	@PostConstruct
 	protected void internalInitializer() {
         log.debug("Instanzing SignatureCreationService implementation ... ");
-		scs = at.gv.egovernment.moa.spss.api.SignatureCreationService.getInstance();		
+        xadesInvoker = XMLSignatureCreationInvoker.getInstance();
+        cadesInvoker = CMSSignatureCreationInvoker.getInstance();
 		log.info("MOA-Sig signature-creation service initialized");
 
 	}