1 files changed, 55 insertions, 53 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/ConfigurationProviderImpl.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/ConfigurationProviderImpl.java
index 5c2f86732..2b5459208 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/ConfigurationProviderImpl.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/ConfigurationProviderImpl.java
@@ -46,22 +46,13 @@
 
 package at.gv.egovernment.moa.id.config;
 
+import java.util.ArrayList;
 import java.util.Map;
 import java.util.Properties;
 
-import org.hibernate.cfg.Configuration;
-
 import at.gv.egovernment.moa.id.commons.api.ConfigurationProvider;
 import at.gv.egovernment.moa.id.commons.api.exceptions.ConfigurationException;
-import at.gv.egovernment.moa.id.commons.db.MOASessionDBUtils;
-import at.gv.egovernment.moa.id.commons.db.StatisticLogDBUtils;
-import at.gv.egovernment.moa.id.commons.db.dao.session.AssertionStore;
-import at.gv.egovernment.moa.id.commons.db.dao.session.AuthenticatedSessionStore;
-import at.gv.egovernment.moa.id.commons.db.dao.session.InterfederationSessionStore;
-import at.gv.egovernment.moa.id.commons.db.dao.session.OASessionStore;
-import at.gv.egovernment.moa.id.commons.db.dao.session.OldSSOSessionIDStore;
-import at.gv.egovernment.moa.id.commons.db.dao.statistic.StatisticLog;
-import at.gv.egovernment.moa.id.data.IssuerAndSerial;
+import at.gv.egovernment.moa.id.commons.config.SpringProfileConstants;
 import at.gv.egovernment.moa.id.protocols.pvp2x.config.MOADefaultBootstrap;
 import at.gv.egovernment.moa.logging.Logger;
 import at.gv.util.config.EgovUtilPropertiesConfiguration;
@@ -123,25 +114,12 @@ public abstract class ConfigurationProviderImpl implements ConfigurationProvider
   /** The default chaining mode. */
   protected String defaultChainingMode = "pkix";
 
-  /** 
-     * A <code>Map</code> which contains the <code>IssuerAndSerial</code> to
-     * chaining mode (a <code>String</code>) mapping.
-     */
-  protected Map<IssuerAndSerial, String> chainingModes;
-
-  /**
-     * the URL for the trusted CA Certificates
-     */
-  protected String trustedCACertificates;
-
 	/**
 	 * main configuration file directory name used to configure MOA-ID 
 	 */
 	protected String rootConfigFileDir;
 
-	protected String certstoreDirectory;
 	
-	protected boolean trustmanagerrevoationchecking = true;
 	
 	protected Properties configProp = null;
 	
@@ -185,6 +163,10 @@ public abstract class ConfigurationProviderImpl implements ConfigurationProvider
 			      		String propertyName = key.toString().substring(propPrefix.length());
 			      		moaSessionProp.put(propertyName, props.get(key.toString()));
 			      	}
+			      	if (key.toString().startsWith(propPrefix+"dbcp")) {
+			      		String propertyName = "hibernate."+(key.toString().substring(propPrefix.length()));
+			      		moaSessionProp.put(propertyName, props.get(key.toString()));
+			      	}
 			      }
 			      
 			      // read Config Hibernate properties
@@ -207,35 +189,35 @@ public abstract class ConfigurationProviderImpl implements ConfigurationProvider
 				     }
 				  }
 			     			
-				// initialize hibernate
-				synchronized (ConfigurationProviderImpl.class) {
-					
-					//Initial config Database
-				//	ConfigurationDBUtils.initHibernate(configProp);
-			   		
-					//initial MOAID Session Database
-					Configuration config = new Configuration();
-					config.addAnnotatedClass(AssertionStore.class);
-					config.addAnnotatedClass(AuthenticatedSessionStore.class);
-					config.addAnnotatedClass(OASessionStore.class);
-					config.addAnnotatedClass(OldSSOSessionIDStore.class);
-					config.addAnnotatedClass(InterfederationSessionStore.class);
-					//config.addAnnotatedClass(ProcessInstanceStore.class);
-					config.addProperties(moaSessionProp);
-					MOASessionDBUtils.initHibernate(config, moaSessionProp);
-					
-					//initial advanced logging
-					if (Boolean.valueOf(props.getProperty("configuration.advancedlogging.active", "false"))) {
-						Logger.info("Advanced statistic log is activated, starting initialization process ...");
-						Configuration statisticconfig = new Configuration();
-						statisticconfig.addAnnotatedClass(StatisticLog.class);
-						statisticconfig.addProperties(statisticProps);
-						StatisticLogDBUtils.initHibernate(statisticconfig, statisticProps);
-						Logger.info("Advanced statistic log is initialized.");
-					}
-					
-				  }
-				Logger.trace("Hibernate initialization finished.");
+//				// initialize hibernate
+//				synchronized (ConfigurationProviderImpl.class) {
+//					
+//					//Initial config Database
+//				//	ConfigurationDBUtils.initHibernate(configProp);
+//			   		
+//					//initial MOAID Session Database
+//					Configuration config = new Configuration();
+//					config.addAnnotatedClass(AssertionStore.class);
+//					config.addAnnotatedClass(AuthenticatedSessionStore.class);
+//					config.addAnnotatedClass(OASessionStore.class);
+//					config.addAnnotatedClass(OldSSOSessionIDStore.class);
+//					config.addAnnotatedClass(InterfederationSessionStore.class);
+//					//config.addAnnotatedClass(ProcessInstanceStore.class);
+//					config.addProperties(moaSessionProp);
+//					//MOASessionDBUtils.initHibernate(config, moaSessionProp);
+//					
+//					//initial advanced logging
+////					if (Boolean.valueOf(props.getProperty("configuration.advancedlogging.active", "false"))) {
+////						Logger.info("Advanced statistic log is activated, starting initialization process ...");
+////						Configuration statisticconfig = new Configuration();
+////						statisticconfig.addAnnotatedClass(StatisticLog.class);
+////						statisticconfig.addProperties(statisticProps);
+////						StatisticLogDBUtils.initHibernate(statisticconfig, statisticProps);
+////						Logger.info("Advanced statistic log is initialized.");
+////					}
+//					
+//				  }
+//				Logger.trace("Hibernate initialization finished.");
 				
 			} catch (ExceptionInInitializerError e) {
 				throw new  ConfigurationException("config.17", null, e);
@@ -267,6 +249,7 @@ public abstract class ConfigurationProviderImpl implements ConfigurationProvider
 				eGovUtilsConfig = 
 						new EgovUtilPropertiesConfiguration(eGovUtilsConfigProp, rootConfigFileDir);
 			}
+			this.generateActiveProfiles(props);
 	
   }
 
@@ -277,5 +260,24 @@ public abstract class ConfigurationProviderImpl implements ConfigurationProvider
 	public EgovUtilPropertiesConfiguration geteGovUtilsConfig() {
 		return eGovUtilsConfig;
 	}
+	
+	private ArrayList<String> activeProfiles = new ArrayList<String>();
+	
+	public void generateActiveProfiles(Properties props){
+		if (Boolean.valueOf(props.getProperty("configuration.advancedlogging.active", "false"))) {
+			activeProfiles.add(SpringProfileConstants.ADVANCED_LOG);
+		}else{
+			activeProfiles.add("advancedLogOff");
+		}
+		if (Boolean.valueOf(props.getProperty("redis.active", "false"))) {
+			activeProfiles.add(SpringProfileConstants.REDIS_BACKEND);
+		}else{
+			activeProfiles.add(SpringProfileConstants.DB_BACKEND);
+		}
+	}
+	
+	public String[] getActiveProfiles(){
+		return activeProfiles.toArray(new String[0]);
+	}
   
 }