1 files changed, 3 insertions, 25 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/MOAIDAuthInitializer.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/MOAIDAuthInitializer.java
index 725773b75..a73d76d68 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/MOAIDAuthInitializer.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/MOAIDAuthInitializer.java
@@ -39,6 +39,7 @@ import javax.net.ssl.SSLSocketFactory;
 
 import at.gv.egovernment.moa.id.config.ConfigurationException;
 import at.gv.egovernment.moa.id.config.ConnectionParameter;
+import at.gv.egovernment.moa.id.config.auth.AuthConfigLoader;
 import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProvider;
 import at.gv.egovernment.moa.id.iaik.config.LoggerConfigImpl;
 import at.gv.egovernment.moa.id.util.AxisSecureSocketFactory;
@@ -174,33 +175,10 @@ public class MOAIDAuthInitializer {
         }
 
         
-        // sets the authentication session and authentication data time outs
-        BigInteger param = authConf.getTimeOuts().getMOASessionCreated();
-        if (param != null) {
-                long sessionTimeOut = param.longValue();
-            if (sessionTimeOut > 0)
-                    AuthenticationServer.getInstance()
-                            .setSecondsSessionTimeOutCreated(sessionTimeOut);
-        }
-        
-        param = authConf.getTimeOuts().getMOASessionUpdated();
-        if (param != null) {
-                long sessionTimeOut = param.longValue();
-            if (sessionTimeOut > 0)
-                    AuthenticationServer.getInstance()
-                            .setSecondsSessionTimeOutUpdated(sessionTimeOut);
-        }
-        
-        param = authConf.getTimeOuts().getAssertion();
-        if (param != null) {
-            long authDataTimeOut = param.longValue();
-            if (authDataTimeOut > 0)
-                    AuthenticationServer.getInstance()
-                            .setSecondsAuthDataTimeOut(authDataTimeOut);
-        }
-
         // Starts the session cleaner thread to remove unpicked authentication data
         AuthenticationSessionCleaner.start();
+        AuthConfigLoader.start();
     }
+    
 
 }
\ No newline at end of file