X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=system%2Fgeneral%2Fsrc%2Ftest%2Fjava%2Forg%2Fwamblee%2Fsystem%2Fcomponents%2FDatabaseComponentFactory.java;h=a91ecb70b9b9c8ef960593d8be857e979c12d5be;hb=cb91054f35281c6fc5619f93ff71df46bf4686b9;hp=522b14b823542138c0af368963a77d4e627c3d16;hpb=aa78ce0aeaa36871bd926eefa1eabf9cb3254c7a;p=utils diff --git a/system/general/src/test/java/org/wamblee/system/components/DatabaseComponentFactory.java b/system/general/src/test/java/org/wamblee/system/components/DatabaseComponentFactory.java index 522b14b8..a91ecb70 100644 --- a/system/general/src/test/java/org/wamblee/system/components/DatabaseComponentFactory.java +++ b/system/general/src/test/java/org/wamblee/system/components/DatabaseComponentFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2008 the original author or authors. + * Copyright 2005-2010 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -12,30 +12,25 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - */ + */ package org.wamblee.system.components; -import org.wamblee.io.ClassPathResource; -import org.wamblee.persistence.DerbyDatabase; import org.wamblee.system.container.Container; +import org.wamblee.test.persistence.DatabaseBuilder; +/** + * + * @author $author$ + * @version $Revision$ + */ public class DatabaseComponentFactory { - public static void addDatabaseConfig(Container aContainer) { try { - /* - aContainer - .addComponent(new PropertyComponent( - "dbProps", - new ClassPathResource( - "properties/test.org.wamblee.security.database.properties"))); - */ - aContainer.addComponent(new DatabaseComponent("db", - new DerbyDatabase())); + aContainer.addComponent(new DatabaseComponent("db", DatabaseBuilder + .getDatabase())); } catch (Exception e) { throw new RuntimeException("Could not add database configuration", - e); + e); } } - }