From 604319a397eeb71db767a79487f2848dd91e49de Mon Sep 17 00:00:00 2001 From: erik Date: Wed, 14 May 2008 19:34:20 +0000 Subject: [PATCH] --- .../hibernate/AuthorizationComponent.java | 1 + .../usermgt/hibernate/HibernateComponent.java | 70 ------------------- .../UserAdministrationComponent.java | 1 + .../test.org.wamblee.security.database.xml | 41 ----------- .../PersistentAuthorizationServiceTest.java | 2 +- .../hibernate/HibernateGroupSetTest.java | 2 +- .../HibernateUserAdministrationTest.java | 2 +- .../hibernate/HibernateUserSetTest.java | 2 +- .../UserMgtRepositoryTestContainer.java | 3 +- ....org.wamblee.security.hibernate.properties | 25 ------- 10 files changed, 8 insertions(+), 141 deletions(-) delete mode 100644 security/src/main/java/org/wamblee/usermgt/hibernate/HibernateComponent.java delete mode 100644 security/src/main/resources/spring/test.org.wamblee.security.database.xml delete mode 100644 security/src/test/resources/properties/test.org.wamblee.security.hibernate.properties 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 1cb21bcf..0093dc8d 100644 --- a/security/src/main/java/org/wamblee/usermgt/hibernate/AuthorizationComponent.java +++ b/security/src/main/java/org/wamblee/usermgt/hibernate/AuthorizationComponent.java @@ -30,6 +30,7 @@ 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.usermgt.UserAccessor; import org.wamblee.usermgt.UserAdministration; import org.wamblee.usermgt.UserGroupRepositoryComponent; diff --git a/security/src/main/java/org/wamblee/usermgt/hibernate/HibernateComponent.java b/security/src/main/java/org/wamblee/usermgt/hibernate/HibernateComponent.java deleted file mode 100644 index bbe1aefd..00000000 --- a/security/src/main/java/org/wamblee/usermgt/hibernate/HibernateComponent.java +++ /dev/null @@ -1,70 +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.HashMap; -import java.util.Map; -import java.util.Properties; -import java.util.TreeMap; - -import javax.sql.DataSource; - -import org.hibernate.SessionFactory; -import org.springframework.core.io.ClassPathResource; -import org.springframework.orm.hibernate3.HibernateTemplate; -import org.springframework.transaction.PlatformTransactionManager; -import org.wamblee.persistence.hibernate.HibernateMappingFiles; -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.spring.SpringComponent; - -public class HibernateComponent extends SpringComponent { - - private static final String HIBERNATE_PROPERTIES = "properties/test.org.wamblee.security.hibernate.properties"; - private static final String HIBERNATE_SPRING_CONFIG = "spring/test.org.wamblee.security.database.xml"; - - public HibernateComponent(String aName) throws IOException { - super(aName, new String[] { HIBERNATE_SPRING_CONFIG}, - createProvided(), createRequired()); - - Properties props = new Properties(); - props.load(new ClassPathResource(HIBERNATE_PROPERTIES).getInputStream()); - addProperties(props); - } - - private static Map createRequired() { - Map required = new HashMap(); - required.put(new DefaultRequiredInterface("datasource", DataSource.class), "dataSource"); - required.put(new DefaultRequiredInterface("mappingFiles", HibernateMappingFiles.class), - "hibernateMappingFiles"); - return required; - } - - private static Map createProvided() { - Map provided = new HashMap(); - - provided.put("transactionManager", new DefaultProvidedInterface( - "transactionMgr", PlatformTransactionManager.class)); - provided.put("sessionFactory", new DefaultProvidedInterface( - "sessionFactory", SessionFactory.class)); - provided.put("org.springframework.orm.hibernate3.HibernateTemplate", new DefaultProvidedInterface( - "hibernateTemplate", HibernateTemplate.class)); - return provided; - } -} 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 57301e73..6ac0ee94 100644 --- a/security/src/main/java/org/wamblee/usermgt/hibernate/UserAdministrationComponent.java +++ b/security/src/main/java/org/wamblee/usermgt/hibernate/UserAdministrationComponent.java @@ -28,6 +28,7 @@ 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.usermgt.UserAdministration; import org.wamblee.usermgt.UserGroupRepositoryComponent; diff --git a/security/src/main/resources/spring/test.org.wamblee.security.database.xml b/security/src/main/resources/spring/test.org.wamblee.security.database.xml deleted file mode 100644 index c9209053..00000000 --- a/security/src/main/resources/spring/test.org.wamblee.security.database.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - - ${hibernate.dialect} - ${hibernate.cache.provider} - ${hibernate.show_sql} - ${hibernate.cache.use_query_cache} - - - - ${hibernate.schemaupdate} - - - - - - - - - - - - - - - - - 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 453cf1a9..04ca2d37 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 @@ -27,7 +27,7 @@ import org.wamblee.security.authorization.TestUserAccessor; 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.usermgt.UserAccessor; import org.wamblee.usermgt.hibernate.AuthorizationComponent; import org.wamblee.usermgt.hibernate.ExternalDatasourceComponent; diff --git a/security/src/test/java/org/wamblee/usermgt/hibernate/HibernateGroupSetTest.java b/security/src/test/java/org/wamblee/usermgt/hibernate/HibernateGroupSetTest.java index be27a629..18b12be6 100644 --- a/security/src/test/java/org/wamblee/usermgt/hibernate/HibernateGroupSetTest.java +++ b/security/src/test/java/org/wamblee/usermgt/hibernate/HibernateGroupSetTest.java @@ -24,7 +24,7 @@ import java.util.Map; 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.TestTransactionCallback; import org.wamblee.usermgt.GroupSet; import org.wamblee.usermgt.InMemoryGroupSetTest; 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 90a5cc9c..4706e75d 100644 --- a/security/src/test/java/org/wamblee/usermgt/hibernate/HibernateUserAdministrationTest.java +++ b/security/src/test/java/org/wamblee/usermgt/hibernate/HibernateUserAdministrationTest.java @@ -26,7 +26,7 @@ import org.wamblee.cache.EhCache; 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; diff --git a/security/src/test/java/org/wamblee/usermgt/hibernate/HibernateUserSetTest.java b/security/src/test/java/org/wamblee/usermgt/hibernate/HibernateUserSetTest.java index 119b5fcd..6b7dc38a 100644 --- a/security/src/test/java/org/wamblee/usermgt/hibernate/HibernateUserSetTest.java +++ b/security/src/test/java/org/wamblee/usermgt/hibernate/HibernateUserSetTest.java @@ -25,7 +25,7 @@ import org.wamblee.cache.EhCache; 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.usermgt.Group; import org.wamblee.usermgt.GroupSet; import org.wamblee.usermgt.InMemoryUserSetTest; 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 77783a46..325b3d92 100644 --- a/security/src/test/java/org/wamblee/usermgt/hibernate/UserMgtRepositoryTestContainer.java +++ b/security/src/test/java/org/wamblee/usermgt/hibernate/UserMgtRepositoryTestContainer.java @@ -18,7 +18,8 @@ package org.wamblee.usermgt.hibernate; import java.io.IOException; import org.wamblee.system.adapters.DefaultContainer; -import org.wamblee.system.spring.DatabaseTesterComponent; +import org.wamblee.system.spring.component.DatabaseTesterComponent; +import org.wamblee.system.spring.component.HibernateComponent; import org.wamblee.usermgt.UserGroupRepositoryComponent; /** diff --git a/security/src/test/resources/properties/test.org.wamblee.security.hibernate.properties b/security/src/test/resources/properties/test.org.wamblee.security.hibernate.properties deleted file mode 100644 index 47a21e2a..00000000 --- a/security/src/test/resources/properties/test.org.wamblee.security.hibernate.properties +++ /dev/null @@ -1,25 +0,0 @@ - -################################################################################### -# dialect -################################################################################### -hibernate.dialect=org.hibernate.dialect.MySQLInnoDBDialect - -################################################################################### -# debugging settings: Log4j configuration can provide more detail. -################################################################################### -hibernate.show_sql=false - -############################################################################## -# schema update for test -############################################################################## -hibernate.schemaupdate=true - -################################################################################### -# hibernate cache provider -################################################################################### -hibernate.cache.provider=org.hibernate.cache.EhCacheProvider - -################################################################################### -# query cache -################################################################################### -hibernate.cache.use_query_cache=true \ No newline at end of file -- 2.31.1