cishell-svn Mailing List for Cyberinfrastructure Shell (CIShell) (Page 19)

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 853
          http://cishell.svn.sourceforge.net/cishell/?rev=853&view=rev
Author:   mwlinnem
Date:     2009-01-22 22:00:42 +0000 (Thu, 22 Jan 2009)

Log Message:
-----------
Complete and total disgusting hack in order to get everything to "work right". Will be changing this later for sure.

Modified Paths:
--------------
    trunk/core/org.cishell.reference.service.database/src/org/cishell/reference/service/database/DatabaseServiceImpl.java

Modified: trunk/core/org.cishell.reference.service.database/src/org/cishell/reference/service/database/DatabaseServiceImpl.java
===================================================================

--- trunk/core/org.cishell.reference.service.database/src/org/cishell/reference/service/database/DatabaseServiceImpl.java	2009-01-22 19:47:33 UTC (rev 852)
+++ trunk/core/org.cishell.reference.service.database/src/org/cishell/reference/service/database/DatabaseServiceImpl.java	2009-01-22 22:00:42 UTC (rev 853)
@@ -1,8 +1,15 @@
 package org.cishell.reference.service.database;
 
+import java.sql.Connection;
+import java.sql.DatabaseMetaData;
+import java.sql.DriverManager;
+import java.sql.ResultSet;
 import java.sql.SQLException;
+import java.sql.Statement;
 import java.util.Hashtable;
 
+import javax.sql.DataSource;
+
 import org.apache.commons.dbcp.ConnectionFactory;
 import org.apache.commons.dbcp.DriverManagerConnectionFactory;
 import org.apache.commons.dbcp.PoolableConnectionFactory;
@@ -15,9 +22,11 @@
 import org.cishell.service.database.DatabaseService;
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceReference;
 import org.osgi.framework.ServiceRegistration;
-import org.osgi.service.log.LogService;
 
+
+
 public class DatabaseServiceImpl implements DatabaseService, BundleActivator {
 	/* TODO: These variables should be abstracted out in a Preferences page at some
 	   point (I guess).
@@ -28,12 +37,7 @@
 	private static final String DEFAULT_CREATE_CONNECTION_STRING = ";create=true";
 	private static final String DEFAULT_DB_NAME = "ultra_sasquatch";
 	
-	// Give each db a unique (but meaningless) name by counting up from 0 for each
-	// new database.
-	/* TODO: Using a rolling counter like this may have bad implications later on,
-	   but it's decent for now.
-	 */
-	//Not used for now
+	//db name must be unique per running instance of the same NWB installation, otherwise they will overlap
 	private static int dbNameCounter = 0;
 	
 	private ServiceRegistration databaseServiceRegistration;
@@ -53,6 +57,17 @@
 		databaseServiceRegistration = context.registerService
 			(DatabaseService.class.getName(), this, new Hashtable());
 		
+		ServiceReference ref = context.getServiceReference(DatabaseService.class.getName());
+		if (ref == null) {
+			System.out.println("REEEEEEEEEEEEEEEEEEEEEEEFFFFFFF IS NUUUUUUUULLLLLLL!!@!(@!(!)!");
+		}
+		DatabaseService dbService = (DatabaseService) context.getService(ref);
+		if (dbService == null) {
+			System.out.println("DEEEBEESEERVICE IS NUUUUL!L!@L!@!@!@@!@!@L..1");
+		} else {
+			
+		}
+		
 		// Get MY data source!  It's mine, and you can't have it!
 		try {
 			myDataSource = createDatabase();
@@ -63,13 +78,43 @@
 		}
 		
 		System.err.println("meep?");
+		cleanOutDatabaseTables();
 	}
+	
+	private void cleanOutDatabaseTables() throws Exception {
+		//TODO: We need to be cleaning up and starting the DB correctly
+		//TODO: Clean this up
+		   DataSource ds = getDataSource();
+		   Connection c = ds.getConnection();
+		   DatabaseMetaData dmd = c.getMetaData();
+		   ResultSet tableNames = dmd.getTables(null, null, null, null);
+		   while (tableNames.next()) {
+			   for (int ii = 1; ii <= tableNames.getMetaData().getColumnCount(); ii++) {
+				   String tableContents = tableNames.getString(ii);
+				   System.out.print(tableContents + ", ");
+			   }
+			   if (tableNames.getString(2).indexOf("APP") != -1) {
+				   System.out.println("MAGOOT!");
+				   Statement s = c.createStatement();
+				   System.out.println(tableNames.getString(3));
+				   System.out.println(s.executeUpdate("DROP TABLE APP." + tableNames.getString(3)));
+				   
+			   }
+			   System.out.println("");
+		   }
+	}
 
 	public void stop(BundleContext context) throws Exception {
+		   cleanOutDatabaseTables();
+		   try {
+	       DriverManager.getConnection("jdbc:derby:;shutdown=true");
+		   } catch (Exception e) {
+			   
+		   }
 	}
 	
 	// If one hasn't been created yet, create a connection pool and return it.
-	private PoolingDataSource getConnectionPool() throws DatabaseCreationException
+	private PoolingDataSource getDataSource() throws DatabaseCreationException
 	{
 		if (poolingDataSource != null)
 			return poolingDataSource;
@@ -82,6 +127,7 @@
     		// We can use this later to check acceptsUrl for better error reporting.
 			// Driver jdbcDriver = (Driver) Class.forName(driver).newInstance();
     		
+    		//TODO: It may exist from before, actually. Fix this.
     		String newDatabaseName =
     			DEFAULT_DB_NAME;
     		String newDatabaseConnectionURL = DEFAULT_PROTOCOL +
@@ -132,6 +178,6 @@
 	}
 
 	public DataSourceWithID createDatabase() throws DatabaseCreationException {
-		return new DataSourceWithIDImpl(getConnectionPool());
+		return new DataSourceWithIDImpl(getDataSource());
 	}
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




2006	Jan	Feb	Mar	Apr	May	Jun	Jul (7)	Aug	Sep (46)	Oct (102)	Nov (10)	Dec (21)
2007	Jan (1)	Feb (3)	Mar (14)	Apr (9)	May (12)	Jun (4)	Jul (40)	Aug (60)	Sep (38)	Oct (2)	Nov (1)	Dec (42)
2008	Jan (23)	Feb (29)	Mar (107)	Apr (27)	May (3)	Jun (1)	Jul (15)	Aug (7)	Sep (19)	Oct	Nov (2)	Dec
2009	Jan (36)	Feb (4)	Mar (2)	Apr (1)	May (1)	Jun (15)	Jul (30)	Aug (32)	Sep (11)	Oct (21)	Nov (12)	Dec (15)
2010	Jan (29)	Feb (9)	Mar (25)	Apr	May (7)	Jun (5)	Jul (21)	Aug (32)	Sep (10)	Oct (8)	Nov (29)	Dec (8)
2011	Jan (9)	Feb (35)	Mar (11)	Apr (4)	May	Jun (1)	Jul	Aug	Sep	Oct (2)	Nov (3)	Dec (30)
2012	Jan (5)	Feb (7)	Mar (10)	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec

cishell-svn Mailing List for Cyberinfrastructure Shell (CIShell) (Page 19)

cishell-svn — Mailing list for commit messages to CIShell