1 files changed, 20 insertions, 45 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 b3055eb34..038a35d42 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
@@ -12,10 +12,8 @@ import java.security.GeneralSecurityException;
 
 import javax.activation.CommandMap;
 import javax.activation.MailcapCommandMap;
-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.AuthConfiguration;
 import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProviderFactory;
 import at.gv.egovernment.moa.id.config.auth.MOAGarbageCollector;
@@ -136,50 +134,27 @@ public class MOAIDAuthInitializer {
                 "http://www.w3.org/2001/04/xmldsig-more#");
         Constants.nSMap.put(Constants.DSIG_PREFIX, Constants.DSIG_NS_URI);
 
-        // Loads the configuration
+        // Initialize configuration provider
+       	AuthConfiguration authConf = AuthConfigurationProviderFactory.reload();
+
+    	//test, if MOA-ID is already configured
+    	authConf.getPublicURLPrefix();
+
+    	// Initialize MOA-SP
+    	//MOA-SP is only use by API calls since MOA-ID 3.0.0  
         try {
-        	AuthConfiguration authConf = AuthConfigurationProviderFactory.reload();
-        	
-            ConnectionParameter moaSPConnParam = authConf
-                    .getMoaSpConnectionParameter();
-
-            // If MOA-SP API calls: loads MOA-SP configuration and configures IAIK
-            if (moaSPConnParam == null) {
-                try {
-                    LoggingContextManager.getInstance().setLoggingContext(
-                            new LoggingContext("startup"));
-                    ConfigurationProvider config = ConfigurationProvider
-                            .getInstance();
-                    new IaikConfigurator().configure(config);  
-                } catch (at.gv.egovernment.moa.spss.server.config.ConfigurationException ex) {
-                    throw new ConfigurationException("config.10", new Object[] { ex
-                            .toString() }, ex);
-                }
-            }
-     
-            // Initializes IAIKX509TrustManager logging
-            /*
-            String log4jConfigURL = System.getProperty("log4j.configuration");
-            Logger.info("Log4J Configuration: " + log4jConfigURL);
-            if (log4jConfigURL != null) {
-                IAIKX509TrustManager.initLog(new LoggerConfigImpl(log4jConfigURL));
-            }
-             */
-
-            // Initializes the Axis secure socket factory for use in calling the
-            // MOA-SP web service
-            if (moaSPConnParam != null && moaSPConnParam.isHTTPSURL()) {
-                SSLSocketFactory ssf = SSLUtils.getSSLSocketFactory(authConf,
-                        moaSPConnParam);
-                AxisSecureSocketFactory.initialize(ssf);
-            }
-        	
-        	
-        } catch (ConfigurationException e) {
-        	Logger.error("MOA-ID-Auth start-up FAILED. Error during application configuration.", e);
-        	System.exit(-1);
-        	
-        }
+        	LoggingContextManager.getInstance().setLoggingContext(
+                      new LoggingContext("startup"));
+            ConfigurationProvider config = ConfigurationProvider
+                      .getInstance();
+            new IaikConfigurator().configure(config);
+            
+         } catch (at.gv.egovernment.moa.spss.server.config.ConfigurationException ex) {
+            throw new ConfigurationException("config.10", new Object[] { ex
+                     .toString() }, ex);
+            
+         }
+        	        	
         
         // Starts the session cleaner thread to remove unpicked authentication data
         AuthenticationSessionCleaner.start();