1 files changed, 24 insertions, 7 deletions
diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/init/ConfiguratorImpl.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/init/ConfiguratorImpl.java
index 8ab01d6..32654d4 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/init/ConfiguratorImpl.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/init/ConfiguratorImpl.java
@@ -29,6 +29,7 @@ import at.gv.egovernment.moa.spss.api.Configurator;
 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 iaik.server.ConfigurationData;
 
 /**
  * Default implementation of <code>Configurator</code>.
@@ -40,26 +41,42 @@ public class ConfiguratorImpl extends Configurator {
   /** whether the configuration has been initialized */
   private boolean initialized = false;
 
-  public void init() throws MOAException {
+  StartupConfigurationHolder result;
+  
+  public StartupConfigurationHolder getCurrentConfiguration() {
+	  return result;
+	  
+  }
+  
+  public StartupConfigurationHolder init() throws MOAException {
     if (!initialized) {
-      SystemInitializer.init();
+      result = SystemInitializer.init();
       initialized = true;
+                 
     }
+    
+    return result;
+    
   }
 
-  public void update() throws MOAException {
+  public StartupConfigurationHolder update() throws MOAException {
     if (!initialized) {
-      return;
+      return null;
     }
     
-    try {
+    try {    	       	
       // reconfigure the system
       ConfigurationProvider config = ConfigurationProvider.reload();
-      new IaikConfigurator().configure(config);
+      ConfigurationData iaikConfig = new IaikConfigurator().configure(config);
+      result = new StartupConfigurationHolder(config, iaikConfig);
+      return result;
+      
     } catch (MOAException e) {
       throw e;
+      
     } catch (Throwable t) {
-      throw new ConfigurationException("", null, t);
+      throw new ConfigurationException("MOA-SPSS initialization FAILED with a generic error", null, t);
+      
     }
   }