1.1 --- a/org/sonews/util/DatabaseSetup.java Fri Jun 26 16:48:50 2009 +0200
1.2 +++ b/org/sonews/util/DatabaseSetup.java Thu Aug 20 21:31:03 2009 +0200
1.3 @@ -25,7 +25,7 @@
1.4 import java.sql.Statement;
1.5 import java.util.HashMap;
1.6 import java.util.Map;
1.7 -import org.sonews.daemon.BootstrapConfig;
1.8 +import org.sonews.config.Config;
1.9 import org.sonews.util.io.Resource;
1.10
1.11 /**
1.12 @@ -108,7 +108,9 @@
1.13 for(String chunk : tmplChunks)
1.14 {
1.15 if(chunk.trim().equals(""))
1.16 + {
1.17 continue;
1.18 + }
1.19
1.20 Statement stmt = conn.createStatement();
1.21 stmt.execute(chunk);
1.22 @@ -117,12 +119,7 @@
1.23 conn.commit();
1.24 conn.setAutoCommit(true);
1.25
1.26 - BootstrapConfig config = BootstrapConfig.getInstance();
1.27 - config.set(BootstrapConfig.STORAGE_DATABASE, url);
1.28 - config.set(BootstrapConfig.STORAGE_DBMSDRIVER, driverMap.get(dbmsType));
1.29 - config.set(BootstrapConfig.STORAGE_PASSWORD, dbPassword);
1.30 - config.set(BootstrapConfig.STORAGE_USER, dbUser);
1.31 - config.save();
1.32 + // Create config file
1.33
1.34 System.out.println("Ok");
1.35 }