Merge branch 'jz/lcn-demo' into jz/master

src/de/tud/kom/p2psim/impl/util/db/dao/DAO.java

@@ -21,23 +21,13 @@
 package de.tud.kom.p2psim.impl.util.db.dao;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.LinkedList;
-import java.util.Map;
-import java.util.Properties;
-
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.Persistence;
-
 import org.hibernate.HibernateException;
 import org.hibernate.Session;
 import org.hibernate.SessionFactory;
 import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
 import org.hibernate.cfg.Configuration;
 import org.hibernate.service.ServiceRegistry;
-import org.omg.CORBA.CustomMarshal;
-
 import de.tud.kom.p2psim.impl.util.db.metric.CustomMeasurement;
 import de.tud.kom.p2psim.impl.util.db.metric.Experiment;
 import de.tud.kom.p2psim.impl.util.db.metric.GroupMetric;