Alon Bar-Lev has uploaded a new change for review. Change subject: builtin-extensions: remove usage of org.ovirt.engine.core.utils.log.Log ......................................................................
builtin-extensions: remove usage of org.ovirt.engine.core.utils.log.Log Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1109871 Change-Id: I43124cb57f54c60f6e8717678a87f151bccdf856 Signed-off-by: Alon Bar-Lev <alo...@redhat.com> --- M backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/ADGroupContextMapper.java M backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/ADUserContextMapper.java M backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/DefaultRootDSEContextMapper.java M backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/DirectorySearcher.java M backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/GSSAPIDirContextAuthenticationStrategy.java M backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/GetRootDSE.java M backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/GetRootDSETask.java M backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/IPAGroupContextMapper.java M backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/IPAUserContextMapper.java M backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/ITDSGroupContextMapper.java M backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/ITDSRootDSEContextMapper.java M backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/ITDSUserContextMapper.java M backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/KerberosLdapAuthz.java M backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/KerberosManager.java M backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/LDAPTemplateWrapper.java M backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/LDAPTemplateWrapperFactory.java M backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/LdapAuthenticateUserCommand.java M backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/LdapBrokerBase.java M backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/LdapBrokerCommandBase.java M backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/LdapBrokerUtils.java M backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/LdapSearchExceptionHandler.java M backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/OpenLdapGroupContextMapper.java M backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/OpenLdapUserContextMapper.java M backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/PrepareLdapConnectionTask.java M backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/RHDSGroupContextMapper.java M backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/RHDSRootDSEContextMapper.java M backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/RHDSUserContextMapper.java M backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/utils/ipa/OpenLdapUserContextMapper.java 28 files changed, 155 insertions(+), 150 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/94/34094/1 diff --git a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/ADGroupContextMapper.java b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/ADGroupContextMapper.java index c82203b..dc4eff9 100644 --- a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/ADGroupContextMapper.java +++ b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/ADGroupContextMapper.java @@ -10,15 +10,16 @@ import javax.naming.directory.Attribute; import javax.naming.directory.Attributes; -import org.ovirt.engine.core.compat.Guid; -import org.ovirt.engine.core.utils.log.Log; -import org.ovirt.engine.core.utils.log.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.ldap.core.ContextMapper; import org.springframework.ldap.core.DirContextAdapter; +import org.ovirt.engine.core.compat.Guid; + public class ADGroupContextMapper implements ContextMapper { - private static final Log log = LogFactory.getLog(LdapBrokerImpl.class); + private static final Logger log = LoggerFactory.getLogger(LdapBrokerImpl.class); static final String[] GROUP_ATTRIBUTE_FILTER = { memberof.name(), objectGuid.name() }; diff --git a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/ADUserContextMapper.java b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/ADUserContextMapper.java index 5edb8a0..3af30eb 100644 --- a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/ADUserContextMapper.java +++ b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/ADUserContextMapper.java @@ -17,16 +17,17 @@ import javax.naming.directory.Attribute; import javax.naming.directory.Attributes; -import org.ovirt.engine.core.common.businessentities.aaa.LdapUser; -import org.ovirt.engine.core.compat.Guid; -import org.ovirt.engine.core.utils.log.Log; -import org.ovirt.engine.core.utils.log.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.ldap.core.ContextMapper; import org.springframework.ldap.core.DirContextAdapter; +import org.ovirt.engine.core.common.businessentities.aaa.LdapUser; +import org.ovirt.engine.core.compat.Guid; + public class ADUserContextMapper implements ContextMapper { - private static final Log log = LogFactory.getLog(LdapBrokerImpl.class); + private static final Logger log = LoggerFactory.getLogger(LdapBrokerImpl.class); static final String[] USERS_ATTRIBUTE_FILTER = { objectguid.name(), userprincipalname.name(), givenname.name(), department.name(), title.name(), mail.name(), memberof.name(), diff --git a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/DefaultRootDSEContextMapper.java b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/DefaultRootDSEContextMapper.java index 87a92bf..98ceafd 100644 --- a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/DefaultRootDSEContextMapper.java +++ b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/DefaultRootDSEContextMapper.java @@ -6,14 +6,14 @@ import javax.naming.directory.Attribute; import javax.naming.directory.Attributes; -import org.ovirt.engine.core.utils.log.Log; -import org.ovirt.engine.core.utils.log.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.ldap.core.ContextMapper; import org.springframework.ldap.core.DirContextAdapter; public class DefaultRootDSEContextMapper implements ContextMapper { - private static final Log log = LogFactory.getLog(DefaultRootDSEContextMapper.class); + private static final Logger log = LoggerFactory.getLogger(DefaultRootDSEContextMapper.class); static final String[] ROOTDSE_ATTRIBUTE_FILTER = { namingContexts.name() }; diff --git a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/DirectorySearcher.java b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/DirectorySearcher.java index db1e7dd..206a050 100644 --- a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/DirectorySearcher.java +++ b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/DirectorySearcher.java @@ -8,8 +8,9 @@ import java.util.Properties; import org.apache.commons.lang.StringUtils; -import org.ovirt.engine.core.utils.log.Log; -import org.ovirt.engine.core.utils.log.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import org.ovirt.engine.extensions.aaa.builtin.kerberosldap.serverordering.LdapServersOrderingAlgorithmFactory; import org.ovirt.engine.extensions.aaa.builtin.kerberosldap.utils.ldap.LdapProviderType; @@ -19,7 +20,7 @@ private String explicitBaseDN; private Properties configuration; - private static final Log log = LogFactory.getLog(DirectorySearcher.class); + private static final Logger log = LoggerFactory.getLogger(DirectorySearcher.class); private final LdapCredentials ldapCredentials; private Exception ex; @@ -60,9 +61,7 @@ List<String> ldapServerURIs = Arrays.asList(configuration.getProperty("config.LdapServers").split(";")); List<String> editableLdapServerURIs = new ArrayList<>(ldapServerURIs); - if (log.isDebugEnabled()) { - log.debug("Ldap server list: " + StringUtils.join(ldapServerURIs, ", ")); - } + log.debug("Ldap server list: {}", ldapServerURIs); List<?> response = null; for (Iterator<String> iterator = ldapServerURIs.iterator(); iterator.hasNext();) { @@ -85,9 +84,7 @@ String domainName, long resultCount, List<String> modifiedLdapServersURIs) throws Exception { - if (log.isDebugEnabled()) { - log.debug("Using Ldap server " + ldapURI); - } + log.debug("Using Ldap server {}", ldapURI); try { setException(null); GetRootDSETask getRootDSETask = new GetRootDSETask(configuration, this, domainName, ldapURI); @@ -102,9 +99,12 @@ setExplicitBaseDN(queryExecution.getBaseDN()); } - log.debug("find() : LDAP filter = " + queryExecution.getFilter() + - ", baseDN = " + queryExecution.getBaseDN() + - ", explicitBaseDN = " + explicitBaseDN + ", domain = " + queryExecution.getDomain() ); + log.debug("find() : LDAP filter='{}', baseDN='{}', explicitBaseDN='{}', domain='{}'", + queryExecution.getFilter(), + queryExecution.getBaseDN(), + explicitBaseDN, + queryExecution.getDomain() + ); LDAPTemplateWrapper ldapTemplate = prepareLdapConnectionTask.call(); if (ldapTemplate == null) { @@ -116,12 +116,12 @@ Exception translatedException = handlingResponse.getTranslatedException(); setException(translatedException); LdapServersOrderingAlgorithmFactory.getInstance().getOrderingAlgorithm(handlingResponse.getOrderingAlgorithm()).reorder(ldapURI, modifiedLdapServersURIs); - log.errorFormat("Failed ldap search server {0} using user {1} due to {2}. We {3} try the next server", + log.error("Failed ldap search server {} using user {} due to {}. We {} try the next server", ldapURI, ldapCredentials.getUserName(), LdapBrokerUtils.getFriendlyExceptionMessage(translatedException), handlingResponse.isTryNextServer() ? "should" : "should not"); - log.debugFormat("Failed ldap search server {0} using user {1} due to {2}. We {3} try the next server", + log.debug("Failed ldap search server {} using user {} due to {}. We {} try the next server", ldapURI, ldapCredentials.getUserName(), translatedException, diff --git a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/GSSAPIDirContextAuthenticationStrategy.java b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/GSSAPIDirContextAuthenticationStrategy.java index 5a838c3..a7b2395 100644 --- a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/GSSAPIDirContextAuthenticationStrategy.java +++ b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/GSSAPIDirContextAuthenticationStrategy.java @@ -16,11 +16,12 @@ import javax.security.auth.login.LoginContext; import javax.security.auth.login.LoginException; -import org.ovirt.engine.core.utils.log.Log; -import org.ovirt.engine.core.utils.log.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.ldap.core.support.DirContextAuthenticationStrategy; + import org.ovirt.engine.extensions.aaa.builtin.kerberosldap.utils.kerberos.AuthenticationResult; import org.ovirt.engine.extensions.aaa.builtin.kerberosldap.utils.kerberos.KerberosReturnCodeParser; -import org.springframework.ldap.core.support.DirContextAuthenticationStrategy; /** * @@ -32,7 +33,7 @@ public class GSSAPIDirContextAuthenticationStrategy implements DirContextAuthenticationStrategy { private static final String GSS_API_AUTHENTICATION = "GSSAPI"; - private static final Log log = LogFactory.getLog(GSSAPIDirContextAuthenticationStrategy.class); + private static final Logger log = LoggerFactory.getLogger(GSSAPIDirContextAuthenticationStrategy.class); private LoginContext loginContext; private String password; private String userName; @@ -96,9 +97,7 @@ try { loginContext = new LoginContext(configuration.getProperty("config.JAASLoginContext"), callbackHandler); loginContext.login(); - if (log.isDebugEnabled()) { - log.debug("Successful login for user " + userName); - } + log.debug("Successful login for user '{}'", userName); } catch (LoginException ex) { // JAAS throws login exception due to various reasons. @@ -109,10 +108,8 @@ loginContext = null; KerberosReturnCodeParser parser = new KerberosReturnCodeParser(); AuthenticationResult result = parser.parse(ex.getMessage()); - log.error("Kerberos error: " + ex.getMessage()); - if (log.isDebugEnabled()) { - log.debug("Kerberos error stacktrace: ", ex); - } + log.error("Kerberos error: {}", ex.getMessage()); + log.debug("Kerberos error stacktrace: ", ex); if (result != AuthenticationResult.OTHER) { log.error(result.getDetailedMessage()); } diff --git a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/GetRootDSE.java b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/GetRootDSE.java index 44307ce..cc1d449 100644 --- a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/GetRootDSE.java +++ b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/GetRootDSE.java @@ -12,8 +12,9 @@ import javax.naming.directory.SearchControls; import javax.naming.directory.SearchResult; -import org.ovirt.engine.core.utils.log.Log; -import org.ovirt.engine.core.utils.log.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import org.ovirt.engine.extensions.aaa.builtin.kerberosldap.utils.ldap.LdapProviderType; /** @@ -27,7 +28,7 @@ private Properties configuration; - private final static Log log = LogFactory.getLog(GetRootDSE.class); + private final static Logger log = LoggerFactory.getLogger(GetRootDSE.class); public GetRootDSE(Properties configuration, String ldapURI) { this.ldapURI = ldapURI; @@ -74,7 +75,7 @@ } catch (NamingException e) { String message = LdapBrokerUtils.getFriendlyExceptionMessage(e); - log.errorFormat("Failed to query rootDSE for LDAP server {0} due to {1}", ldapURI, message); + log.error("Failed to query rootDSE for LDAP server {} due to {}", ldapURI, message); throw new DirectoryServiceException(e); } finally { diff --git a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/GetRootDSETask.java b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/GetRootDSETask.java index 3495b26..ac1e598 100644 --- a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/GetRootDSETask.java +++ b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/GetRootDSETask.java @@ -6,8 +6,9 @@ import javax.naming.NamingException; import javax.naming.directory.Attributes; -import org.ovirt.engine.core.utils.log.Log; -import org.ovirt.engine.core.utils.log.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import org.ovirt.engine.extensions.aaa.builtin.kerberosldap.utils.kerberos.AuthenticationResult; import org.ovirt.engine.extensions.aaa.builtin.kerberosldap.utils.ldap.LdapProviderType; @@ -18,7 +19,7 @@ private final String ldapURI; private final Properties configuration; - private static final Log log = LogFactory.getLog(GetRootDSETask.class); + private static final Logger log = LoggerFactory.getLogger(GetRootDSETask.class); public GetRootDSETask(Properties configuration, DirectorySearcher searcher, String domainName, String ldapURI) { super(); @@ -60,7 +61,7 @@ setRootDSE(ldapProviderType, rootDseRecords); baseDNExist = true; } else { - log.errorFormat("Couldn't deduce provider type for domain {0}", domainName); + log.error("Couldn't deduce provider type for domain {}", domainName); throw new AuthenticationResultException(AuthenticationResult.CONNECTION_ERROR, "Failed to get rootDSE record for server " + ldapURI); } diff --git a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/IPAGroupContextMapper.java b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/IPAGroupContextMapper.java index 0a9c576..563e47c 100644 --- a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/IPAGroupContextMapper.java +++ b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/IPAGroupContextMapper.java @@ -10,15 +10,16 @@ import javax.naming.directory.Attribute; import javax.naming.directory.Attributes; -import org.ovirt.engine.core.compat.Guid; -import org.ovirt.engine.core.utils.log.Log; -import org.ovirt.engine.core.utils.log.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.ldap.core.ContextMapper; import org.springframework.ldap.core.DirContextAdapter; +import org.ovirt.engine.core.compat.Guid; + public class IPAGroupContextMapper implements ContextMapper { - private static final Log log = LogFactory.getLog(LdapBrokerImpl.class); + private static final Logger log = LoggerFactory.getLogger(LdapBrokerImpl.class); static final String[] GROUP_ATTRIBUTE_FILTER = { memberof.name(), ipaUniqueId.name() }; diff --git a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/IPAUserContextMapper.java b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/IPAUserContextMapper.java index 0449b27..72730de 100644 --- a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/IPAUserContextMapper.java +++ b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/IPAUserContextMapper.java @@ -17,16 +17,17 @@ import javax.naming.directory.Attribute; import javax.naming.directory.Attributes; -import org.ovirt.engine.core.common.businessentities.aaa.LdapUser; -import org.ovirt.engine.core.compat.Guid; -import org.ovirt.engine.core.utils.log.Log; -import org.ovirt.engine.core.utils.log.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.ldap.core.ContextMapper; import org.springframework.ldap.core.DirContextAdapter; +import org.ovirt.engine.core.common.businessentities.aaa.LdapUser; +import org.ovirt.engine.core.compat.Guid; + public class IPAUserContextMapper implements ContextMapper { - private static final Log log = LogFactory.getLog(LdapBrokerImpl.class); + private static final Logger log = LoggerFactory.getLogger(LdapBrokerImpl.class); static final String[] USERS_ATTRIBUTE_FILTER = { ipaUniqueId.name(), krbPrincipalname.name(), givenname.name(), department.name(), title.name(), mail.name(), memberof.name(), diff --git a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/ITDSGroupContextMapper.java b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/ITDSGroupContextMapper.java index 5ee5d5e..8e838eb 100644 --- a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/ITDSGroupContextMapper.java +++ b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/ITDSGroupContextMapper.java @@ -10,15 +10,16 @@ import javax.naming.directory.Attribute; import javax.naming.directory.Attributes; -import org.ovirt.engine.core.compat.Guid; -import org.ovirt.engine.core.utils.log.Log; -import org.ovirt.engine.core.utils.log.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.ldap.core.ContextMapper; import org.springframework.ldap.core.DirContextAdapter; +import org.ovirt.engine.core.compat.Guid; + public class ITDSGroupContextMapper implements ContextMapper { - private static final Log log = LogFactory.getLog(LdapBrokerImpl.class); + private static final Logger log = LoggerFactory.getLogger(LdapBrokerImpl.class); static final String[] GROUP_ATTRIBUTE_FILTER = { uniqueMember.name(), uniqueIdentifier.name() }; diff --git a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/ITDSRootDSEContextMapper.java b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/ITDSRootDSEContextMapper.java index e822e9c..c895de1 100644 --- a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/ITDSRootDSEContextMapper.java +++ b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/ITDSRootDSEContextMapper.java @@ -6,14 +6,14 @@ import javax.naming.directory.Attribute; import javax.naming.directory.Attributes; -import org.ovirt.engine.core.utils.log.Log; -import org.ovirt.engine.core.utils.log.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.ldap.core.ContextMapper; import org.springframework.ldap.core.DirContextAdapter; public class ITDSRootDSEContextMapper implements ContextMapper { - private static final Log log = LogFactory.getLog(ITDSRootDSEContextMapper.class); + private static final Logger log = LoggerFactory.getLogger(ITDSRootDSEContextMapper.class); static final String[] ROOTDSE_ATTRIBUTE_FILTER = { namingContexts.name() }; diff --git a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/ITDSUserContextMapper.java b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/ITDSUserContextMapper.java index a5e92e4..251ae55 100644 --- a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/ITDSUserContextMapper.java +++ b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/ITDSUserContextMapper.java @@ -12,16 +12,17 @@ import javax.naming.directory.Attribute; import javax.naming.directory.Attributes; -import org.ovirt.engine.core.common.businessentities.aaa.LdapUser; -import org.ovirt.engine.core.compat.Guid; -import org.ovirt.engine.core.utils.log.Log; -import org.ovirt.engine.core.utils.log.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.ldap.core.ContextMapper; import org.springframework.ldap.core.DirContextAdapter; +import org.ovirt.engine.core.common.businessentities.aaa.LdapUser; +import org.ovirt.engine.core.compat.Guid; + public class ITDSUserContextMapper implements ContextMapper { - private static final Log log = LogFactory.getLog(LdapBrokerImpl.class); + private static final Logger log = LoggerFactory.getLogger(LdapBrokerImpl.class); static final String[] USERS_ATTRIBUTE_FILTER = { uniqueIdentifier.name(), uid.name(), givenname.name(), department.name(), title.name(), mail.name(), sn.name() }; diff --git a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/KerberosLdapAuthz.java b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/KerberosLdapAuthz.java index 038074e..79ae6ee 100644 --- a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/KerberosLdapAuthz.java +++ b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/KerberosLdapAuthz.java @@ -17,16 +17,12 @@ import org.ovirt.engine.api.extensions.aaa.Authz.QueryFilterRecord; import org.ovirt.engine.core.common.businessentities.aaa.LdapGroup; import org.ovirt.engine.core.common.businessentities.aaa.LdapUser; -import org.ovirt.engine.core.utils.log.Log; -import org.ovirt.engine.core.utils.log.LogFactory; /** * This directory implementation is a bridge between the new directory interfaces and the existing LDAP infrastructure. * It will exist only while the engine is migrated to use the new directory interfaces, then it will be removed. */ public class KerberosLdapAuthz implements Extension { - - private static final Log log = LogFactory.getLog(KerberosLdapAuthz.class); private static final String NAMESPACE = "*"; diff --git a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/KerberosManager.java b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/KerberosManager.java index 03b40f0..9ac9f40 100644 --- a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/KerberosManager.java +++ b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/KerberosManager.java @@ -2,8 +2,8 @@ import java.io.File; -import org.ovirt.engine.core.utils.log.Log; -import org.ovirt.engine.core.utils.log.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Manage the container's Kerberos initialization. @@ -11,7 +11,7 @@ */ public class KerberosManager { - private static final Log log = LogFactory.getLog(KerberosManager.class); + private static final Logger log = LoggerFactory.getLogger(KerberosManager.class); private static volatile KerberosManager instance = null; diff --git a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/LDAPTemplateWrapper.java b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/LDAPTemplateWrapper.java index 7443de9..330f7e7 100644 --- a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/LDAPTemplateWrapper.java +++ b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/LDAPTemplateWrapper.java @@ -5,9 +5,9 @@ import javax.naming.directory.SearchControls; -import org.ovirt.engine.core.utils.log.Log; -import org.ovirt.engine.core.utils.log.LogFactory; -import org.ovirt.engine.extensions.aaa.builtin.kerberosldap.utils.ldap.LdapProviderType; +import com.sun.jndi.ldap.LdapCtxFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.ldap.control.PagedResultsCookie; import org.springframework.ldap.control.PagedResultsDirContextProcessor; import org.springframework.ldap.core.LdapTemplate; @@ -16,11 +16,11 @@ import org.springframework.ldap.core.support.LdapContextSource; import org.springframework.ldap.core.support.SingleContextSource; -import com.sun.jndi.ldap.LdapCtxFactory; +import org.ovirt.engine.extensions.aaa.builtin.kerberosldap.utils.ldap.LdapProviderType; public abstract class LDAPTemplateWrapper { - private static final Log log = LogFactory.getLog(LDAPTemplateWrapper.class); + private static final Logger log = LoggerFactory.getLogger(LDAPTemplateWrapper.class); protected LdapTemplate ldapTemplate; protected LdapContextSource contextSource; @@ -114,9 +114,7 @@ try { ldapTemplate.setContextSource(singleContextSource); - if (log.isDebugEnabled()) { - log.debugFormat("LDAP query is {0}", displayFilter); - } + log.debug("LDAP query is {}", displayFilter); int ldapPageSize = Integer.parseInt(configuration.getProperty("config.LdapQueryPageSize")); PagedResultsDirContextProcessor requestControl = new PagedResultsDirContextProcessor(ldapPageSize); ldapTemplate.search(baseDN, filter, searchControls, handler, requestControl); @@ -133,13 +131,11 @@ } catch (Exception ex) { ex.printStackTrace(); - log.errorFormat("Error in running LDAP query. BaseDN is {0}, filter is {1}. Exception message is: {2}", + log.error("Error in running LDAP query. BaseDN is {}, filter is {}. Exception message is: {}", baseDN, displayFilter, ex.getMessage()); - if (log.isDebugEnabled()) { - log.debug("Exception stacktrace: ", ex); - } + log.debug("Exception stacktrace: ", ex); handleException(ex); } finally { singleContextSource.destroy(); diff --git a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/LDAPTemplateWrapperFactory.java b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/LDAPTemplateWrapperFactory.java index 55fcfb5..26b3e54 100644 --- a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/LDAPTemplateWrapperFactory.java +++ b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/LDAPTemplateWrapperFactory.java @@ -5,8 +5,8 @@ import java.util.HashMap; import java.util.Properties; -import org.ovirt.engine.core.utils.log.Log; -import org.ovirt.engine.core.utils.log.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.ldap.core.support.LdapContextSource; /** @@ -18,7 +18,7 @@ private static HashMap<LDAPSecurityAuthentication, Class<? extends LDAPTemplateWrapper>> classesOfLDAPTemplateWrappers = new HashMap<LDAPSecurityAuthentication, Class<? extends LDAPTemplateWrapper>>(); - private static final Log log = LogFactory.getLog(LDAPTemplateWrapperFactory.class); + private static final Logger log = LoggerFactory.getLogger(LDAPTemplateWrapperFactory.class); static { registerClass(LDAPSecurityAuthentication.GSSAPI, GSSAPILdapTemplateWrapper.class); @@ -46,8 +46,7 @@ return constructor.newInstance(configuration, contextSource, userName, password, domain); } catch (IllegalAccessException | IllegalArgumentException | InstantiationException | InvocationTargetException | NoSuchMethodException | SecurityException e) { - log.error("Failed to get LDAPTemplateWrapper for security authentication " - + ldapSecurityAuthentication.toString()); + log.error("Failed to get LDAPTemplateWrapper for security authentication {}", ldapSecurityAuthentication); return null; } } diff --git a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/LdapAuthenticateUserCommand.java b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/LdapAuthenticateUserCommand.java index 6a9f60a..e998967 100644 --- a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/LdapAuthenticateUserCommand.java +++ b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/LdapAuthenticateUserCommand.java @@ -1,13 +1,16 @@ package org.ovirt.engine.extensions.aaa.builtin.kerberosldap; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import org.ovirt.engine.api.extensions.ExtMap; import org.ovirt.engine.api.extensions.aaa.Authn; import org.ovirt.engine.core.common.businessentities.aaa.LdapUser; -import org.ovirt.engine.core.utils.log.Log; -import org.ovirt.engine.core.utils.log.LogFactory; import org.ovirt.engine.extensions.aaa.builtin.kerberosldap.utils.kerberos.AuthenticationResult; public class LdapAuthenticateUserCommand extends LdapBrokerCommandBase { + + private static final Logger log = LoggerFactory.getLogger(LdapAuthenticateUserCommand.class); public LdapAuthenticateUserCommand(LdapUserPasswordBaseParameters parameters) { super(parameters); @@ -51,7 +54,7 @@ if (searchResult == null) { - log.errorFormat("Failed authenticating user: {0} to domain {1}. Ldap Query Type is {2}", + log.error("Failed authenticating user: {} to domain {}. Ldap Query Type is {}", getLoginName(), getAuthenticationDomain(), queryData.getLdapQueryType().name()); @@ -72,7 +75,7 @@ ))); setSucceeded(true); } else { - log.errorFormat("Failed authenticating. Domain is {0}. User is {1}. The user doesn't have a UPN", + log.error("Failed authenticating. Domain is {}. User is {}. The user doesn't have a UPN", getAuthenticationDomain(), getLoginName()); output.put(Authn.InvokeKeys.RESULT, Authn.AuthResult.CREDENTIALS_INCORRECT); @@ -99,6 +102,4 @@ private String constructPrincipalName(String username, String domain) { return username + '@' + domain.toUpperCase(); } - - private static final Log log = LogFactory.getLog(LdapAuthenticateUserCommand.class); } diff --git a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/LdapBrokerBase.java b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/LdapBrokerBase.java index 95916a1..38fd764 100644 --- a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/LdapBrokerBase.java +++ b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/LdapBrokerBase.java @@ -1,20 +1,22 @@ package org.ovirt.engine.extensions.aaa.builtin.kerberosldap; import java.lang.reflect.Constructor; -import org.ovirt.engine.core.utils.log.Log; -import org.ovirt.engine.core.utils.log.LogFactory; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import org.ovirt.engine.core.utils.ReflectionUtils; public abstract class LdapBrokerBase implements LdapBroker { private static final String CommandsContainerAssemblyName = LdapBrokerBase.class.getPackage().getName(); private static final String CommandPrefix = "Command"; - private static final Log log = LogFactory.getLog(LdapBrokerBase.class); + private static final Logger log = LoggerFactory.getLogger(LdapBrokerBase.class); protected abstract String getBrokerType(); public LdapReturnValueBase runAdAction(AdActionType actionType, LdapBrokerBaseParameters parameters) { - log.debug("runAdAction Entry, actionType=" + actionType.toString()); + log.debug("runAdAction Entry, actionType={}", actionType); BrokerCommandBase command = CreateCommand(actionType, parameters); return command.execute(); } @@ -28,7 +30,7 @@ } catch (Exception e) { - log.errorFormat("LdapBrokerCommandBase: Failed to get type information using reflection for Action: {0}", + log.error("LdapBrokerCommandBase: Failed to get type information using reflection for Action: {}", action); return null; } diff --git a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/LdapBrokerCommandBase.java b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/LdapBrokerCommandBase.java index 6e146c1..6f79546 100644 --- a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/LdapBrokerCommandBase.java +++ b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/LdapBrokerCommandBase.java @@ -7,15 +7,18 @@ import java.util.Map; import java.util.Properties; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import org.ovirt.engine.api.extensions.aaa.Authn; import org.ovirt.engine.core.common.businessentities.aaa.LdapGroup; import org.ovirt.engine.core.common.businessentities.aaa.LdapUser; import org.ovirt.engine.core.common.errors.VdcBllMessages; -import org.ovirt.engine.core.utils.log.Log; -import org.ovirt.engine.core.utils.log.LogFactory; import org.ovirt.engine.extensions.aaa.builtin.kerberosldap.utils.kerberos.AuthenticationResult; public abstract class LdapBrokerCommandBase extends BrokerCommandBase { + + private static final Logger log = LoggerFactory.getLogger(LdapBrokerCommandBase.class); protected static final Map<AuthenticationResult, Integer> resultsMap = new HashMap<>(); @@ -99,7 +102,7 @@ public LdapReturnValueBase execute() { boolean exceptionOccurred = true; try { - log.debugFormat("Running LDAP command: {0}", getClass().getName()); + log.debug("Running LDAP command: {}", getClass().getName()); String loginNameForKerberos = LdapBrokerUtils.modifyLoginNameForKerberos(getLoginName(), getAuthenticationDomain(), configuration); LdapCredentials ldapCredentials = new LdapCredentials(loginNameForKerberos, getPassword()); @@ -109,8 +112,8 @@ } finally { if (exceptionOccurred) { - log.error(String.format("Failed to run command %s. Domain is %s. User is %s.", - getClass().getSimpleName(), getDomain(), getLoginName())); + log.error("Failed to run command {}. Domain is {}. User is {}.", + getClass().getSimpleName(), getDomain(), getLoginName()); _ldapReturnValue.setExceptionString(VdcBllMessages.FAILED_TO_RUN_LDAP_QUERY.name()); _ldapReturnValue.setSucceeded(false); } @@ -183,7 +186,7 @@ } } } catch (RuntimeException e) { - log.infoFormat("populateGroup failed. Exception: {0}", e); + log.info("populateGroup failed. Exception: {}", e); } } @@ -226,6 +229,4 @@ GroupsDNQueryGenerator generator = new GroupsDNQueryGenerator(new HashSet<String>(dnsList)); return generator; } - - private static final Log log = LogFactory.getLog(LdapBrokerCommandBase.class); } diff --git a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/LdapBrokerUtils.java b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/LdapBrokerUtils.java index ea7e32b..7c33ed7 100644 --- a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/LdapBrokerUtils.java +++ b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/LdapBrokerUtils.java @@ -10,10 +10,11 @@ import javax.naming.ldap.LdapName; import javax.naming.ldap.Rdn; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.exception.ExceptionUtils; -import org.ovirt.engine.core.utils.log.Log; -import org.ovirt.engine.core.utils.log.LogFactory; /** * Helper class for AD issues @@ -21,8 +22,7 @@ */ public class LdapBrokerUtils { - private static final Log log = LogFactory.getLog(LdapBrokerUtils.class); - + private static final Logger log = LoggerFactory.getLogger(LdapBrokerUtils.class); /** * This method should parse a string in the following format: CN=groupname,OU=ouSub,OU=ouMain,DC=qumranet,DC=com to @@ -97,7 +97,7 @@ return searchResults; } catch (DomainNotConfiguredException ex) { - log.errorFormat("User {0} from domain {1} is a member of a group from {2} which is not configured. Please use the manage domains utility if you wish to add this domain.", + log.error("User {} from domain {} is a member of a group from {} which is not configured. Please use the manage domains utility if you wish to add this domain.", loginName, domainName, queryData.getDomain()); diff --git a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/LdapSearchExceptionHandler.java b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/LdapSearchExceptionHandler.java index 35ab353..96466d6 100644 --- a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/LdapSearchExceptionHandler.java +++ b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/LdapSearchExceptionHandler.java @@ -6,16 +6,17 @@ import javax.security.sasl.SaslException; import org.apache.commons.lang.exception.ExceptionUtils; -import org.ovirt.engine.core.utils.log.Log; -import org.ovirt.engine.core.utils.log.LogFactory; -import org.ovirt.engine.extensions.aaa.builtin.kerberosldap.serverordering.OrderingAlgorithmType; -import org.ovirt.engine.extensions.aaa.builtin.kerberosldap.utils.kerberos.AuthenticationResult; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.ldap.AuthenticationException; import org.springframework.ldap.CommunicationException; +import org.ovirt.engine.extensions.aaa.builtin.kerberosldap.serverordering.OrderingAlgorithmType; +import org.ovirt.engine.extensions.aaa.builtin.kerberosldap.utils.kerberos.AuthenticationResult; + public class LdapSearchExceptionHandler implements ExceptionHandler<LdapSearchExceptionHandlingResponse, LdapCredentials> { - private static final Log log = LogFactory.getLog(LdapSearchExceptionHandler.class); + private static final Logger log = LoggerFactory.getLogger(LdapSearchExceptionHandler.class); @Override public LdapSearchExceptionHandlingResponse handle(Exception e, LdapCredentials params) { @@ -76,12 +77,12 @@ } private void handleCommunicationException(LdapSearchExceptionHandlingResponse response, Throwable cause) { - log.error("Error in communicating with LDAP server " + cause.getMessage()); + log.error("Error in communicating with LDAP server: {}", cause.getMessage()); response.setOrderingAlgorithm(OrderingAlgorithmType.PUT_LAST).setTryNextServer(true).setTranslatedException((Exception) cause); } private void handleAuthenticationException(LdapSearchExceptionHandlingResponse response) { - log.error("Ldap authentication failed. Please check that the login name , password and path are correct. "); + log.error("Ldap authentication failed. Please check that the login name, password and path are correct."); AuthenticationResultException ex = new AuthenticationResultException(AuthenticationResult.OTHER); response.setOrderingAlgorithm(OrderingAlgorithmType.NO_OP) diff --git a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/OpenLdapGroupContextMapper.java b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/OpenLdapGroupContextMapper.java index 45415ec..af46ec9 100644 --- a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/OpenLdapGroupContextMapper.java +++ b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/OpenLdapGroupContextMapper.java @@ -10,15 +10,16 @@ import javax.naming.directory.Attribute; import javax.naming.directory.Attributes; -import org.ovirt.engine.core.compat.Guid; -import org.ovirt.engine.core.utils.log.Log; -import org.ovirt.engine.core.utils.log.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.ldap.core.ContextMapper; import org.springframework.ldap.core.DirContextAdapter; +import org.ovirt.engine.core.compat.Guid; + public class OpenLdapGroupContextMapper implements ContextMapper { - private static final Log log = LogFactory.getLog(LdapBrokerImpl.class); + private static final Logger log = LoggerFactory.getLogger(LdapBrokerImpl.class); static final String[] GROUP_ATTRIBUTE_FILTER = { memberof.name(), entryuuid.name() }; diff --git a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/OpenLdapUserContextMapper.java b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/OpenLdapUserContextMapper.java index 2c1e5d4..24b624e 100644 --- a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/OpenLdapUserContextMapper.java +++ b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/OpenLdapUserContextMapper.java @@ -16,16 +16,17 @@ import javax.naming.directory.Attribute; import javax.naming.directory.Attributes; -import org.ovirt.engine.core.common.businessentities.aaa.LdapUser; -import org.ovirt.engine.core.compat.Guid; -import org.ovirt.engine.core.utils.log.Log; -import org.ovirt.engine.core.utils.log.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.ldap.core.ContextMapper; import org.springframework.ldap.core.DirContextAdapter; +import org.ovirt.engine.core.common.businessentities.aaa.LdapUser; +import org.ovirt.engine.core.compat.Guid; + public class OpenLdapUserContextMapper implements ContextMapper { - private static final Log log = LogFactory.getLog(LdapBrokerImpl.class); + private static final Logger log = LoggerFactory.getLogger(LdapBrokerImpl.class); static final String[] USERS_ATTRIBUTE_FILTER = { entryuuid.name(), givenname.name(), uid.name(), title.name(), mail.name(), memberof.name(), diff --git a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/PrepareLdapConnectionTask.java b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/PrepareLdapConnectionTask.java index 5426a15..b0c2b7d 100644 --- a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/PrepareLdapConnectionTask.java +++ b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/PrepareLdapConnectionTask.java @@ -3,11 +3,12 @@ import java.util.Properties; import java.util.concurrent.Callable; -import org.ovirt.engine.core.utils.log.Log; -import org.ovirt.engine.core.utils.log.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.ldap.core.support.LdapContextSource; + import org.ovirt.engine.extensions.aaa.builtin.kerberosldap.utils.kerberos.AuthenticationResult; import org.ovirt.engine.extensions.aaa.builtin.kerberosldap.utils.ldap.LdapProviderType; -import org.springframework.ldap.core.support.LdapContextSource; public class PrepareLdapConnectionTask implements Callable<LDAPTemplateWrapper> { @@ -31,7 +32,7 @@ private final String domain; private final String ldapURI; - private static final Log log = LogFactory.getLog(PrepareLdapConnectionTask.class); + private static final Logger log = LoggerFactory.getLogger(PrepareLdapConnectionTask.class); @Override public LDAPTemplateWrapper call() throws Exception { diff --git a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/RHDSGroupContextMapper.java b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/RHDSGroupContextMapper.java index 6d8cdbe..f8f0230 100644 --- a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/RHDSGroupContextMapper.java +++ b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/RHDSGroupContextMapper.java @@ -10,15 +10,16 @@ import javax.naming.directory.Attribute; import javax.naming.directory.Attributes; -import org.ovirt.engine.core.compat.Guid; -import org.ovirt.engine.core.utils.log.Log; -import org.ovirt.engine.core.utils.log.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.ldap.core.ContextMapper; import org.springframework.ldap.core.DirContextAdapter; +import org.ovirt.engine.core.compat.Guid; + public class RHDSGroupContextMapper implements ContextMapper { - private static final Log log = LogFactory.getLog(LdapBrokerImpl.class); + private static final Logger log = LoggerFactory.getLogger(LdapBrokerImpl.class); static final String[] GROUP_ATTRIBUTE_FILTER = { memberof.name(), nsUniqueId.name() }; diff --git a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/RHDSRootDSEContextMapper.java b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/RHDSRootDSEContextMapper.java index c4ed0847..775734b 100644 --- a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/RHDSRootDSEContextMapper.java +++ b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/RHDSRootDSEContextMapper.java @@ -6,14 +6,14 @@ import javax.naming.directory.Attribute; import javax.naming.directory.Attributes; -import org.ovirt.engine.core.utils.log.Log; -import org.ovirt.engine.core.utils.log.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.ldap.core.ContextMapper; import org.springframework.ldap.core.DirContextAdapter; public class RHDSRootDSEContextMapper implements ContextMapper { - private static final Log log = LogFactory.getLog(RHDSRootDSEContextMapper.class); + private static final Logger log = LoggerFactory.getLogger(RHDSRootDSEContextMapper.class); protected static final String RHDS_NAMING_CONTEXT = "o=netscaperoot"; static final String[] ROOTDSE_ATTRIBUTE_FILTER = { namingContexts.name() }; diff --git a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/RHDSUserContextMapper.java b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/RHDSUserContextMapper.java index 4eae232..b041e76 100644 --- a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/RHDSUserContextMapper.java +++ b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/RHDSUserContextMapper.java @@ -17,16 +17,17 @@ import javax.naming.directory.Attribute; import javax.naming.directory.Attributes; -import org.ovirt.engine.core.common.businessentities.aaa.LdapUser; -import org.ovirt.engine.core.compat.Guid; -import org.ovirt.engine.core.utils.log.Log; -import org.ovirt.engine.core.utils.log.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.ldap.core.ContextMapper; import org.springframework.ldap.core.DirContextAdapter; +import org.ovirt.engine.core.common.businessentities.aaa.LdapUser; +import org.ovirt.engine.core.compat.Guid; + public class RHDSUserContextMapper implements ContextMapper { - private static final Log log = LogFactory.getLog(LdapBrokerImpl.class); + private static final Logger log = LoggerFactory.getLogger(LdapBrokerImpl.class); static final String[] USERS_ATTRIBUTE_FILTER = { nsUniqueId.name(), uid.name(), givenname.name(), departmentnumber.name(), title.name(), mail.name(), memberof.name(), diff --git a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/utils/ipa/OpenLdapUserContextMapper.java b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/utils/ipa/OpenLdapUserContextMapper.java index d1c847c..f25596f 100644 --- a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/utils/ipa/OpenLdapUserContextMapper.java +++ b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/utils/ipa/OpenLdapUserContextMapper.java @@ -5,15 +5,14 @@ import javax.naming.NamingException; import javax.naming.directory.Attributes; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.ldap.core.ContextMapper; import org.springframework.ldap.core.DirContextAdapter; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - public class OpenLdapUserContextMapper implements ContextMapper { - private static final Log log = LogFactory.getLog(OpenLdapUserContextMapper.class); + private static final Logger log = LoggerFactory.getLogger(OpenLdapUserContextMapper.class); @Override public Object mapFromContext(Object ctx) { -- To view, visit http://gerrit.ovirt.org/34094 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I43124cb57f54c60f6e8717678a87f151bccdf856 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alon Bar-Lev <alo...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
