Martin Peřina has uploaded a new change for review. Change subject: tools: Replace log4j with slf4j as frontend in engine-manage-domains ......................................................................
tools: Replace log4j with slf4j as frontend in engine-manage-domains Replaces log4j with slf4j as logging frontend in classes which are used in engine-manage-domains tool. Change-Id: Ic271b2d29e31abcf7bc1ca7e8f5a7c7e95fdfcf8 Bug-Url: https://bugzilla.redhat.com/1109871 Signed-off-by: Martin Perina <[email protected]> --- M backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/utils/kerberos/JndiAction.java M backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/utils/kerberos/KerberosConfigCheck.java M backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/utils/kerberos/KrbConfCreator.java M backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/tools/ConfigurationProvider.java M backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/tools/ManageDomains.java M backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/tools/ManageDomainsDAOImpl.java M backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/tools/ManageDomainsResult.java M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/EngineLocalConfig.java M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/db/StandaloneDataSource.java 9 files changed, 27 insertions(+), 18 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/50/32850/1 diff --git a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/utils/kerberos/JndiAction.java b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/utils/kerberos/JndiAction.java index 272a5f8..89e31fe 100644 --- a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/utils/kerberos/JndiAction.java +++ b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/utils/kerberos/JndiAction.java @@ -16,12 +16,13 @@ import javax.naming.directory.SearchResult; import javax.security.sasl.SaslException; -import org.apache.log4j.Logger; import org.ovirt.engine.core.compat.Guid; import org.ovirt.engine.extensions.aaa.builtin.kerberosldap.utils.ipa.RHDSUserContextMapper; import org.ovirt.engine.extensions.aaa.builtin.kerberosldap.utils.ldap.LdapProviderType; import org.ovirt.engine.extensions.aaa.builtin.kerberosldap.utils.ldap.LdapSRVLocator; import org.ovirt.engine.extensions.aaa.builtin.kerberosldap.utils.ldap.RootDSEData; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * JAAS Privileged action to be run when KerbersUtil successfully authenticates. This action performs ldap query to @@ -35,7 +36,7 @@ private final StringBuffer userGuid; private List<String> ldapServers; private final String defaultLdapServerPort; - private final static Logger log = Logger.getLogger(JndiAction.class); + private final static Logger log = LoggerFactory.getLogger(JndiAction.class); public JndiAction(String userName, String domainName, StringBuffer userGuid, LdapProviderType ldapProviderType, List<String> ldapServers, String defaultLdapServerPort) { this.userName = userName; diff --git a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/utils/kerberos/KerberosConfigCheck.java b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/utils/kerberos/KerberosConfigCheck.java index 9557d59..a8b35ea 100644 --- a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/utils/kerberos/KerberosConfigCheck.java +++ b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/utils/kerberos/KerberosConfigCheck.java @@ -14,8 +14,9 @@ import javax.security.auth.login.LoginContext; import javax.security.auth.login.LoginException; -import org.apache.log4j.Logger; import org.ovirt.engine.extensions.aaa.builtin.kerberosldap.utils.ldap.LdapProviderType; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Utility to verify Kerberos installation @@ -25,7 +26,7 @@ private LoginContext lc; private final List<String> ldapServers; private String defaultLdapServerPort; - private final static Logger log = Logger.getLogger(KerberosConfigCheck.class); + private final static Logger log = LoggerFactory.getLogger(KerberosConfigCheck.class); public enum Arguments { domains, diff --git a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/utils/kerberos/KrbConfCreator.java b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/utils/kerberos/KrbConfCreator.java index 74b4072..d82f951 100644 --- a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/utils/kerberos/KrbConfCreator.java +++ b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/utils/kerberos/KrbConfCreator.java @@ -16,8 +16,9 @@ import java.util.Scanner; import org.apache.commons.lang.StringUtils; -import org.apache.log4j.Logger; import org.ovirt.engine.extensions.aaa.builtin.kerberosldap.utils.dns.DnsSRVLocator.DnsSRVResult; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * A tool to create a krb5.conf file from a template using the supplied domain list. For each domain an SRV DNS request @@ -38,7 +39,7 @@ private Map<String, List<String>> ldapServersPerGSSAPIDomains; private String domainRealmMappingFile; - private final static Logger log = Logger.getLogger(KrbConfCreator.class); + private final static Logger log = LoggerFactory.getLogger(KrbConfCreator.class); public KrbConfCreator(String domains, boolean useDnsLookup, diff --git a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/tools/ConfigurationProvider.java b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/tools/ConfigurationProvider.java index b36c663..bdae1c9 100644 --- a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/tools/ConfigurationProvider.java +++ b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/tools/ConfigurationProvider.java @@ -16,15 +16,16 @@ import java.io.IOException; import java.util.EnumMap; -import org.apache.log4j.Logger; import org.ovirt.engine.core.common.config.ConfigValues; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class ConfigurationProvider { private EnumMap<ConfigValues, String> configVals = new EnumMap<ConfigValues, String>(ConfigValues.class); private String engineConfigExecutable; private String engineConfigProperties; - private final static Logger log = Logger.getLogger(ManageDomainsDAOImpl.class); + private final static Logger log = LoggerFactory.getLogger(ManageDomainsDAOImpl.class); public ConfigurationProvider(String adUserName, String adUserPassword, diff --git a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/tools/ManageDomains.java b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/tools/ManageDomains.java index fbda242..092c1c1 100644 --- a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/tools/ManageDomains.java +++ b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/tools/ManageDomains.java @@ -50,7 +50,6 @@ import java.util.Set; import org.apache.commons.lang.StringUtils; -import org.apache.log4j.Logger; import org.ovirt.engine.core.common.config.ConfigValues; import org.ovirt.engine.core.common.utils.Pair; import org.ovirt.engine.extensions.aaa.builtin.kerberosldap.utils.dns.DnsSRVLocator; @@ -62,6 +61,8 @@ import org.ovirt.engine.extensions.aaa.builtin.kerberosldap.utils.kerberos.KrbConfCreator; import org.ovirt.engine.extensions.aaa.builtin.kerberosldap.utils.ldap.LdapProviderType; import org.ovirt.engine.extensions.aaa.builtin.kerberosldap.utils.ldap.LdapSRVLocator; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class ManageDomains { @@ -92,7 +93,7 @@ private ManageDomainsDAOImpl daoImpl; private boolean useDnsLookup; - private final static Logger log = Logger.getLogger(ManageDomains.class); + private final static Logger log = LoggerFactory.getLogger(ManageDomains.class); private final ManageDomainsArguments args; diff --git a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/tools/ManageDomainsDAOImpl.java b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/tools/ManageDomainsDAOImpl.java index 50f2cea..f1aff21 100644 --- a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/tools/ManageDomainsDAOImpl.java +++ b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/tools/ManageDomainsDAOImpl.java @@ -7,8 +7,9 @@ import javax.sql.DataSource; -import org.apache.log4j.Logger; import org.ovirt.engine.core.utils.db.StandaloneDataSource; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class ManageDomainsDAOImpl implements ManageDomainsDAO { @@ -16,7 +17,7 @@ private DataSource ds; private String actionQuery = "select attach_user_to_role(?,?,?,?)"; private String selectQuery = "select get_user_permissions_for_domain(?,?)"; - private final static Logger log = Logger.getLogger(ManageDomainsDAOImpl.class); + private final static Logger log = LoggerFactory.getLogger(ManageDomainsDAOImpl.class); public ManageDomainsDAOImpl() throws SQLException { ds = new StandaloneDataSource(); diff --git a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/tools/ManageDomainsResult.java b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/tools/ManageDomainsResult.java index f7ee1bf..ca33187 100644 --- a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/tools/ManageDomainsResult.java +++ b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/tools/ManageDomainsResult.java @@ -1,7 +1,8 @@ package org.ovirt.engine.extensions.aaa.builtin.tools; import org.apache.commons.lang.StringUtils; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /* * Exception during configure domains. If this exception occurred its probably because @@ -12,7 +13,7 @@ private ManageDomainsResultEnum enumResult; private int exitCode; private String detailedMessage; - private final static Logger log = Logger.getLogger(ManageDomainsResult.class); + private final static Logger log = LoggerFactory.getLogger(ManageDomainsResult.class); /** * This constructor is present exception without additional params. we use this one without additional info, only diff --git a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/EngineLocalConfig.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/EngineLocalConfig.java index 3f28909..76de6e3 100644 --- a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/EngineLocalConfig.java +++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/EngineLocalConfig.java @@ -9,9 +9,10 @@ import java.util.Map; import org.apache.commons.lang.StringUtils; -import org.apache.log4j.Logger; import org.ovirt.engine.core.uutils.config.ShellLikeConfd; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * This class stores the local configuration (understanding local as the @@ -21,7 +22,7 @@ */ public class EngineLocalConfig extends ShellLikeConfd { // The log: - private static final Logger log = Logger.getLogger(EngineLocalConfig.class); + private static final Logger log = LoggerFactory.getLogger(EngineLocalConfig.class); // Default files for defaults and overridden values: private static final String DEFAULTS_PATH = "/usr/share/ovirt-engine/conf/engine.conf.defaults"; diff --git a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/db/StandaloneDataSource.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/db/StandaloneDataSource.java index 1ac27c1..b579f2c 100644 --- a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/db/StandaloneDataSource.java +++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/db/StandaloneDataSource.java @@ -13,12 +13,13 @@ import javax.sql.DataSource; -import org.apache.log4j.Logger; import org.ovirt.engine.core.utils.EngineLocalConfig; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class StandaloneDataSource implements DataSource { // The log: - private final static Logger log = Logger.getLogger(StandaloneDataSource.class); + private final static Logger log = LoggerFactory.getLogger(StandaloneDataSource.class); // Names of the properties expected in the engine configuration file: private static final String ENGINE_DB_DRIVER = "ENGINE_DB_DRIVER"; -- To view, visit http://gerrit.ovirt.org/32850 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic271b2d29e31abcf7bc1ca7e8f5a7c7e95fdfcf8 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Martin Peřina <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
