Yair Zaslavsky has uploaded a new change for review. Change subject: aaa: removing bll imports and dependencies ......................................................................
aaa: removing bll imports and dependencies This patch fixes all ldap broker code (org.ovirt.engine.core.bll.adbroker) and removes dependencies on other bll subpackages where needed Topic: AAA Change-Id: Ib52e923b373d2a8bcbda72d73e69a3d7d75e527e Signed-off-by: Yair Zaslavsky <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InitBackendServicesOnStartupBean.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/KerberosManager.java D backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/KerberosManagerSericeManagmentMBean.java 3 files changed, 16 insertions(+), 44 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/04/25604/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InitBackendServicesOnStartupBean.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InitBackendServicesOnStartupBean.java index af3ea39..e66bb80 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InitBackendServicesOnStartupBean.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InitBackendServicesOnStartupBean.java @@ -19,6 +19,7 @@ import org.ovirt.engine.core.aaa.internal.InternalDirectory; import org.ovirt.engine.core.aaa.provisional.ProvisionalAuthenticator; import org.ovirt.engine.core.aaa.provisional.ProvisionalDirectory; +import org.ovirt.engine.core.bll.adbroker.KerberosManager; import org.ovirt.engine.core.bll.adbroker.LdapBrokerUtils; import org.ovirt.engine.core.bll.adbroker.UsersDomainsCacheManagerService; import org.ovirt.engine.core.bll.dwh.DwhHeartBeat; @@ -113,7 +114,9 @@ AuthenticationProfileRepository.getInstance(); + KerberosManager.getInstance(); UsersDomainsCacheManagerService.getInstance().init(); + DbUserCacheManager.getInstance().init(); AsyncTaskManager.getInstance().initAsyncTaskManager(); ResourceManager.getInstance().init(); OvfDataUpdater.getInstance().initOvfDataUpdater(); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/KerberosManager.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/KerberosManager.java index c3a8fac..44cb2d8 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/KerberosManager.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/KerberosManager.java @@ -1,38 +1,18 @@ package org.ovirt.engine.core.bll.adbroker; import java.io.File; -import javax.annotation.PostConstruct; -import javax.ejb.ConcurrencyManagement; -import javax.ejb.ConcurrencyManagementType; -import javax.ejb.DependsOn; -import javax.ejb.Singleton; -import javax.ejb.Startup; - import org.ovirt.engine.core.common.config.ConfigValues; import org.ovirt.engine.core.utils.log.Log; import org.ovirt.engine.core.utils.log.LogFactory; -import sun.security.krb5.Config; -import sun.security.krb5.KrbException; /** * Manage the container's Kerberos initialization. * */ -// Here we use a Singleton bean -// The @Startup annotation is to make sure the bean is initialized on startup. -// @ConcurrencyManagement - we use bean managed concurrency: -// Singletons that use bean-managed concurrency allow full concurrent access to all the -// business and timeout methods in the singleton. -// The developer of the singleton is responsible for ensuring that the state of the singleton is synchronized across all clients. -// The @DependsOn annotation is in order to make sure it is started after the Backend bean is initialized -@SuppressWarnings("restriction") -@Singleton -@Startup -@DependsOn("Backend") -@ConcurrencyManagement(ConcurrencyManagementType.BEAN) -public class KerberosManager implements KerberosManagerSericeManagmentMBean { +public class KerberosManager { private static Log log = LogFactory.getLog(KerberosManager.class); + private static volatile KerberosManager instance = null; private boolean isKerberosAuth() { boolean isKerberosAuth = false; @@ -53,9 +33,15 @@ return isKerberosAuth; } - @PostConstruct - public void postConstruct() { - create(); + public static KerberosManager getInstance() { + if (instance == null) { + synchronized (KerberosManager.class) { + if (instance == null) { + instance = new KerberosManager(); + } + } + } + return instance; } /** @@ -83,15 +69,8 @@ System.setProperty("sun.security.krb5.msinterop.kstring", "true"); } - @SuppressWarnings("restriction") - @Override - public void refresh() throws KrbException { - if (!isKerberosAuth()) { - return; - } - log.info("Refreshing kerberos configuration"); - Config.refresh(); - + private KerberosManager() { + create(); } } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/KerberosManagerSericeManagmentMBean.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/KerberosManagerSericeManagmentMBean.java deleted file mode 100644 index 5c56c6c..0000000 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/KerberosManagerSericeManagmentMBean.java +++ /dev/null @@ -1,10 +0,0 @@ -package org.ovirt.engine.core.bll.adbroker; - -import sun.security.krb5.KrbException; - -public interface KerberosManagerSericeManagmentMBean { - - @SuppressWarnings("restriction") - public void refresh() throws KrbException; - -} -- To view, visit http://gerrit.ovirt.org/25604 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib52e923b373d2a8bcbda72d73e69a3d7d75e527e Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Yair Zaslavsky <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
