create DB Config and legacy config parser

Split MOASession database from config database

6 files changed, 273 insertions, 46 deletions

diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/ConfigurationDBUtils.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/ConfigurationDBUtils.java
new file mode 100644
index 000000000..183fcda65
--- /dev/null
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/ConfigurationDBUtils.java
@@ -0,0 +1,42 @@
+package at.gv.egovernment.moa.id.commons.db;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.persistence.EntityManager;
+
+import at.gv.egovernment.moa.id.commons.db.dao.config.OnlineApplication;
+
+import at.gv.egovernment.moa.logging.Logger;
+import at.gv.egovernment.moa.util.MiscUtil;
+
+public class ConfigurationDBUtils {
+
+      private static Map<String, String> QUERIES = new HashMap<String, String>();    	
+      static {
+    	  QUERIES.put("getOnlineApplicationWithID", "select onlineapplication from OnlineApplication onlineapplication where onlineapplication.publicURLPrefix LIKE :id");
+      }
+      
+	  @SuppressWarnings("rawtypes")
+	  public static OnlineApplication getOnlineApplication(String id) {
+	  	MiscUtil.assertNotNull(id, "OnlineApplictionID");
+		Logger.trace("Getting OnlineApplication with ID " + id + " from database.");
+		
+		List result;
+	  	EntityManager session = ConfigurationUtil.getCurrentSession();
+	
+	  	javax.persistence.Query query = session.createQuery(QUERIES.get("getOnlineApplicationWithID"));  	
+		query.setParameter("id", id+"%");
+		result = query.getResultList();
+	  	
+	    Logger.trace("Found entries: " + result.size());
+	    
+	    if (result.size() == 0) {
+	    	Logger.trace("No entries found.");
+	    	return null;
+	    }
+	    return (OnlineApplication) result.get(0);
+	  }
+	
+}
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/ConfigurationUtil.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/ConfigurationUtil.java
new file mode 100644
index 000000000..695bf4028
--- /dev/null
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/ConfigurationUtil.java
@@ -0,0 +1,201 @@
+package at.gv.egovernment.moa.id.commons.db;
+
+import java.util.Properties;
+
+import javax.persistence.EntityManager;
+import javax.persistence.EntityManagerFactory;
+import javax.persistence.EntityTransaction;
+import javax.persistence.Persistence;
+
+import org.hibernate.HibernateException;
+import org.hibernate.Session;
+
+import at.gv.egovernment.moa.id.commons.db.ex.MOADatabaseException;
+import at.gv.egovernment.moa.logging.Logger;
+
+public final class ConfigurationUtil {
+
+   private static EntityManagerFactory entitymanagerfactory;
+   
+   @SuppressWarnings("rawtypes")
+   private static final ThreadLocal THREAD_LOCAL = new ThreadLocal();
+   private static boolean automaticSessionHandling = false;
+   
+   protected ConfigurationUtil() { }
+   	      
+   public static void initHibernate(Properties props) { 
+	   	    
+	    try {
+	    	
+	    	//add Hibernate annotations
+//			Configuration hibernateConfig = new Configuration();
+//		    hibernateConfig.addAnnotatedClass(AssertionStore.class);
+//		    hibernateConfig.addAnnotatedClass(AuthenticatedSessionStore.class);
+//		    hibernateConfig.addAnnotatedClass(OASessionStore.class);
+//		    hibernateConfig.addAnnotatedClass(OldSSOSessionIDStore.class);
+//		    hibernateConfig.addProperties(props);
+
+		    
+		    Logger.debug("Creating initial session factory...");
+//			entitymanagerfactory = 
+//					Persistence.createEntityManagerFactory("at.gv.egovernment.moa.id.commons.db.dao.config", 
+//							hibernateConfig.getProperties());
+		    
+			entitymanagerfactory = 
+					Persistence.createEntityManagerFactory("at.gv.egovernment.moa.id.commons.db.dao.config", 
+							props);
+
+		    Logger.debug("Initial session factory successfully created.");
+		    
+		    
+	    } catch (Throwable ex) {
+	    	Logger.error("Initial session factory creation failed: " + ex.getMessage());
+	        throw new ExceptionInInitializerError(ex);
+	     }
+   }
+   
+   
+   /**
+    * Checks if a session factory is currently available. If necessary a new
+    * session factory is created.
+    * 
+    * @return current (or new) session factory
+    * @throws HibernateException
+    *            thrown if a hibernate error occurs
+    */
+   public static EntityManager getCurrentSession() {
+      if (automaticSessionHandling) {
+    	  
+    	  return entitymanagerfactory.createEntityManager();
+      }
+      
+      EntityManager session = (EntityManager) THREAD_LOCAL.get();
+      // Open a new Session, if this Thread has none yet
+      if (session == null) {
+         session = getNewSession();
+      }
+      return session;
+   }
+
+   @SuppressWarnings("unchecked")
+  public static EntityManager getNewSession() {
+      if (automaticSessionHandling) {
+    	  Logger.warn("Session is being automatically handled by hibernate. Therefore this session maybe not being newly created. Use HibernateUtil.getCurrentSession() instead.");
+         //return sessionFactory.getCurrentSession();
+    	  return entitymanagerfactory.createEntityManager();
+      }
+      EntityManager session = (EntityManager) THREAD_LOCAL.get();
+      if (session != null) {
+    	  Logger.warn("Previous session has not been closed; closing session now.");
+         closeSession();
+      }
+      Logger.debug("Opening new hibernate session...");
+      try {
+         session = entitymanagerfactory.createEntityManager();
+         THREAD_LOCAL.set(session);
+      } catch (HibernateException hex) {
+    	  Logger.error(hex.getMessage());
+      }
+      return session;
+   }
+
+   /**
+    * Closes the current session.
+    * 
+    * @throws HibernateException
+    *            thrown if session is already closed or a hibernate error
+    *            occurs.
+    */
+   @SuppressWarnings("unchecked")
+  public static void closeSession() {
+      if (automaticSessionHandling) {
+    	  Logger.warn("Session is being automatically handled by hibernate. Therefore the current session cannot be closed on demand.");
+         return;
+      }
+      Logger.debug("Closing current hibernate session...");
+      Session session = (Session) THREAD_LOCAL.get();
+      THREAD_LOCAL.set(null);
+      if (session != null) {
+         try {
+            session.close();
+            
+         } catch (HibernateException hex) {
+            Logger.error(hex.getMessage());
+         }
+      }
+   }
+   
+   public static boolean save(Object dbo) throws MOADatabaseException {
+	   EntityTransaction tx = null;
+	   
+	  	 try {
+		  	 EntityManager session = ConfigurationUtil.getCurrentSession();
+		  	 tx = session.getTransaction();
+		
+		  	synchronized (session) {
+		  		tx.begin();
+	  			session.persist(dbo);
+		  		tx.commit();
+		  		
+		  		session.clear();
+		  	}
+		     return true;
+		     
+	  	 } catch(HibernateException e) {
+	  		Logger.warn("Error during database saveOrUpdate. Rollback.", e);
+	  		tx.rollback();
+	  		 throw new MOADatabaseException(e);
+	  	 }
+	   }
+   
+   
+   public static boolean saveOrUpdate(Object dbo) throws MOADatabaseException {
+	   EntityTransaction tx = null;
+	   
+	  	 try {
+		  	 EntityManager session = ConfigurationUtil.getCurrentSession();
+		  	 tx = session.getTransaction();
+		
+		  	synchronized (session) {
+		  		tx.begin();
+		  		
+		  		session.merge(dbo);
+		  		session.flush();
+		  			
+		  		tx.commit();
+		  		
+		  		session.clear();
+		  	}
+		     return true;
+		     
+	  	 } catch(HibernateException e) {
+	  		Logger.warn("Error during database saveOrUpdate. Rollback.", e);
+	  		tx.rollback();
+	  		 throw new MOADatabaseException(e);
+	  	 }
+	   }
+	   
+	   public static boolean delete(Object dbo) {
+		   EntityTransaction tx = null;
+	  	 try {
+	  		EntityManager session = ConfigurationUtil.getCurrentSession();
+	  		tx = session.getTransaction();
+	  		
+		  	 synchronized (session) {
+		  		tx.begin();
+			    session.remove(session.contains(dbo) ? dbo : session.merge(dbo));
+			    tx.commit();
+			    
+			    session.clear();
+			}
+		     
+		     return true;
+		     
+	  	 } catch(HibernateException e) {
+	  		Logger.warn("Error during database delete. Rollback.", e);
+	  		 tx.rollback();
+	  		 return false;
+	  	 }
+	   }
+   
+}
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/DBUtils.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/DBUtils.java
deleted file mode 100644
index d60c5ef45..000000000
--- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/DBUtils.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package at.gv.egovernment.moa.id.commons.db;
-
-import java.util.List;
-
-import org.hibernate.Query;
-import org.hibernate.Session;
-
-import at.gv.egovernment.moa.id.commons.db.dao.session.AssertionStore;
-import at.gv.egovernment.moa.logging.Logger;
-import at.gv.egovernment.moa.util.MiscUtil;
-
-public class DBUtils {
-	
-//	  @SuppressWarnings("rawtypes")
-//	  public static AssertionStore getAssertion(String artifact) {
-//	  	MiscUtil.assertNotNull(artifact, "artifact");
-//		Logger.trace("Getting Assertion with Artifact " + artifact + " from database.");
-//		
-//	  	Session session = HibernateUtil.getCurrentSession();
-//	    session.beginTransaction();
-//	    Query query = session.getNamedQuery("getAssertionWithArtifact");
-//	    query.setString("artifact", artifact);
-//	    List result = query.list();
-//	    Logger.trace("Found entries: " + result.size());
-//	    
-//	    if (result.size() == 0) {
-//	    	Logger.trace("No entries found.");
-//	    	return null;
-//	    }
-//	    return (AssertionStore) result.get(0);
-//	  }
-	
-}
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/HibernateUtil.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/MOASessionUtil.java
index 1fa5a20fd..ccc4e9589 100644
--- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/HibernateUtil.java
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/MOASessionUtil.java
@@ -11,10 +11,14 @@ import org.hibernate.cfg.Configuration;
 import org.hibernate.service.ServiceRegistry;
 import org.hibernate.service.ServiceRegistryBuilder;
 
+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.OASessionStore;
+import at.gv.egovernment.moa.id.commons.db.dao.session.OldSSOSessionIDStore;
 import at.gv.egovernment.moa.id.commons.db.ex.MOADatabaseException;
 import at.gv.egovernment.moa.logging.Logger;
 
-public final class HibernateUtil {
+public final class MOASessionUtil {
 
    private static SessionFactory sessionFactory;
    private static ServiceRegistry serviceRegistry;
@@ -28,7 +32,7 @@ public final class HibernateUtil {
 
    private static Configuration configuration;
    
-   protected HibernateUtil() { }
+   protected MOASessionUtil() { }
    	   
    public static void initHibernate(Configuration config, Properties hibernateProperties) {
 	     
@@ -45,7 +49,7 @@ public final class HibernateUtil {
      try {
        //Create the SessionFactory
        Logger.debug("Creating initial session factory...");
-       
+              
        config.configure();
        serviceRegistry = new ServiceRegistryBuilder().applySettings(config.getProperties()).buildServiceRegistry();
        sessionFactory = config.buildSessionFactory(serviceRegistry);
@@ -127,7 +131,7 @@ public final class HibernateUtil {
    public static boolean saveOrUpdate(Object dbo) throws MOADatabaseException {
 	  	 Transaction tx =  null;
 	  	 try {
-		  	 Session session = HibernateUtil.getCurrentSession();
+		  	 Session session = MOASessionUtil.getCurrentSession();
 		  	 
 		  	synchronized (session) {
 		  		tx = session.beginTransaction();
@@ -146,7 +150,7 @@ public final class HibernateUtil {
 	   public static boolean delete(Object dbo) {
 	  	 Transaction tx =  null;
 	  	 try {
-		  	 Session session = HibernateUtil.getCurrentSession();
+		  	 Session session = MOASessionUtil.getCurrentSession();
 		  	 
 		  	 synchronized (session) {
 		  		tx = session.beginTransaction();
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/session/AssertionStore.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/session/AssertionStore.java
index a0898efc1..50c156c4e 100644
--- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/session/AssertionStore.java
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/session/AssertionStore.java
@@ -5,13 +5,16 @@ import java.util.Date;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.Lob;
+import javax.persistence.NamedQueries;
+import javax.persistence.NamedQuery;
 import javax.persistence.Table;
 
 import org.hibernate.annotations.DynamicUpdate;
-import org.hibernate.annotations.NamedQueries;
-import org.hibernate.annotations.NamedQuery;
+
 
 
 @Entity
@@ -27,6 +30,10 @@ public class AssertionStore implements Serializable{
 	private static final long serialVersionUID = 1L;
 
 	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	@Column(name = "id", unique=true, nullable=false)
+	private long id;
+	
 	@Column(name = "artifact", unique=true, nullable=false)
 	private String artifact;
 	
@@ -72,6 +79,14 @@ public class AssertionStore implements Serializable{
 	public void setDatatime(Date datatime) {
 		this.timestamp = datatime;
 	}
+
+	public long getId() {
+		return id;
+	}
+
+	public void setId(long id) {
+		this.id = id;
+	}
 	
 	
 }
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/session/AuthenticatedSessionStore.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/session/AuthenticatedSessionStore.java
index 4ed42175e..98c2d7461 100644
--- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/session/AuthenticatedSessionStore.java
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/session/AuthenticatedSessionStore.java
@@ -4,7 +4,6 @@ import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-import java.util.Set;
 
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
@@ -12,7 +11,6 @@ import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
-import javax.persistence.JoinColumn;
 import javax.persistence.Lob;
 import javax.persistence.OneToMany;
 import javax.persistence.PrePersist;
@@ -20,11 +18,11 @@ import javax.persistence.PreUpdate;
 import javax.persistence.Table;
 import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
+import javax.persistence.NamedQueries;
+import javax.persistence.NamedQuery;
 
 import org.hibernate.annotations.DynamicUpdate;
-import org.hibernate.annotations.IndexColumn;
-import org.hibernate.annotations.NamedQueries;
-import org.hibernate.annotations.NamedQuery;
+
 
 @Entity
 @DynamicUpdate(value=true)
@@ -40,7 +38,7 @@ public class AuthenticatedSessionStore implements Serializable{
 	private static final long serialVersionUID = 1L;
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "id", unique=true, nullable=false)
 	private long id;