X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=system%2Fgeneral%2Fsrc%2Ftest%2Fjava%2Forg%2Fwamblee%2Fsystem%2Fcomponents%2FDatabaseComponentFactory.java;h=45684102a721206ba944c66522aea17ee3bf1a3c;hb=8de36ff0206c996baf3ee4adc3e2293b12ff5f39;hp=b8ca2596e4e4c034f985e6196cdcd9e5440562fa;hpb=e1975449f1bf16ccb441632d68e440f3e3704a79;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 b8ca2596..45684102 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,12 +1,12 @@ /* * Copyright 2008 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. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -15,26 +15,23 @@ */ package org.wamblee.system.components; -import org.wamblee.persistence.DerbyDatabase; +import org.wamblee.support.persistence.DatabaseBuilder; + import org.wamblee.system.container.Container; +/** + * + * @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); } } - }