--- dao/FuldDaekningWorker/src/dk/daoas/fulddaekning/Lookup.java 2014/05/07 07:59:03 2151 +++ dao/FuldDaekningWorker/src/dk/daoas/fulddaekning/Lookup.java 2014/05/07 08:10:45 2152 @@ -2,10 +2,6 @@ import java.io.File; import java.io.FileReader; -import java.io.IOException; -import java.sql.Connection; -import java.sql.DriverManager; -import java.sql.SQLException; import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -148,8 +144,7 @@ verbose = Boolean.parseBoolean( conf.getProperty("VERBOSE") ); logger.info("Starting with VERBOSE:" + verbose); - Connection conn = getConnection(); - Database db = new Database(conn); + Database db = new Database(conf); db.resetResultTable(); @@ -175,28 +170,5 @@ //Lookup lookup = new Lookup(7400, db); //lookup.doLookup(); } - - public static Connection getConnection() throws SQLException, IOException { - - String db_host = conf.getProperty("DB_HOST"); - String db_user = conf.getProperty("DB_USER"); - String db_pass = conf.getProperty("DB_PASS"); - - - - Connection conn = null; - Properties connectionProps = new Properties(); - connectionProps.put("user", db_user); - connectionProps.put("password", db_pass); - - conn = DriverManager.getConnection( - "jdbc:mysql://" + - db_host + - ":3306/", - connectionProps); - logger.info("Connected to database"); - return conn; - } - }