1 files changed, 45 insertions, 0 deletions
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/AuthConfigurationProvider.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/AuthConfigurationProvider.java
index b86b2ec68..b21bfdacb 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/AuthConfigurationProvider.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/AuthConfigurationProvider.java
@@ -27,16 +27,23 @@ package at.gv.egovernment.moa.id.config.auth;
 import java.io.BufferedInputStream;
 import java.io.File;
 import java.io.FileInputStream;
+import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.MalformedURLException;
 import java.util.List;
+import java.util.Properties;
 
+import org.hibernate.cfg.Configuration;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 
+import test.tlenz.simpletest;
+
 import eu.stork.vidp.messages.common.STORKBootstrap;
 
+import at.gv.egovernment.moa.id.commons.db.HibernateUtil;
+import at.gv.egovernment.moa.id.commons.db.dao.AssertionStore;
 import at.gv.egovernment.moa.id.config.ConfigurationBuilder;
 import at.gv.egovernment.moa.id.config.ConfigurationException;
 import at.gv.egovernment.moa.id.config.ConfigurationProvider;
@@ -45,6 +52,7 @@ import at.gv.egovernment.moa.id.config.stork.STORKConfig;
 import at.gv.egovernment.moa.logging.Logger;
 import at.gv.egovernment.moa.util.DOMUtils;
 import at.gv.egovernment.moa.util.FileUtils;
+import at.gv.egovernment.moa.util.MiscUtil;
 import at.gv.egovernment.moa.util.StringUtils;
 import at.gv.egovernment.moa.util.XPathUtils;
 
@@ -278,11 +286,48 @@ public class AuthConfigurationProvider extends ConfigurationProvider {
 				throw new ConfigurationException("config.03", null, t);
 		  }
 
+			
+		//Initial Hibernate Framework
+		//TODO: Full update to new MOA-ID configuration!!! 	
+		Logger.trace("Initializing Hibernate framework.");
+		
+		String propertiesFileLocation = System.getProperty("moa.id.config");
+		MiscUtil.assertNotNull(propertiesFileLocation, "propertiesFileName");
+		File propertiesFile = new File(propertiesFileLocation);
+		FileInputStream fis;
+		Properties props = new Properties();
+		try {
+			fis = new FileInputStream(propertiesFile);
+			props.load(fis);
+			
+			
+			// initialize hibernate
+			synchronized (AuthConfigurationProvider.class) {
+				Configuration hibernateConfig = new Configuration();
+			    hibernateConfig.addAnnotatedClass(AssertionStore.class);
+			    hibernateConfig.addProperties(props);
+			    HibernateUtil.initHibernate(hibernateConfig, props);
+			  }
+			Logger.trace("Hibernate initialization finished.");
+			
+		} catch (FileNotFoundException e) {
+			throw new ConfigurationException("config.03", null, e);
+			
+		} catch (IOException e) {
+			throw new ConfigurationException("config.03", null, e);
+			
+		} catch (ExceptionInInitializerError e) {
+			throw new  ConfigurationException("config.17", null, e);
+		}
+		
+				
 		//Initialize OpenSAML for STORK
 		Logger.trace("Starting initialization of OpenSAML...");
 		STORKBootstrap.bootstrap();
 		Logger.debug("OpenSAML successfully initialized");
 			
+		
+		
         // build the internal datastructures
     	builder = new ConfigurationBuilder(configElem, rootConfigFileDir);
     	bKUConnectionParameter = builder.buildAuthBKUConnectionParameter();