A lot of moa sig stuff

1 files changed, 20 insertions, 8 deletions

diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/init/SystemInitializer.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/init/SystemInitializer.java
index 37569c5..094e446 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/init/SystemInitializer.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/init/SystemInitializer.java
@@ -36,25 +36,28 @@ import java.util.Timer;
 
 import org.slf4j.LoggerFactory;
 
-import at.gv.egovernment.moa.logging.LogMsg;
-import at.gv.egovernment.moa.logging.Logger;
-import at.gv.egovernment.moa.logging.LoggingContext;
-import at.gv.egovernment.moa.logging.LoggingContextManager;
 import at.gv.egovernment.moa.spss.MOAException;
 import at.gv.egovernment.moa.spss.api.common.TSLConfiguration;
 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.service.RevocationArchiveCleaner;
+import at.gv.egovernment.moa.spss.tsl.connector.MOATSLVerifier;
 import at.gv.egovernment.moa.spss.tsl.connector.TSLConnector;
 import at.gv.egovernment.moa.spss.tsl.timer.TSLUpdaterTimerTask;
 import at.gv.egovernment.moa.spss.util.MessageProvider;
-import at.gv.egovernment.moa.util.Constants;
-import at.gv.egovernment.moa.util.DOMUtils;
+import at.gv.egovernment.moaspss.logging.LogMsg;
+import at.gv.egovernment.moaspss.logging.Logger;
+import at.gv.egovernment.moaspss.logging.LoggingContext;
+import at.gv.egovernment.moaspss.logging.LoggingContextManager;
+import at.gv.egovernment.moaspss.util.Constants;
+import at.gv.egovernment.moaspss.util.DOMUtils;
 import iaik.pki.store.certstore.CertStoreException;
 import iaik.pki.store.truststore.TrustStoreException;
 import iaik.server.ConfigurationData;
+import iaik.xml.crypto.tsl.SecuredSAXParserFactoryImpl;
 import iaik.xml.crypto.tsl.ex.TSLEngineDiedException;
 import iaik.xml.crypto.tsl.ex.TSLSearchException;
+import iaik.xml.crypto.tsl.verify.ITSLVerifierFactory;
 
 /**
  * MOA SP/SS web service initialization.
@@ -93,8 +96,8 @@ public class SystemInitializer {
 	  logger.info("##############################################################################");
 	  logger.info("##############################################################################");
 	  logger.info("###                                                                        ###");
-	  logger.info("###                          LOADING MOA-SIG                               ###");
-	  logger.info("###                          ===============                               ###");
+	  logger.info("###                          LOADING MOA-SPSS                              ###");
+	  logger.info("###                          ================                              ###");
 	  logger.info("###                                                                        ###");
 	  logger.info("##############################################################################");
 	  logger.info("##############################################################################");
@@ -153,7 +156,11 @@ public class SystemInitializer {
       TSLConnector tslconnector = new TSLConnector();
       if (tslconfig != null) {
     	  //Logger.info(new LogMsg(msg.getMessage("init.01", null)));
+    	  SecuredSAXParserFactoryImpl.newInstance();
     	  Logger.info(new LogMsg(msg.getMessage("config.41", null)));
+    	  
+    	  ITSLVerifierFactory.setITSLVerifier(new MOATSLVerifier());
+    	  
     	  tslconnector.initialize(tslconfig.getEuTSLUrl(), tslconfig.getWorkingDirectory(), null, null);
   		  
       }
@@ -188,6 +195,11 @@ public class SystemInitializer {
     	Logger.fatal(new LogMsg(msg.getMessage("init.00", null)), e);
     } catch (CertificateException e) {
     	Logger.fatal(new LogMsg(msg.getMessage("init.00", null)), e);
+	} catch (Throwable e) {
+    	Logger.fatal(new LogMsg(msg.getMessage("init.00", null)), e);
+    	throw e;
+	} finally {
+		logger.info("Configuration initialized");
 	}