checking in the constructor of NameServer for database connection and

table

Author: salimm

src/me/salimm/jrns/db/DBFactory.java

@@ -3,7 +3,6 @@
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.SQLException;
-import java.sql.Statement;
 
 import com.allConfig.conf.AbstractConfig;
 
@@ -75,20 +74,6 @@ public static Connection createSQLLiteConnection(String DB_URL, String USER, Str
 		Connection conn = null;
 		Class.forName(SQLLITE_CONN_DRIVER_CLASSPATH);
 		conn = DriverManager.getConnection(DB_URL, USER, PASS);
-
-		String sql1 = "CREATE TABLE IF NOT EXISTS SERVICE (SID integer, NAME text);";
-		// 0:in, 1: out
-		String sql2 = "CREATE TABLE IF NOT EXISTS SERVICE_IO (SID integer, CLSPATH text, TYPE integer);";
-		String sql3 = "CREATE TABLE IF NOT EXISTS SERVICE_PROVIDER (PID integer,SID integer, URL text, PORT integer);";
-
-		Statement stmt = conn.createStatement();
-
-		stmt.executeUpdate(sql1);
-		stmt.executeUpdate(sql2);
-		stmt.executeUpdate(sql3);
-
-		stmt.close();
-
 		return conn;
 	}
 
@@ -129,7 +114,7 @@ public static Connection getConnection(DBInfo dbInfo)
 		} else if (dbInfo.getType().equals(DBType.ORACLE)) {
 			return DBFactory.createOracleConnection(dbInfo.getDbUrl(), dbInfo.getDbUser(), dbInfo.getDbPass());
 		} else if (dbInfo.getType().equals(DBType.SQLLITE)) {
-			return DBFactory.createOracleConnection(dbInfo.getDbUrl(), dbInfo.getDbUser(), dbInfo.getDbPass());
+			return DBFactory.createSQLLiteConnection(dbInfo.getDbUrl(), dbInfo.getDbUser(), dbInfo.getDbPass());
 		}
 		return null;
 

src/me/salimm/jrns/server/NameServer.java

@@ -1,6 +1,8 @@
 package me.salimm.jrns.server;
 
+import java.sql.Connection;
 import java.sql.SQLException;
+import java.sql.Statement;
 
 import org.eclipse.jetty.server.Server;
 
@@ -31,6 +33,24 @@ public class NameServer implements Constants {
 	public NameServer(AbstractConfig conf) throws ClassNotFoundException, SQLException, DatabaseNotSupported {
 		this.conf = conf;
 		this.dbUtils = DBFactory.getDBUtils(conf);
+
+		// init database
+		Connection conn = DBFactory.getConnection(DBFactory.getDBInfo(conf));
+		String sql1 = "CREATE TABLE IF NOT EXISTS SERVICE (SID integer, NAME text);";
+		// 0:in, 1: out
+		String sql2 = "CREATE TABLE IF NOT EXISTS SERVICE_IO (SID integer, CLSPATH text, TYPE integer);";
+		String sql3 = "CREATE TABLE IF NOT EXISTS SERVICE_PROVIDER (PID integer,SID integer, URL text, PORT integer);";
+
+		Statement stmt = conn.createStatement();
+
+		stmt.executeUpdate(sql1);
+		stmt.executeUpdate(sql2);
+		stmt.executeUpdate(sql3);
+
+		stmt.close();
+		System.out.println("Finished checking if schema exists....");
+		
+
 	}
 
 	public void start() throws Exception {