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.UserAdministrationComponent;
import org.wamblee.usermgt.UserAdministrationImplTest;
-import org.wamblee.usermgt.UsermgtSpringConfigFiles;
/**
* User administration tests with persistence based on Hibernate. This executes
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);