X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=security%2Fsrc%2Ftest%2Fjava%2Forg%2Fwamblee%2Fusermgt%2Fhibernate%2FHibernateUserAdministrationTest.java;h=a0fd837c10e689ee369eb235490df107ce7908a7;hb=077d6715a3a4a48d7b552781de0654e3991962be;hp=6480e77fe2d8506774f249a3a4a5d19cc97ec36b;hpb=c9dfc7dda9c77776bbe0aa02edfebe2372f8834f;p=utils diff --git a/security/src/test/java/org/wamblee/usermgt/hibernate/HibernateUserAdministrationTest.java b/security/src/test/java/org/wamblee/usermgt/hibernate/HibernateUserAdministrationTest.java index 6480e77f..a0fd837c 100644 --- a/security/src/test/java/org/wamblee/usermgt/hibernate/HibernateUserAdministrationTest.java +++ b/security/src/test/java/org/wamblee/usermgt/hibernate/HibernateUserAdministrationTest.java @@ -22,17 +22,14 @@ import java.sql.SQLException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.wamblee.cache.Cache; import org.wamblee.cache.EhCache; -import org.wamblee.general.BeanKernel; import org.wamblee.system.adapters.DefaultContainer; import org.wamblee.system.adapters.ObjectConfiguration; import org.wamblee.system.core.Scope; -import org.wamblee.system.spring.DatabaseTesterComponent; +import org.wamblee.system.spring.component.DatabaseTesterComponent; import org.wamblee.test.spring.TestTransactionCallbackWithoutResult; import org.wamblee.usermgt.UserAdministration; import org.wamblee.usermgt.UserAdministrationImplTest; -import org.wamblee.usermgt.UsermgtSpringConfigFiles; /** * User administration tests with persistence based on Hibernate. This executes @@ -61,7 +58,8 @@ public class HibernateUserAdministrationTest extends UserAdministrationImplTest protected void setUp() throws Exception { _container = new DefaultContainer("top"); - _container.addComponent(new ExternalDatasourceComponent("datasource")); + DatabaseComponentFactory.addDatabaseConfig(_container); + _container.addComponent(new DatasourceComponent("datasource")); _container.addComponent(new UserAdministrationComponent("admin", true)); _container.addComponent("databaseTester", DatabaseTesterComponent.class);