X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=system%2Fgeneral%2Fsrc%2Ftest%2Fjava%2Forg%2Fwamblee%2Fsystem%2Fcomponents%2FDatabaseComponent.java;h=10e679589d95a1c2bd0ca91d3b94c9822eb21367;hb=0d8d8f24656e585ee75558cfd6a4c661f8f14985;hp=5ec58512e87cdef6b0cbd72665da1dfb06a54cb6;hpb=756145743d46d1cf4e4e32c03a32526aa059f1e1;p=utils

diff --git a/system/general/src/test/java/org/wamblee/system/components/DatabaseComponent.java b/system/general/src/test/java/org/wamblee/system/components/DatabaseComponent.java
index 5ec58512..10e67958 100644
--- a/system/general/src/test/java/org/wamblee/system/components/DatabaseComponent.java
+++ b/system/general/src/test/java/org/wamblee/system/components/DatabaseComponent.java
@@ -17,8 +17,8 @@ package org.wamblee.system.components;
 
 import java.util.Properties;
 
-import org.wamblee.persistence.Database;
-import org.wamblee.persistence.DerbyDatabase;
+import org.wamblee.support.persistence.Database;
+import org.wamblee.support.persistence.DerbyDatabase;
 import org.wamblee.system.components.ORMappingConfig.DatabaseType;
 import org.wamblee.system.core.AbstractComponent;
 import org.wamblee.system.core.DefaultProvidedInterface;
@@ -29,36 +29,36 @@ public class DatabaseComponent extends AbstractComponent<Database> {
     
     private static ProvidedInterface DB_PROPS = new DefaultProvidedInterface("dbProps", Properties.class);
     
-    private Database _database; 
+    private Database database; 
     
     public DatabaseComponent(String aName, Database aDatabase) { 
         super(aName); 
-        _database = aDatabase;
+        database = aDatabase;
         addProvidedInterface(DB_PROPS);
     }
 
     @Override
     protected Database doStart(Scope aScope) {
-        _database.start(); 
+        database.start(); 
         
         Properties props = new Properties();
-        if ( _database instanceof DerbyDatabase ) { 
+        if ( database instanceof DerbyDatabase ) { 
             props.put("database.type", DatabaseType.DERBY.toString());
         } else { 
-            throw new IllegalArgumentException("Unknown database type " + _database); 
+            throw new IllegalArgumentException("Unknown database type " + database); 
         }
-        props.put("database.driver", _database.getDriverClassName());
-        props.put("database.url", _database.getJdbcUrl());
-        props.put("database.username", _database.getUsername());
-        props.put("database.password", _database.getPassword());
+        //props.put("database.driver", database.getDriverClassName());
+        props.put("database.url", database.getJdbcUrl());
+        props.put("database.username", database.getUsername());
+        props.put("database.password", database.getPassword());
 
         addInterface(DB_PROPS, props, aScope);
-        return _database; 
+        return database; 
     }
 
     @Override
     protected void doStop(Database aRuntime) {
-        _database.stop();
+        database.stop();
     }
 
 }