fix problem in SystemInitializer order that prevent the use of the TSL certstore

switch to version RC4

2 files changed, 19 insertions, 16 deletions

diff --git a/moaSig/build.gradle b/moaSig/build.gradle
index 808a960..4fe3b49 100644
--- a/moaSig/build.gradle
+++ b/moaSig/build.gradle
@@ -21,7 +21,7 @@ subprojects {
         testCompile 'junit:junit:4.8.2'
     }
 
-    version = '3.1.0-RC3'
+    version = '3.1.0-RC4'
 
     jar { manifest.attributes provider: 'EGIZ', 'Specification-Version': getCheckedOutGitCommitHash(), 'Implementation-Version': project.version  }
 }
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 295e861..0e592f0 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
@@ -143,27 +143,30 @@ public class SystemInitializer {
     
     // initialize configuration
     try {
-      ConfigurationProvider config = ConfigurationProvider.getInstance();
-      Logger.info("Building ConfigurationData");
-      ConfigurationData configData = new IaikConfigurator().configure(config);
+    	Logger.info("Initialize MOA-SP/SS configuration ... ");
+    	ConfigurationProvider config = ConfigurationProvider.getInstance();
                   
-      //initialize TSL module
-      TSLConfiguration moaSPTslConfig = config.getTSLConfiguration();      
-      if (moaSPTslConfig != null) {
-    	  TslConfigurationImpl tslConfig = new TslConfigurationImpl();
-    	  tslConfig.setEuTslURL(moaSPTslConfig.getEuTSLUrl());
-    	  tslConfig.setTslWorkingDirectory(moaSPTslConfig.getWorkingDirectory());
-    	  tslConfig.setNetworkReadTimeout(config.getReadTimeout() / 1000);
+    	//initialize TSL module
+    	TSLConfiguration moaSPTslConfig = config.getTSLConfiguration();      
+    	if (moaSPTslConfig != null) {
+    		Logger.debug("Starting TSL-Service initialization ... ");
+    		TslConfigurationImpl tslConfig = new TslConfigurationImpl();
+    		tslConfig.setEuTslURL(moaSPTslConfig.getEuTSLUrl());
+    		tslConfig.setTslWorkingDirectory(moaSPTslConfig.getWorkingDirectory());
+    		tslConfig.setNetworkReadTimeout(config.getReadTimeout() / 1000);
     	  
-    	  Logger.info(new LogMsg(msg.getMessage("config.41", null)));
-    	  TSLServiceFactory.initialize(tslConfig);    	  
-    	  Logger.info("TSL-Service client initialization finished");
+    		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);
+    		//initialize TSL Update Task
+    		initTSLUpdateTask(moaSPTslConfig);
     	   
       	}
       
+        Logger.info("Building IAIK-MOA configuration ... ");
+        new IaikConfigurator().configure(config);
+    	
       	runInitializer(config);      
       	Logger.info(new LogMsg(msg.getMessage("init.01", null)));