X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=security%2Fsrc%2Fmain%2Fjava%2Forg%2Fwamblee%2Fusermgt%2Fhibernate%2FAuthorizationComponent.java;h=941ecfe5898c4c37b6cff1c445500ced34d199cc;hb=ea47b648b77ecdb3bb2232a61c460c91f0a65b4e;hp=be8798e2a60d3290e913ee406ef9982a34ea0767;hpb=539c6d91b7a34e32c6669445d00e9275c337530a;p=utils 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 be8798e2..941ecfe5 100644 --- a/security/src/main/java/org/wamblee/usermgt/hibernate/AuthorizationComponent.java +++ b/security/src/main/java/org/wamblee/usermgt/hibernate/AuthorizationComponent.java @@ -1,29 +1,28 @@ /* - * Copyright 2008 the original author or authors. - * + * Copyright 2005-2010 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.springframework.orm.hibernate3.HibernateTemplate; - -import org.springframework.transaction.PlatformTransactionManager; +import java.io.IOException; -import org.wamblee.cache.EhCache; +import javax.sql.DataSource; +import org.springframework.orm.hibernate3.HibernateTemplate; +import org.springframework.transaction.PlatformTransactionManager; import org.wamblee.security.authorization.AuthorizationService; import org.wamblee.security.authorization.hibernate.AuthorizationMappingFiles; - import org.wamblee.system.adapters.DefaultContainer; import org.wamblee.system.adapters.ObjectConfiguration; import org.wamblee.system.components.ORMappingConfig; @@ -31,16 +30,8 @@ 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.usermgt.UserAccessor; -import org.wamblee.usermgt.UserAdministration; -import org.wamblee.usermgt.UserGroupRepositoryComponent; - -import java.io.IOException; - -import javax.sql.DataSource; /** * @@ -48,13 +39,13 @@ import javax.sql.DataSource; * @version $Revision$ */ public class AuthorizationComponent extends DefaultContainer { - private ProvidedInterface TRANSACTION_MGR = new DefaultProvidedInterface( + private ProvidedInterface transactionMgr = new DefaultProvidedInterface( "transactionManager", PlatformTransactionManager.class); - private ProvidedInterface HIBERNATE_TEMPLATE = new DefaultProvidedInterface( + private ProvidedInterface hibernateTemplate = new DefaultProvidedInterface( "hibernateTemplate", HibernateTemplate.class); - private ProvidedInterface AUTHORIZATION_SERVICE = new DefaultProvidedInterface( + private ProvidedInterface authorizationService = new DefaultProvidedInterface( "authorizationService", AuthorizationService.class); /** @@ -87,10 +78,10 @@ public class AuthorizationComponent extends DefaultContainer { ORMappingConfig.class)); if (aExposeInternals) { - addProvidedInterface(TRANSACTION_MGR); - addProvidedInterface(HIBERNATE_TEMPLATE); + addProvidedInterface(transactionMgr); + addProvidedInterface(hibernateTemplate); } - addProvidedInterface(AUTHORIZATION_SERVICE); + addProvidedInterface(authorizationService); } }