From a452a5a752cf7324f06db4bc1914e72291519ce1 Mon Sep 17 00:00:00 2001 From: erik Date: Thu, 15 May 2008 20:29:19 +0000 Subject: [PATCH] --- .../hibernate/AuthorizationComponent.java | 2 +- .../UserAdministrationComponent.java | 2 +- .../PersistentAuthorizationServiceTest.java | 4 +- .../hibernate/DatabaseComponentFactory.java | 37 --------- .../hibernate/DatasourceComponent.java | 77 ------------------- .../HibernateUserAdministrationTest.java | 2 + .../UserMgtRepositoryTestContainer.java | 2 + 7 files changed, 8 insertions(+), 118 deletions(-) delete mode 100644 security/src/test/java/org/wamblee/usermgt/hibernate/DatabaseComponentFactory.java delete mode 100644 security/src/test/java/org/wamblee/usermgt/hibernate/DatasourceComponent.java diff --git a/security/src/main/java/org/wamblee/usermgt/hibernate/AuthorizationComponent.java b/security/src/main/java/org/wamblee/usermgt/hibernate/AuthorizationComponent.java index 339a0f1a..b0d77e78 100644 --- a/security/src/main/java/org/wamblee/usermgt/hibernate/AuthorizationComponent.java +++ b/security/src/main/java/org/wamblee/usermgt/hibernate/AuthorizationComponent.java @@ -25,13 +25,13 @@ import org.wamblee.cache.EhCache; import org.wamblee.security.authorization.AuthorizationService; import org.wamblee.security.authorization.hibernate.AuthorizationMappingFiles; import org.wamblee.system.adapters.DefaultContainer; +import org.wamblee.system.components.ORMappingConfig; import org.wamblee.system.core.Component; import org.wamblee.system.core.DefaultProvidedInterface; import org.wamblee.system.core.DefaultRequiredInterface; import org.wamblee.system.core.ProvidedInterface; import org.wamblee.system.core.Scope; import org.wamblee.system.spring.component.HibernateComponent; -import org.wamblee.system.spring.component.ORMappingConfig; import org.wamblee.usermgt.UserAccessor; import org.wamblee.usermgt.UserAdministration; import org.wamblee.usermgt.UserGroupRepositoryComponent; diff --git a/security/src/main/java/org/wamblee/usermgt/hibernate/UserAdministrationComponent.java b/security/src/main/java/org/wamblee/usermgt/hibernate/UserAdministrationComponent.java index dd0fb98e..8904c797 100644 --- a/security/src/main/java/org/wamblee/usermgt/hibernate/UserAdministrationComponent.java +++ b/security/src/main/java/org/wamblee/usermgt/hibernate/UserAdministrationComponent.java @@ -23,13 +23,13 @@ import org.springframework.orm.hibernate3.HibernateTemplate; import org.springframework.transaction.PlatformTransactionManager; import org.wamblee.cache.EhCache; import org.wamblee.system.adapters.DefaultContainer; +import org.wamblee.system.components.ORMappingConfig; import org.wamblee.system.core.Component; import org.wamblee.system.core.DefaultProvidedInterface; import org.wamblee.system.core.DefaultRequiredInterface; import org.wamblee.system.core.ProvidedInterface; import org.wamblee.system.core.Scope; import org.wamblee.system.spring.component.HibernateComponent; -import org.wamblee.system.spring.component.ORMappingConfig; import org.wamblee.usermgt.UserAdministration; import org.wamblee.usermgt.UserGroupRepositoryComponent; diff --git a/security/src/test/java/org/wamblee/security/authorization/hibernate/PersistentAuthorizationServiceTest.java b/security/src/test/java/org/wamblee/security/authorization/hibernate/PersistentAuthorizationServiceTest.java index af99ed83..ce415cab 100644 --- a/security/src/test/java/org/wamblee/security/authorization/hibernate/PersistentAuthorizationServiceTest.java +++ b/security/src/test/java/org/wamblee/security/authorization/hibernate/PersistentAuthorizationServiceTest.java @@ -26,12 +26,12 @@ import org.wamblee.security.authorization.AuthorizationServiceTest; import org.wamblee.security.authorization.TestUserAccessor; import org.wamblee.system.adapters.DefaultContainer; import org.wamblee.system.adapters.ObjectConfiguration; +import org.wamblee.system.components.DatabaseComponentFactory; import org.wamblee.system.core.Scope; import org.wamblee.system.spring.component.DatabaseTesterComponent; +import org.wamblee.system.spring.component.DatasourceComponent; import org.wamblee.usermgt.UserAccessor; import org.wamblee.usermgt.hibernate.AuthorizationComponent; -import org.wamblee.usermgt.hibernate.DatabaseComponentFactory; -import org.wamblee.usermgt.hibernate.DatasourceComponent; import org.wamblee.usermgt.hibernate.HibernateUserAdministrationTest; import org.wamblee.usermgt.hibernate.UserAdministrationComponent; diff --git a/security/src/test/java/org/wamblee/usermgt/hibernate/DatabaseComponentFactory.java b/security/src/test/java/org/wamblee/usermgt/hibernate/DatabaseComponentFactory.java deleted file mode 100644 index d7f5f5e7..00000000 --- a/security/src/test/java/org/wamblee/usermgt/hibernate/DatabaseComponentFactory.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * 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. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.wamblee.usermgt.hibernate; - -import org.wamblee.io.ClassPathResource; -import org.wamblee.system.components.PropertyComponent; -import org.wamblee.system.core.Container; - -public class DatabaseComponentFactory { - - public static void addDatabaseConfig(Container aContainer) { - try { - aContainer - .addComponent(new PropertyComponent( - "dbProps", - new ClassPathResource( - "properties/test.org.wamblee.security.database.properties"))); - } catch (Exception e) { - throw new RuntimeException("Could not add database configuration", - e); - } - } - -} diff --git a/security/src/test/java/org/wamblee/usermgt/hibernate/DatasourceComponent.java b/security/src/test/java/org/wamblee/usermgt/hibernate/DatasourceComponent.java deleted file mode 100644 index 0871d27b..00000000 --- a/security/src/test/java/org/wamblee/usermgt/hibernate/DatasourceComponent.java +++ /dev/null @@ -1,77 +0,0 @@ -/* - * 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. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.wamblee.usermgt.hibernate; - -import java.io.IOException; -import java.util.Map; -import java.util.Properties; -import java.util.TreeMap; - -import javax.sql.DataSource; - -import org.springframework.core.io.ClassPathResource; -import org.springframework.jdbc.datasource.DriverManagerDataSource; -import org.wamblee.system.core.AbstractComponent; -import org.wamblee.system.core.DefaultProvidedInterface; -import org.wamblee.system.core.DefaultRequiredInterface; -import org.wamblee.system.core.ProvidedInterface; -import org.wamblee.system.core.RequiredInterface; -import org.wamblee.system.core.Scope; -import org.wamblee.system.spring.SpringComponent; -import org.wamblee.system.spring.component.ORMappingConfig; -import org.wamblee.system.spring.component.ORMappingConfig.DatabaseType; - -public class DatasourceComponent extends AbstractComponent { - - private static RequiredInterface PROPS = new DefaultRequiredInterface("dbprops", Properties.class); - private static ProvidedInterface DATASOURCE = new DefaultProvidedInterface("datasource", - DataSource.class); - private static ProvidedInterface ORM_CONFIG = new DefaultProvidedInterface("ormconfig", - ORMappingConfig.class); - - public DatasourceComponent(String aName) throws IOException { - super(aName); - - addRequiredInterface(PROPS); - addProvidedInterface(DATASOURCE); - addProvidedInterface(ORM_CONFIG); - } - - - @Override - protected DataSource doStart(Scope aScope) { - Properties dbProps = aScope.getInterfaceImplementation( - PROPS.getProvider(), Properties.class); - DriverManagerDataSource ds = new DriverManagerDataSource( - dbProps.getProperty("database.driver"), - dbProps.getProperty("database.url"), - dbProps.getProperty("database.username"), - dbProps.getProperty("database.password")); - addInterface(DATASOURCE, ds, aScope); - DatabaseType type = DatabaseType.valueOf(dbProps.getProperty("database.type")); - - ORMappingConfig config = new ORMappingConfig(true, type); - - addInterface(ORM_CONFIG, config, aScope); - - return ds; - } - - @Override - protected void doStop(DataSource aRuntime) { - // Empty. - } -} 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 a0fd837c..6f5c6fe1 100644 --- a/security/src/test/java/org/wamblee/usermgt/hibernate/HibernateUserAdministrationTest.java +++ b/security/src/test/java/org/wamblee/usermgt/hibernate/HibernateUserAdministrationTest.java @@ -25,8 +25,10 @@ import org.apache.commons.logging.LogFactory; import org.wamblee.cache.EhCache; import org.wamblee.system.adapters.DefaultContainer; import org.wamblee.system.adapters.ObjectConfiguration; +import org.wamblee.system.components.DatabaseComponentFactory; import org.wamblee.system.core.Scope; import org.wamblee.system.spring.component.DatabaseTesterComponent; +import org.wamblee.system.spring.component.DatasourceComponent; import org.wamblee.test.spring.TestTransactionCallbackWithoutResult; import org.wamblee.usermgt.UserAdministration; import org.wamblee.usermgt.UserAdministrationImplTest; diff --git a/security/src/test/java/org/wamblee/usermgt/hibernate/UserMgtRepositoryTestContainer.java b/security/src/test/java/org/wamblee/usermgt/hibernate/UserMgtRepositoryTestContainer.java index d5824191..22ae86cb 100644 --- a/security/src/test/java/org/wamblee/usermgt/hibernate/UserMgtRepositoryTestContainer.java +++ b/security/src/test/java/org/wamblee/usermgt/hibernate/UserMgtRepositoryTestContainer.java @@ -19,8 +19,10 @@ import java.io.IOException; import org.wamblee.io.ClassPathResource; import org.wamblee.system.adapters.DefaultContainer; +import org.wamblee.system.components.DatabaseComponentFactory; import org.wamblee.system.components.PropertyComponent; import org.wamblee.system.spring.component.DatabaseTesterComponent; +import org.wamblee.system.spring.component.DatasourceComponent; import org.wamblee.system.spring.component.HibernateComponent; import org.wamblee.usermgt.UserGroupRepositoryComponent; -- 2.31.1