change logs and error messages during MOA-ID start-up process

3 files changed, 28 insertions, 51 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 d8b3177cc..022ec9def 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
@@ -133,53 +133,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();
-
-        	
-        	//MOA-SP is only use by API calls since MOA-ID 3.0.0  
-
-        	//            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();
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/PropertyBasedAuthConfigurationProvider.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/PropertyBasedAuthConfigurationProvider.java
index d4620cd1a..7b798f522 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/PropertyBasedAuthConfigurationProvider.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/PropertyBasedAuthConfigurationProvider.java
@@ -107,7 +107,7 @@ public class PropertyBasedAuthConfigurationProvider extends ConfigurationProvide
 				}						
 			}
 			
-			
+									
 		} catch (FileNotFoundException e) {
 			throw new ConfigurationException("config.03", null, e);
 		
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/entrypoints/DispatcherServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/entrypoints/DispatcherServlet.java
index 1f4612dca..ce44db215 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/entrypoints/DispatcherServlet.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/entrypoints/DispatcherServlet.java
@@ -33,7 +33,6 @@ import javax.servlet.http.HttpServletResponse;
 import at.gv.egovernment.moa.id.advancedlogging.MOAIDEventConstants;
 import at.gv.egovernment.moa.id.advancedlogging.MOAReversionLogger;
 import at.gv.egovernment.moa.id.advancedlogging.StatisticLogger;
-
 import at.gv.egovernment.moa.id.advancedlogging.TransactionIDUtils;
 import at.gv.egovernment.moa.id.auth.MOAIDAuthConstants;
 import at.gv.egovernment.moa.id.auth.MOAIDAuthInitializer;
@@ -45,7 +44,6 @@ import at.gv.egovernment.moa.id.auth.exception.MOAIDException;
 import at.gv.egovernment.moa.id.auth.exception.ProtocolNotActiveException;
 import at.gv.egovernment.moa.id.auth.exception.WrongParametersException;
 import at.gv.egovernment.moa.id.auth.servlet.AuthServlet;
-
 import at.gv.egovernment.moa.id.config.ConfigurationException;
 import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProviderFactory;
 import at.gv.egovernment.moa.id.config.auth.OAAuthParameter;
@@ -87,13 +85,18 @@ public class DispatcherServlet extends AuthServlet{
 			MOAIDAuthInitializer.initialize();
 			Logger.info(MOAIDMessageProvider.getInstance().getMessage(
 					"init.00", null));
+		
+			Logger.info("Dispatcher Servlet initialization finished.");
+			
 		} catch (Exception ex) {
 			Logger.fatal(
 					MOAIDMessageProvider.getInstance().getMessage("init.02",
 							null), ex);
-			throw new ServletException(ex);
+			
+			//throw new ServletException(ex);
+			
 		}
-		Logger.info("Dispatcher Servlet initialization finished.");
+		
 	}
 
 	protected void processRequest(HttpServletRequest req,