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=92e23e5ecf9614f2ab770a8cdedc0b21ddf1e127;hp=afcc581aba29c2a328ab35962cf8c180ea3ab15d;hpb=194e49725ed5ac15346c5f5a1fc874876132bca5;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 afcc581a..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 @@ -29,36 +29,36 @@ public class DatabaseComponent extends AbstractComponent { 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(); } }