diff -r 6fceb66e1ad7 -r 2fdc9cc89502 org/sonews/util/DatabaseSetup.java --- a/org/sonews/util/DatabaseSetup.java Fri Jun 26 16:48:50 2009 +0200 +++ b/org/sonews/util/DatabaseSetup.java Wed Jul 22 14:04:05 2009 +0200 @@ -25,7 +25,7 @@ import java.sql.Statement; import java.util.HashMap; import java.util.Map; -import org.sonews.daemon.BootstrapConfig; +import org.sonews.config.Config; import org.sonews.util.io.Resource; /** @@ -108,7 +108,9 @@ for(String chunk : tmplChunks) { if(chunk.trim().equals("")) + { continue; + } Statement stmt = conn.createStatement(); stmt.execute(chunk); @@ -117,12 +119,7 @@ conn.commit(); conn.setAutoCommit(true); - BootstrapConfig config = BootstrapConfig.getInstance(); - config.set(BootstrapConfig.STORAGE_DATABASE, url); - config.set(BootstrapConfig.STORAGE_DBMSDRIVER, driverMap.get(dbmsType)); - config.set(BootstrapConfig.STORAGE_PASSWORD, dbPassword); - config.set(BootstrapConfig.STORAGE_USER, dbUser); - config.save(); + // Create config file System.out.println("Ok"); }