1 files changed, 22 insertions, 48 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 28f0645..8ff0b12 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,13 +36,13 @@ import java.util.Timer;
 
 import org.slf4j.LoggerFactory;
 
+import at.gv.egovernment.moa.sig.tsl.config.TslConfigurationImpl;
 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.TSLServiceFactory;
 import at.gv.egovernment.moa.spss.tsl.timer.TSLUpdaterTimerTask;
 import at.gv.egovernment.moa.spss.util.MessageProvider;
 import at.gv.egovernment.moaspss.logging.LogMsg;
@@ -55,10 +55,6 @@ import iaik.asn1.ObjectID;
 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.
@@ -150,55 +146,33 @@ public class SystemInitializer {
       ConfigurationProvider config = ConfigurationProvider.getInstance();
       Logger.info("Building ConfigurationData");
       ConfigurationData configData = new IaikConfigurator().configure(config);
-      
+                  
       //initialize TSL module
-      TSLConfiguration tslconfig = config.getTSLConfiguration();
-      
-      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());
+      TSLConfiguration moaSPTslConfig = config.getTSLConfiguration();      
+      if (moaSPTslConfig != null) {
+    	  TslConfigurationImpl tslConfig = new TslConfigurationImpl();
+    	  tslConfig.setEuTslURL(moaSPTslConfig.getEuTSLUrl());
+    	  tslConfig.setTslWorkingDirectory(moaSPTslConfig.getWorkingDirectory());
     	  
-    	  tslconnector.initialize(tslconfig.getEuTSLUrl(), tslconfig.getWorkingDirectory(), null, null);
-  		  
-      }
-            
-      //start TSL Update
-      TSLUpdaterTimerTask.tslconnector_ = tslconnector;
-      TSLUpdaterTimerTask.configData_ = configData;
-      TSLUpdaterTimerTask.update();
-      
-      //initialize TSL Update Task
-      initTSLUpdateTask(tslconfig);
-
-      runInitializer(config);
+    	  Logger.info(new LogMsg(msg.getMessage("config.41", null)));
+    	  TSLServiceFactory.initialize(tslConfig);    	  
+    	  Logger.info("TSL-Service client initialization finished");
+    	            
+          //initialize TSL Update Task
+          initTSLUpdateTask(moaSPTslConfig);
+    	   
+      	}
       
-      Logger.info(new LogMsg(msg.getMessage("init.01", null)));
+      	runInitializer(config);      
+      	Logger.info(new LogMsg(msg.getMessage("init.01", null)));
+      	
     } catch (MOAException e) {
-      Logger.fatal(new LogMsg(msg.getMessage("init.00", null)), e);
-    } 
-    catch (TSLEngineDiedException e) {
-    	Logger.fatal(new LogMsg(msg.getMessage("init.00", null)), e);
-	} 
-    catch (TSLSearchException e) {
-    	Logger.fatal(new LogMsg(msg.getMessage("init.00", null)), e);
-    } 
-    catch (CertStoreException e) {
-    	Logger.fatal(new LogMsg(msg.getMessage("init.00", null)), e);
-    } catch (TrustStoreException e) {
-    	Logger.fatal(new LogMsg(msg.getMessage("init.00", null)), e);
-    } catch (FileNotFoundException e) {
     	Logger.fatal(new LogMsg(msg.getMessage("init.00", null)), e);
-    } catch (IOException e) {
-    	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) {
+      
+    } catch (Throwable e) {
     	Logger.fatal(new LogMsg(msg.getMessage("init.00", null)), e);
     	throw new RuntimeException(e);
+    	
 	} finally {
 		logger.info("Configuration initialized");
 	}