switch to Spring based application initializer

2 files changed, 48 insertions, 40 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/AuthConfigurationProviderFactory.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/AuthConfigurationProviderFactory.java
index 9812f346d..a00d3d313 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/AuthConfigurationProviderFactory.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/AuthConfigurationProviderFactory.java
@@ -22,12 +22,9 @@
  */
 package at.gv.egovernment.moa.id.config.auth;
 
-import java.net.URI;
-import java.net.URISyntaxException;
+import org.springframework.context.ApplicationContext;
 
-import at.gv.egovernment.moa.id.auth.MOAIDAuthConstants;
 import at.gv.egovernment.moa.id.config.ConfigurationException;
-import at.gv.egovernment.moa.id.config.ConfigurationProvider;
 import at.gv.egovernment.moa.logging.Logger;
 
 /**
@@ -44,7 +41,8 @@ public class AuthConfigurationProviderFactory {
 			    throws ConfigurationException {
 
 			    if (instance == null) {
-			      reload();
+			    	Logger.fatal("MOA-ID-Auth Configuration is not initialized!!!!!");
+			    	
 			    }
 			    return instance;
 			  }
@@ -53,22 +51,9 @@ public class AuthConfigurationProviderFactory {
 	 * @return
 	 * @throws ConfigurationException 
 	 */
-	public static AuthConfiguration reload() throws ConfigurationException {
-	    String fileName = System.getProperty(ConfigurationProvider.CONFIG_PROPERTY_NAME);	    
-	    if (fileName == null) {
-	      throw new ConfigurationException("config.01", null);
-	    }
-	    Logger.info("Loading MOA-ID-AUTH configuration " + fileName);
-	    
-	    try {
-	    	URI fileURI = new URI(fileName);	    
-	    	instance = new PropertyBasedAuthConfigurationProvider(fileURI);
-	    	
-	    } catch (URISyntaxException e){
-	    	Logger.error("MOA-ID-Auth configuration file does not starts with file:/ as prefix.", e);
-	    	throw new ConfigurationException("config24", new Object[]{MOAIDAuthConstants.FILE_URI_PREFIX, fileName});
-	    	
-	    }
+	public static AuthConfiguration reload(ApplicationContext springContext) throws ConfigurationException {
+	    instance = springContext.getBean("moaidauthconfig", AuthConfiguration.class);	    	
 	    return instance;
+	    
 	}
 }
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 18926046c..d78b9b2ce 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
@@ -6,6 +6,7 @@ import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URI;
+import java.net.URISyntaxException;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -17,9 +18,6 @@ import java.util.Map;
 import java.util.Properties;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.config.AutowireCapableBeanFactory;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
 
 import at.gv.egovernment.moa.id.auth.MOAIDAuthConstants;
 import at.gv.egovernment.moa.id.commons.MOAIDConstants;
@@ -32,6 +30,7 @@ import at.gv.egovernment.moa.id.commons.db.dao.config.deprecated.SecurityLayer;
 import at.gv.egovernment.moa.id.commons.db.dao.config.deprecated.VerifyIdentityLink;
 import at.gv.egovernment.moa.id.commons.utils.KeyValueUtils;
 import at.gv.egovernment.moa.id.config.ConfigurationException;
+import at.gv.egovernment.moa.id.config.ConfigurationProvider;
 import at.gv.egovernment.moa.id.config.ConfigurationProviderImpl;
 import at.gv.egovernment.moa.id.config.ConfigurationUtils;
 import at.gv.egovernment.moa.id.config.ConnectionParameter;
@@ -54,21 +53,44 @@ public class PropertyBasedAuthConfigurationProvider extends ConfigurationProvide
 
 	private MOAIDConfiguration configuration;
 	private final Properties properties = new Properties();
-	private ApplicationContext context = null;
 	
 	private boolean requireJDBCBackupImplementation = false;
 	
-	public PropertyBasedAuthConfigurationProvider() {
+	public PropertyBasedAuthConfigurationProvider(String configFileName) throws ConfigurationException {	    
+	    if (configFileName == null) {
+	    	configFileName = System.getProperty(ConfigurationProvider.CONFIG_PROPERTY_NAME);
+	    	
+	    	if (MiscUtil.isEmpty(configFileName))	    	
+	    		throw new ConfigurationException("config.01", null);
+	    }
+	    
+	    Logger.info("Loading MOA-ID-AUTH configuration " + configFileName);
+	    
+	    try {
+	    	URI fileURI = new URI(configFileName);	    	
+	    	//instance = new PropertyBasedAuthConfigurationProvider(fileURI);
+	    	initialize(fileURI);
+	    	
+	    } catch (URISyntaxException e){
+	    	Logger.error("MOA-ID-Auth configuration file does not starts with file:/ as prefix.", e);
+	    	throw new ConfigurationException("config24", new Object[]{MOAIDAuthConstants.FILE_URI_PREFIX, configFileName});
+	    	
+	    }
 		
 	}
 
-	/**
-	 * The constructor with path to a properties file as argument.
-	 *
-	 * @param fileName the path to the properties file
-	 * @throws ConfigurationException if an error occurs during loading the properties file.
-	 */
-	public PropertyBasedAuthConfigurationProvider(URI fileName) throws ConfigurationException {
+//	/**
+//	 * The constructor with path to a properties file as argument.
+//	 *
+//	 * @param fileName the path to the properties file
+//	 * @throws ConfigurationException if an error occurs during loading the properties file.
+//	 */
+//	public PropertyBasedAuthConfigurationProvider(URI fileName) throws ConfigurationException {
+//		initialize(fileName);
+//		
+//	}
+
+	private void initialize(URI fileName) throws ConfigurationException {
 		File propertiesFile = new File(fileName);
 		rootConfigFileDir = propertiesFile.getParent();
 		try {
@@ -87,12 +109,12 @@ public class PropertyBasedAuthConfigurationProvider extends ConfigurationProvide
 			
 //			JPAPropertiesWithJavaConfig.setLocalProperties(configProp);		
 //			System.getProperties().setProperty("location", "file:" + fileName);
-			context = new ClassPathXmlApplicationContext(
-					new String[] {  "moaid.configuration.beans.xml",
-									"configuration.beans.xml"
-									});
-			AutowireCapableBeanFactory acbFactory = context.getAutowireCapableBeanFactory();
-			acbFactory.autowireBean(this);
+//			context = new ClassPathXmlApplicationContext(
+//					new String[] {  "moaid.configuration.beans.xml",
+//									"configuration.beans.xml"
+//									});
+//			AutowireCapableBeanFactory acbFactory = context.getAutowireCapableBeanFactory();
+//			acbFactory.autowireBean(this);
 			
 			//Some databases do not allow the selection of a lob in SQL where expression  
 			String dbDriver = properties.getProperty("configuration.hibernate.connection.driver_class");					
@@ -133,8 +155,9 @@ public class PropertyBasedAuthConfigurationProvider extends ConfigurationProvide
 					
 				}			
 		}
+		
 	}
-
+	
 	/**
 	 * Set the {@link Configuration} for this class.
 	 * @param configuration the configuration