Alon Bar-Lev has uploaded a new change for review. Change subject: core: drop commons-logging ......................................................................
core: drop commons-logging Bug-Url: https://bugzilla.redhat.com/1109871 Change-Id: I8903f7b605017f2c5bf08768d6462afdbaf14833 Signed-off-by: Alon Bar-Lev <[email protected]> --- M backend/manager/modules/bll/pom.xml M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/VdsFreeMemoryChecker.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/QueriesCommandBaseTest.java M backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/queries/ConfigValuesTest.java M backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/backendcompat/PropertyInfo.java M backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/backendcompat/TypeCompat.java M backend/manager/modules/compat/src/main/modules/org/ovirt/engine/core/compat/main/module.xml M backend/manager/modules/dal/pom.xml M backend/manager/modules/scheduler/src/main/java/org/ovirt/engine/core/utils/timer/JobWrapper.java M backend/manager/modules/scheduler/src/main/java/org/ovirt/engine/core/utils/timer/SchedulerUtilQuartzImpl.java M backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/EnumValueAutoCompleter.java M backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SyntaxChecker.java M backend/manager/modules/searchbackend/src/main/modules/org/ovirt/engine/core/searchbackend/main/module.xml M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/log/Log.java M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/log/LogFactory.java M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ssl/AuthSSLProtocolSocketFactory.java M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ssl/AuthSSLX509TrustManager.java M backend/manager/modules/utils/src/main/modules/org/ovirt/engine/core/utils/main/module.xml M backend/manager/modules/vdsbroker/Readme.txt M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/jsonrpc/FutureMap.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/jsonrpc/JsonRpcUtils.java M backend/manager/tools/src/main/modules/org/ovirt/engine/core/tools/main/module.xml D frontend/webadmin/modules/gwt-extension/src/main/java/org/ovirt/engine/ui/uioverrides/org/apache/commons/logging/Log.java D frontend/webadmin/modules/gwt-extension/src/main/java/org/ovirt/engine/ui/uioverrides/org/apache/commons/logging/LogFactory.java M frontend/webadmin/modules/gwt-extension/src/main/java/org/ovirt/engine/ui/uioverrides/org/ovirt/engine/core/compat/StringFormat.java A frontend/webadmin/modules/gwt-extension/src/main/java/org/ovirt/engine/ui/uioverrides/org/slf4j/Logger.java A frontend/webadmin/modules/gwt-extension/src/main/java/org/ovirt/engine/ui/uioverrides/org/slf4j/LoggerFactory.java M frontend/webadmin/modules/pom.xml M frontend/webadmin/modules/userportal-gwtp/pom.xml M frontend/webadmin/modules/webadmin/pom.xml M pom.xml 31 files changed, 288 insertions(+), 361 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/14/34214/1 diff --git a/backend/manager/modules/bll/pom.xml b/backend/manager/modules/bll/pom.xml index 7e18716..6d70c82 100644 --- a/backend/manager/modules/bll/pom.xml +++ b/backend/manager/modules/bll/pom.xml @@ -144,14 +144,6 @@ <scope>test</scope> </dependency> - <!-- Needed until slf4j will be used as logging frontend in the whole project --> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>jcl-over-slf4j</artifactId> - <version>${slf4j.version}</version> - <scope>test</scope> - </dependency> - <dependency> <groupId>commons-configuration</groupId> <artifactId>commons-configuration</artifactId> diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/VdsFreeMemoryChecker.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/VdsFreeMemoryChecker.java index 35a147b..4e96e7a 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/VdsFreeMemoryChecker.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/VdsFreeMemoryChecker.java @@ -1,16 +1,16 @@ package org.ovirt.engine.core.bll.scheduling; -import org.apache.commons.logging.Log; import org.ovirt.engine.core.common.businessentities.VDS; import org.ovirt.engine.core.common.businessentities.VM; import org.ovirt.engine.core.dal.dbbroker.DbFacade; -import org.ovirt.engine.core.utils.log.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class VdsFreeMemoryChecker { private RunVmDelayer delayer; - private static final Log log = LogFactory.getLog(VdsFreeMemoryChecker.class); + private static final Logger log = LoggerFactory.getLogger(VdsFreeMemoryChecker.class); public VdsFreeMemoryChecker(RunVmDelayer delayer) { this.delayer = delayer; @@ -25,9 +25,8 @@ return false; } - if (log.isDebugEnabled()) { - log.debug("not enough memory on host. throttling..."); - } + log.debug("not enough memory on host. throttling..."); + // not enough memory to run the vm. delay execution to free up pending memory. delayer.delay(vds.getId()); diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/QueriesCommandBaseTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/QueriesCommandBaseTest.java index ff5eaa3..e1012bf 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/QueriesCommandBaseTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/QueriesCommandBaseTest.java @@ -6,8 +6,6 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.jgroups.util.UUID; import org.junit.After; import org.junit.Before; @@ -18,10 +16,12 @@ import org.ovirt.engine.core.common.queries.VdcQueryType; import org.ovirt.engine.core.compat.Guid; import org.ovirt.engine.core.utils.ThreadLocalParamsContainer; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** A test case for the {@link QueriesCommandBase} class. */ public class QueriesCommandBaseTest { - private static final Log log = LogFactory.getLog(QueriesCommandBaseTest.class); + private static final Logger log = LoggerFactory.getLogger(QueriesCommandBaseTest.class); /* Getters and Setters tests */ @@ -74,7 +74,7 @@ shouldBeAbleToRunQuery = isInternalExecution || isUserAdmin; } - log.debug("Running on query: " + toString()); + log.debug("Running on query: {}", this); String sessionId = getClass().getSimpleName(); diff --git a/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/queries/ConfigValuesTest.java b/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/queries/ConfigValuesTest.java index 7127ef7..0610980 100644 --- a/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/queries/ConfigValuesTest.java +++ b/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/queries/ConfigValuesTest.java @@ -5,13 +5,13 @@ import java.util.HashSet; import java.util.Set; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.junit.Test; import org.ovirt.engine.core.common.config.ConfigValues; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class ConfigValuesTest { - private static final Log log = LogFactory.getLog(ConfigValuesTest.class); + private static final Logger log = LoggerFactory.getLogger(ConfigValuesTest.class); private static final Set<String> configValuesEnumNames = getConfigValuesEnumNames(); private static Set<String> getConfigValuesEnumNames() { @@ -28,7 +28,7 @@ boolean missingKey = false; for (ConfigurationValues configValue : ConfigurationValues.values()) { if (!configValuesEnumNames.contains(configValue.toString())) { - log.error("Found missing key: " + configValue.toString()); + log.error("Found missing key: {}", configValue); missingKey = true; break; } diff --git a/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/backendcompat/PropertyInfo.java b/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/backendcompat/PropertyInfo.java index ec6d1f6..d8e6bcb 100644 --- a/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/backendcompat/PropertyInfo.java +++ b/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/backendcompat/PropertyInfo.java @@ -2,12 +2,12 @@ import java.beans.PropertyDescriptor; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; //This will be a wrapper for import java.beans.PropertyDescriptor; public class PropertyInfo { - private static final Log log = LogFactory.getLog(PropertyInfo.class); + private static final Logger log = LoggerFactory.getLogger(PropertyInfo.class); private PropertyDescriptor pd; @@ -24,8 +24,9 @@ try { returnValue = pd.getReadMethod().invoke(obj); } catch (Exception e) { - log.warn("Unable to get value of property: " + pd.getDisplayName() + " for class " - + obj.getClass().getName()); + log.warn("Unable to get value of property: '{}' for class {}: {}", + pd.getDisplayName(), obj.getClass().getName(), e.getMessage()); + log.debug("Exception", e); } return returnValue == null ? defaultValue : returnValue; } diff --git a/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/backendcompat/TypeCompat.java b/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/backendcompat/TypeCompat.java index 14f188c..40ff3dc 100644 --- a/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/backendcompat/TypeCompat.java +++ b/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/backendcompat/TypeCompat.java @@ -7,14 +7,14 @@ import java.util.Map; import java.util.Set; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; // This will wrap java beans introspection public class TypeCompat { private static final String CLASS = "class"; - private static final Log log = LogFactory.getLog(TypeCompat.class); + private static final Logger log = LoggerFactory.getLogger(TypeCompat.class); public static List<PropertyInfo> getProperties(Class<?> type) { List<PropertyInfo> returnValue = new ArrayList<PropertyInfo>(); @@ -53,8 +53,9 @@ String stringValue = value != null ? value.toString() : null; values.put(propertyName, stringValue); } catch (Exception e) { - log.warn("Unable to get value of property: " + pd.getDisplayName() + " for class " - + obj.getClass().getName()); + log.warn("Unable to get value of property: '{}' for class {}: {}", + pd.getDisplayName(), obj.getClass().getName(), e.getMessage()); + log.debug("Exception", e); } } if (hitCount == properties.size()) { diff --git a/backend/manager/modules/compat/src/main/modules/org/ovirt/engine/core/compat/main/module.xml b/backend/manager/modules/compat/src/main/modules/org/ovirt/engine/core/compat/main/module.xml index 50cf235..c3cdf82 100644 --- a/backend/manager/modules/compat/src/main/modules/org/ovirt/engine/core/compat/main/module.xml +++ b/backend/manager/modules/compat/src/main/modules/org/ovirt/engine/core/compat/main/module.xml @@ -8,7 +8,7 @@ <dependencies> <module name="javax.api"/> - <module name="org.apache.commons.logging"/> + <module name="org.slf4j"/> </dependencies> </module> diff --git a/backend/manager/modules/dal/pom.xml b/backend/manager/modules/dal/pom.xml index ec246b0..565dff4 100644 --- a/backend/manager/modules/dal/pom.xml +++ b/backend/manager/modules/dal/pom.xml @@ -73,14 +73,6 @@ <scope>test</scope> </dependency> - <!-- Needed until slf4j will be used as logging frontend in the whole project --> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>jcl-over-slf4j</artifactId> - <version>${slf4j.version}</version> - <scope>test</scope> - </dependency> - </dependencies> <build> <filters> diff --git a/backend/manager/modules/scheduler/src/main/java/org/ovirt/engine/core/utils/timer/JobWrapper.java b/backend/manager/modules/scheduler/src/main/java/org/ovirt/engine/core/utils/timer/JobWrapper.java index bd9e632..41da3e3 100644 --- a/backend/manager/modules/scheduler/src/main/java/org/ovirt/engine/core/utils/timer/JobWrapper.java +++ b/backend/manager/modules/scheduler/src/main/java/org/ovirt/engine/core/utils/timer/JobWrapper.java @@ -4,12 +4,12 @@ import java.util.HashMap; import java.util.Map; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.quartz.Job; import org.quartz.JobDataMap; import org.quartz.JobExecutionContext; import org.quartz.JobExecutionException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * The JobWrapper gives 2 functionalities: 1. Enable running a method within an @@ -20,7 +20,7 @@ // static data members private static Map<String, Method> cachedMethods = new HashMap<String, Method>(); - private final Log log = LogFactory.getLog(SchedulerUtilQuartzImpl.class); + private final Logger log = LoggerFactory.getLogger(SchedulerUtilQuartzImpl.class); /** * execute a method within an instance. The instance and the method name are @@ -48,8 +48,8 @@ } else { methodToRun = getMethodToRun(instance, methodName); if (methodToRun == null) { - log.error("could not find the required method " + methodName + " on instance of " - + instance.getClass().getSimpleName()); + log.error("could not find the required method '{}' on instance of {}", + methodName, instance.getClass().getSimpleName()); return; } @@ -59,7 +59,8 @@ } methodToRun.invoke(instance, methodParams); } catch (Exception e) { - log.error("Failed to invoke scheduled method " + methodName, e); + log.error("Failed to invoke scheduled method {}: {}", methodName, e.getMessage()); + log.debug("Exception", e); JobExecutionException jee = new JobExecutionException("failed to execute job"); jee.setStackTrace(e.getStackTrace()); throw jee; diff --git a/backend/manager/modules/scheduler/src/main/java/org/ovirt/engine/core/utils/timer/SchedulerUtilQuartzImpl.java b/backend/manager/modules/scheduler/src/main/java/org/ovirt/engine/core/utils/timer/SchedulerUtilQuartzImpl.java index 74382aa..2d6da99 100644 --- a/backend/manager/modules/scheduler/src/main/java/org/ovirt/engine/core/utils/timer/SchedulerUtilQuartzImpl.java +++ b/backend/manager/modules/scheduler/src/main/java/org/ovirt/engine/core/utils/timer/SchedulerUtilQuartzImpl.java @@ -22,8 +22,6 @@ import javax.ejb.TransactionAttribute; import javax.ejb.TransactionAttributeType; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.ovirt.engine.core.common.config.Config; import org.ovirt.engine.core.common.config.ConfigValues; import org.ovirt.engine.core.utils.ejb.BeanProxyType; @@ -37,6 +35,8 @@ import org.quartz.Trigger; import org.quartz.TriggerKey; import org.quartz.impl.StdSchedulerFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; // Here we use a Singleton bean, names Scheduler. // The @Startup annotation is to make sure the bean is initialized on startup. @@ -62,7 +62,7 @@ private static final String TRIGGER_PREFIX = "trigger"; // members - private final Log log = LogFactory.getLog(SchedulerUtilQuartzImpl.class); + private final Logger log = LoggerFactory.getLogger(SchedulerUtilQuartzImpl.class); private Scheduler sched; private final AtomicLong sequenceNumber = new AtomicLong(Long.MIN_VALUE); @@ -86,7 +86,8 @@ sched.start(); sched.getListenerManager().addJobListener(new FixedDelayJobListener(this), jobGroupEquals(Scheduler.DEFAULT_GROUP)); } catch (SchedulerException se) { - log.error("there is a problem with the underlying Scheduler.", se); + log.error("there is a problem with the underlying Scheduler: {}", se.getMessage()); + log.debug("Exception", se); } } @@ -97,7 +98,8 @@ sched.shutdown(); } } catch (SchedulerException e) { - log.error("Failed to shutdown Quartz service", e); + log.error("Failed to shutdown Quartz service: {}", e.getMessage()); + log.debug("Exception", e); } } @@ -147,7 +149,8 @@ try { sched.scheduleJob(job, trigger); } catch (SchedulerException se) { - log.error("failed to schedule job", se); + log.error("failed to schedule job: {}", se.getMessage()); + log.debug("Exception", se); } } @@ -298,7 +301,8 @@ .build(); sched.scheduleJob(job, trigger); } catch (Exception se) { - log.error("failed to schedule job", se); + log.error("failed to schedule job: {}", se.getMessage()); + log.debug("Exception", se); } return job.getKey().getName(); @@ -332,7 +336,8 @@ sched.rescheduleJob(triggerKey(oldTriggerName, oldTriggerGroup), newTrigger); } } catch (SchedulerException se) { - log.error("failed to reschedule the job", se); + log.error("failed to reschedule the job: {}", se.getMessage()); + log.debug("Exception", se); } } @@ -347,7 +352,8 @@ try { sched.pauseJob(jobKey(jobId, Scheduler.DEFAULT_GROUP)); } catch (SchedulerException se) { - log.error("failed to pause a job with id=" + jobId, se); + log.error("failed to pause a job with id={}: {}", jobId, se.getMessage()); + log.debug("Exception", se); } } @@ -363,7 +369,8 @@ try { sched.deleteJob(jobKey(jobId, Scheduler.DEFAULT_GROUP)); } catch (SchedulerException se) { - log.error("failed to delete a job with id=" + jobId, se); + log.error("failed to delete a job with id={}: {}", jobId, se.getMessage()); + log.debug("Exception", se); } } @@ -379,7 +386,8 @@ try { sched.resumeJob(jobKey(jobId, Scheduler.DEFAULT_GROUP)); } catch (SchedulerException se) { - log.error("failed to pause a job with id=" + jobId, se); + log.error("failed to pause a job with id={}: {}", jobId, se.getMessage()); + log.debug("Exception", se); } } @@ -400,10 +408,11 @@ rescheduleAJob(oldTriggerKey.getName(), oldTriggerKey.getGroup(), newTrigger); } else { - log.error("failed to trigger a job with id=" + jobId + ", job has no trigger"); + log.error("failed to trigger a job with id={}, job has no trigger", jobId); } } catch (SchedulerException se) { - log.error("failed to trigger a job with id=" + jobId, se); + log.error("failed to trigger a job with id={}: {}", jobId, se.getMessage()); + log.debug("Exception", se); } } @@ -418,7 +427,8 @@ try { sched.shutdown(true); } catch (SchedulerException se) { - log.error("failed to shut down the scheduler", se); + log.error("failed to shut down the scheduler: {}", se.getMessage()); + log.debug("Exception", se); } } diff --git a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/EnumValueAutoCompleter.java b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/EnumValueAutoCompleter.java index feab8ef..cee478a 100644 --- a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/EnumValueAutoCompleter.java +++ b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/EnumValueAutoCompleter.java @@ -2,11 +2,14 @@ import java.util.HashMap; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.ovirt.engine.core.common.businessentities.Identifiable; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class EnumValueAutoCompleter extends BaseAutoCompleter implements IConditionValueAutoCompleter { + + private static final Logger log = LoggerFactory.getLogger(EnumValueAutoCompleter.class); + private final HashMap<String, Integer> mEnumValues = new HashMap<String, Integer>(); public <E extends Enum<E> & Identifiable> EnumValueAutoCompleter(Class<E> enumerationType) { @@ -17,7 +20,8 @@ mEnumValues.put(ValName, val.getValue()); mVerbs.add(ValName); } catch (RuntimeException e) { - log.error("EnumValueAutoCompleter. Failed to add " + ValName + " .Exception : " + e.getMessage(), e); + log.error("EnumValueAutoCompleter. Failed to add '{}': {}", ValName, e.getMessage()); + log.debug("Exception", e); } } @@ -31,6 +35,4 @@ } return retval; } - - private static final Log log = LogFactory.getLog(EnumValueAutoCompleter.class); } diff --git a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SyntaxChecker.java b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SyntaxChecker.java index 0984b78..1a75d25 100644 --- a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SyntaxChecker.java +++ b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SyntaxChecker.java @@ -9,8 +9,6 @@ import java.util.ListIterator; import java.util.Map; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.ovirt.engine.core.common.config.Config; import org.ovirt.engine.core.common.config.ConfigValues; import org.ovirt.engine.core.common.errors.SqlInjectionException; @@ -19,10 +17,14 @@ import org.ovirt.engine.core.compat.Regex; import org.ovirt.engine.core.compat.StringFormat; import org.ovirt.engine.core.compat.StringHelper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class SyntaxChecker implements ISyntaxChecker { public static final String TAG_COLUMN_NAME_IN_CRITERIA = "tag_name"; + + private static final Logger log = LoggerFactory.getLogger(SyntaxChecker.class); public static final String SORTBY = "SORTBY"; public static final String SORTDIR_ASC = "ASC"; @@ -95,7 +97,7 @@ try { sqlInjectionChecker = getSqlInjectionChecker(); } catch (Exception e) { - log.debug("Failed to load Sql Injection Checker. " + e.getMessage()); + log.debug("Failed to load Sql Injection Checker: {}", e.getMessage()); } } @@ -940,7 +942,7 @@ throw new SqlInjectionException(); } } - log.trace("Search: " + retval); + log.trace("Search: {}", retval); } return retval; } @@ -984,7 +986,7 @@ try { type = PagingType.valueOf(val); } catch (Exception e) { - log.error("Unknown paging type " + val); + log.error("Unknown paging type '{}'", val); } return type; @@ -1180,8 +1182,6 @@ } return conditionData; } - - private static final Log log = LogFactory.getLog(SyntaxChecker.class); private static enum PgMajorRelease { PG8(8), diff --git a/backend/manager/modules/searchbackend/src/main/modules/org/ovirt/engine/core/searchbackend/main/module.xml b/backend/manager/modules/searchbackend/src/main/modules/org/ovirt/engine/core/searchbackend/main/module.xml index 96abcb5..5eaf4f2 100644 --- a/backend/manager/modules/searchbackend/src/main/modules/org/ovirt/engine/core/searchbackend/main/module.xml +++ b/backend/manager/modules/searchbackend/src/main/modules/org/ovirt/engine/core/searchbackend/main/module.xml @@ -8,10 +8,10 @@ <dependencies> <module name="javax.api"/> - <module name="org.apache.commons.logging"/> <module name="org.ovirt.engine.core.common"/> <module name="org.ovirt.engine.core.compat"/> <module name="org.ovirt.engine.core.utils"/> + <module name="org.slf4j"/> </dependencies> </module> diff --git a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/log/Log.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/log/Log.java index a3e7f0f..827851b 100644 --- a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/log/Log.java +++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/log/Log.java @@ -4,110 +4,93 @@ import org.ovirt.engine.core.utils.ThreadLocalParamsContainer; -public class Log implements org.apache.commons.logging.Log { +public class Log { private static final String CORRELATION_ID_MESSAGE_FORMAT = "[%s] %s"; - private final org.apache.commons.logging.Log log; - public Log(org.apache.commons.logging.Log log) { + private final org.slf4j.Logger log; + + public Log(org.slf4j.Logger log) { this.log = log; } - @Override - public void debug(Object arg0) { + public void debug(Object msg) { if (isDebugEnabled()) { - log.debug(addPrefixToLogMessage(arg0)); + log.debug(addPrefixToLogMessage(msg)); } } - @Override - public void debug(Object arg0, Throwable arg1) { + public void debug(Object msg, Throwable t) { if (isDebugEnabled()) { - log.debug(addPrefixToLogMessage(arg0), arg1); + log.debug(addPrefixToLogMessage(msg), t); } } - @Override - public void error(Object arg0) { - log.error(addPrefixToLogMessage(arg0)); + public void error(Object msg) { + log.error(addPrefixToLogMessage(msg)); } - @Override - public void error(Object arg0, Throwable arg1) { - log.error(addPrefixToLogMessage(arg0), arg1); + public void error(Object msg, Throwable t) { + log.error(addPrefixToLogMessage(msg), t); } - @Override - public void fatal(Object arg0) { - log.fatal(addPrefixToLogMessage(arg0)); + public void fatal(Object msg) { + log.error(addPrefixToLogMessage(msg)); } - @Override - public void fatal(Object arg0, Throwable arg1) { - log.fatal(addPrefixToLogMessage(arg0), arg1); + public void fatal(Object msg, Throwable t) { + log.error(addPrefixToLogMessage(msg), t); } - @Override - public void info(Object arg0) { - log.info(addPrefixToLogMessage(arg0)); + public void info(Object msg) { + log.info(addPrefixToLogMessage(msg)); } - @Override - public void info(Object arg0, Throwable arg1) { - log.info(addPrefixToLogMessage(arg0), arg1); + public void info(Object msg, Throwable t) { + log.info(addPrefixToLogMessage(msg), t); } - @Override public boolean isDebugEnabled() { return log.isDebugEnabled(); } - @Override public boolean isErrorEnabled() { return log.isErrorEnabled(); } - @Override public boolean isFatalEnabled() { - return log.isFatalEnabled(); + return log.isErrorEnabled(); } - @Override public boolean isInfoEnabled() { return log.isInfoEnabled(); } - @Override public boolean isTraceEnabled() { return log.isTraceEnabled(); } - @Override public boolean isWarnEnabled() { return log.isWarnEnabled(); } - @Override - public void trace(Object arg0) { + public void trace(Object msg) { if (log.isTraceEnabled()) { - log.trace(addPrefixToLogMessage(arg0)); + log.trace(addPrefixToLogMessage(msg)); } } - @Override - public void trace(Object arg0, Throwable arg1) { + public void trace(Object msg, Throwable t) { if (log.isTraceEnabled()) { - log.trace(addPrefixToLogMessage(arg0), arg1); + log.trace(addPrefixToLogMessage(msg), t); } } - @Override - public void warn(Object arg0) { - log.warn(addPrefixToLogMessage(arg0)); + public void warn(Object msg) { + log.warn(addPrefixToLogMessage(msg)); } - @Override - public void warn(Object arg0, Throwable arg1) { - log.warn(addPrefixToLogMessage(arg0), arg1); + public void warn(Object msg, Throwable t) { + log.warn(addPrefixToLogMessage(msg), t); } public void traceFormat(String formatString, Object... args) { @@ -176,10 +159,14 @@ return null; } - private Object addPrefixToLogMessage(Object logMessage) { + private String addPrefixToLogMessage(Object logMessage) { String correlationId = ThreadLocalParamsContainer.getCorrelationId(); if (correlationId == null) { - return logMessage; + if (logMessage == null) { + return null; + } else { + return logMessage.toString(); + } } return String.format(CORRELATION_ID_MESSAGE_FORMAT, correlationId, logMessage); } diff --git a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/log/LogFactory.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/log/LogFactory.java index 15a5876..3ba98e9 100644 --- a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/log/LogFactory.java +++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/log/LogFactory.java @@ -3,10 +3,12 @@ import javax.enterprise.inject.Produces; import javax.enterprise.inject.spi.InjectionPoint; +import org.slf4j.LoggerFactory; + public class LogFactory { public static Log getLog(Class<?> loggedClass) { - return new Log(org.apache.commons.logging.LogFactory.getLog(loggedClass)); + return new Log(LoggerFactory.getLogger(loggedClass)); } /** diff --git a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ssl/AuthSSLProtocolSocketFactory.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ssl/AuthSSLProtocolSocketFactory.java index c48735f..d465c8f 100644 --- a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ssl/AuthSSLProtocolSocketFactory.java +++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ssl/AuthSSLProtocolSocketFactory.java @@ -52,8 +52,8 @@ import org.apache.commons.httpclient.ConnectTimeoutException; import org.apache.commons.httpclient.params.HttpConnectionParams; import org.apache.commons.httpclient.protocol.SecureProtocolSocketFactory; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * <p> @@ -186,7 +186,7 @@ public class AuthSSLProtocolSocketFactory implements SecureProtocolSocketFactory { /** Log object for this class. */ - private static final Log LOG = LogFactory.getLog(AuthSSLProtocolSocketFactory.class); + private static final Logger log = LoggerFactory.getLogger(AuthSSLProtocolSocketFactory.class); private final SSLContext sslcontext; @@ -216,7 +216,7 @@ } private static TrustManager[] createTrustManagers(TrustManager[] trustmanagers) throws GeneralSecurityException { - LOG.debug("Initializing trust manager"); + log.debug("Initializing trust manager"); for (int i = 0; i < trustmanagers.length; i++) { if (trustmanagers[i] instanceof X509TrustManager) { trustmanagers[i] = new AuthSSLX509TrustManager((X509TrustManager) trustmanagers[i]); @@ -232,13 +232,13 @@ sslcontext.init(keymanagers, trustmanagers, null); return sslcontext; } catch (NoSuchAlgorithmException e) { - LOG.error(e.getMessage(), e); + log.error("Exception", e); throw new AuthSSLInitializationException("Unsupported algorithm exception: " + e.getMessage()); } catch (KeyStoreException e) { - LOG.error(e.getMessage(), e); + log.error("Exception", e); throw new AuthSSLInitializationException("Keystore exception: " + e.getMessage()); } catch (GeneralSecurityException e) { - LOG.error(e.getMessage(), e); + log.error("Exception", e); throw new AuthSSLInitializationException("Key management exception: " + e.getMessage()); } } diff --git a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ssl/AuthSSLX509TrustManager.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ssl/AuthSSLX509TrustManager.java index 66324d7..16d20e2 100644 --- a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ssl/AuthSSLX509TrustManager.java +++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ssl/AuthSSLX509TrustManager.java @@ -35,8 +35,8 @@ import javax.net.ssl.X509TrustManager; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * <p> @@ -54,7 +54,7 @@ private X509TrustManager defaultTrustManager = null; /** Log object for this class. */ - private static final Log LOG = LogFactory.getLog(AuthSSLX509TrustManager.class); + private static final Logger log = LoggerFactory.getLogger(AuthSSLX509TrustManager.class); /** * Constructor for AuthSSLX509TrustManager. @@ -71,17 +71,7 @@ * @see javax.net.ssl.X509TrustManager#checkClientTrusted(X509Certificate[], String authType) */ public void checkClientTrusted(X509Certificate[] certificates, String authType) throws CertificateException { - if (LOG.isDebugEnabled() && certificates != null) { - for (int c = 0; c < certificates.length; c++) { - X509Certificate cert = certificates[c]; - LOG.debug(" Client certificate " + (c + 1) + ":"); - LOG.debug(" Subject DN: " + cert.getSubjectDN()); - LOG.debug(" Signature Algorithm: " + cert.getSigAlgName()); - LOG.debug(" Valid from: " + cert.getNotBefore()); - LOG.debug(" Valid until: " + cert.getNotAfter()); - LOG.debug(" Issuer: " + cert.getIssuerDN()); - } - } + logCertificate(certificates, "Client"); defaultTrustManager.checkClientTrusted(certificates, authType); } @@ -89,17 +79,7 @@ * @see javax.net.ssl.X509TrustManager#checkServerTrusted(X509Certificate[], String authType) */ public void checkServerTrusted(X509Certificate[] certificates, String authType) throws CertificateException { - if (LOG.isDebugEnabled() && certificates != null) { - for (int c = 0; c < certificates.length; c++) { - X509Certificate cert = certificates[c]; - LOG.debug(" Server certificate " + (c + 1) + ":"); - LOG.debug(" Subject DN: " + cert.getSubjectDN()); - LOG.debug(" Signature Algorithm: " + cert.getSigAlgName()); - LOG.debug(" Valid from: " + cert.getNotBefore()); - LOG.debug(" Valid until: " + cert.getNotAfter()); - LOG.debug(" Issuer: " + cert.getIssuerDN()); - } - } + logCertificate(certificates, "Server"); defaultTrustManager.checkServerTrusted(certificates, authType); } @@ -109,4 +89,18 @@ public X509Certificate[] getAcceptedIssuers() { return this.defaultTrustManager.getAcceptedIssuers(); } + + private void logCertificate(X509Certificate[] certificates, String type) { + if (log.isDebugEnabled() && certificates != null) { + for (int c = 0; c < certificates.length; c++) { + X509Certificate cert = certificates[c]; + log.debug(" {} certificate {}:", type, c + 1); + log.debug(" Subject DN: {}", cert.getSubjectDN()); + log.debug(" Signature Algorithm: {}", cert.getSigAlgName()); + log.debug(" Valid from: {}", cert.getNotBefore()); + log.debug(" Valid until: {}", cert.getNotAfter()); + log.debug(" Issuer: {}", cert.getIssuerDN()); + } + } + } } diff --git a/backend/manager/modules/utils/src/main/modules/org/ovirt/engine/core/utils/main/module.xml b/backend/manager/modules/utils/src/main/modules/org/ovirt/engine/core/utils/main/module.xml index 1b279be..84c71d4 100644 --- a/backend/manager/modules/utils/src/main/modules/org/ovirt/engine/core/utils/main/module.xml +++ b/backend/manager/modules/utils/src/main/modules/org/ovirt/engine/core/utils/main/module.xml @@ -17,7 +17,6 @@ <module name="org.apache.commons.compress"/> <module name="org.apache.commons.httpclient"/> <module name="org.apache.commons.lang"/> - <module name="org.apache.commons.logging"/> <module name="org.codehaus.jackson.jackson-core-asl"/> <module name="org.codehaus.jackson.jackson-mapper-asl"/> <module name="org.infinispan"/> diff --git a/backend/manager/modules/vdsbroker/Readme.txt b/backend/manager/modules/vdsbroker/Readme.txt index 5fea8d7..f9e14d6 100644 --- a/backend/manager/modules/vdsbroker/Readme.txt +++ b/backend/manager/modules/vdsbroker/Readme.txt @@ -2,5 +2,5 @@ vdsbroker notes: 1. ssl is not handled for vdsManager 2. We need xml-rpc client version 3.1.3 (currently not available as distribution - added a patched jar) - 3. removed XML-RPC logger - wait to integrate with commons logging + 3. removed XML-RPC logger - wait to integrate with slf4j logging 4. Transactions are not handled \ No newline at end of file diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/jsonrpc/FutureMap.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/jsonrpc/FutureMap.java index 54a12c5..b91b2a8 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/jsonrpc/FutureMap.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/jsonrpc/FutureMap.java @@ -11,8 +11,6 @@ import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.ovirt.engine.core.vdsbroker.xmlrpc.XmlRpcRunTimeException; import org.ovirt.vdsm.jsonrpc.client.ClientConnectionException; import org.ovirt.vdsm.jsonrpc.client.JsonRpcClient; @@ -20,6 +18,8 @@ import org.ovirt.vdsm.jsonrpc.client.JsonRpcResponse; import org.ovirt.vdsm.jsonrpc.client.ResponseDecomposer; import org.ovirt.vdsm.jsonrpc.client.utils.LockWrapper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Provides asynchronous behavior to synchronous engine code. Request is sent during construction of this map but it @@ -32,7 +32,7 @@ private final static String STATUS = "status"; private final static String DEFAULT_KEY = "info"; private final static long DEFAULT_RESPONSE_WAIT = 1; - private static Log log = LogFactory.getLog(FutureMap.class); + private static Logger log = LoggerFactory.getLogger(FutureMap.class); private final Lock lock = new ReentrantLock(); private Future<JsonRpcResponse> response; private Map<String, Object> responseMap = new HashMap<String, Object>(); diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/jsonrpc/JsonRpcUtils.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/jsonrpc/JsonRpcUtils.java index 99bb7df..6406397 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/jsonrpc/JsonRpcUtils.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/jsonrpc/JsonRpcUtils.java @@ -2,8 +2,6 @@ import java.io.IOException; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.ovirt.vdsm.jsonrpc.client.ClientConnectionException; import org.ovirt.vdsm.jsonrpc.client.JsonRpcClient; import org.ovirt.vdsm.jsonrpc.client.internal.ResponseWorker; @@ -13,9 +11,11 @@ import org.ovirt.vdsm.jsonrpc.client.reactors.ReactorFactory; import org.ovirt.vdsm.jsonrpc.client.reactors.ReactorType; import org.ovirt.vdsm.jsonrpc.client.utils.retry.RetryPolicy; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class JsonRpcUtils { - private static Log log = LogFactory.getLog(JsonRpcUtils.class); + private static Logger log = LoggerFactory.getLogger(JsonRpcUtils.class); public static JsonRpcClient createStompClient(String hostname, int port, int connectionTimeout, int clientTimeout, int connectionRetry, int heartbeat, boolean isSecure) { diff --git a/backend/manager/tools/src/main/modules/org/ovirt/engine/core/tools/main/module.xml b/backend/manager/tools/src/main/modules/org/ovirt/engine/core/tools/main/module.xml index 0e2c535..72536ba 100644 --- a/backend/manager/tools/src/main/modules/org/ovirt/engine/core/tools/main/module.xml +++ b/backend/manager/tools/src/main/modules/org/ovirt/engine/core/tools/main/module.xml @@ -12,7 +12,6 @@ <module name="org.apache.commons.collections"/> <module name="org.apache.commons.configuration"/> <module name="org.apache.commons.lang"/> - <module name="org.apache.commons.logging"/> <module name="org.ovirt.engine.core.common"/> <module name="org.ovirt.engine.core.compat"/> <module name="org.ovirt.engine.core.utils"/> diff --git a/frontend/webadmin/modules/gwt-extension/src/main/java/org/ovirt/engine/ui/uioverrides/org/apache/commons/logging/Log.java b/frontend/webadmin/modules/gwt-extension/src/main/java/org/ovirt/engine/ui/uioverrides/org/apache/commons/logging/Log.java deleted file mode 100644 index 76063ff..0000000 --- a/frontend/webadmin/modules/gwt-extension/src/main/java/org/ovirt/engine/ui/uioverrides/org/apache/commons/logging/Log.java +++ /dev/null @@ -1,163 +0,0 @@ -package org.apache.commons.logging; - -import java.util.logging.Level; -import java.util.logging.Logger; - -import org.ovirt.engine.core.compat.StringFormat; - -/** - * GWT Override for Log - uses {@link StringFormat#formatDotNet(String, Object...)} - */ -public class Log { - private final Logger log; - - public Log(Logger log) { - this.log = log; - } - - public void debug(Object message) { - log.log(Level.FINE, message.toString()); - } - - public void debug(Object message, Throwable arg1) { - log.log(Level.FINE, message.toString(), arg1); - } - - public void error(Object message) { - log.log(Level.SEVERE, message.toString()); - } - - public void error(Object message, Throwable arg1) { - log.log(Level.SEVERE, message.toString(), arg1); - } - - public void fatal(Object message) { - log.log(Level.SEVERE, message.toString()); - } - - public void fatal(Object message, Throwable arg1) { - log.log(Level.SEVERE, message.toString(), arg1); - } - - public void info(Object message) { - log.log(Level.INFO, message.toString()); - } - - public void info(Object message, Throwable arg1) { - log.log(Level.INFO, message.toString(), arg1); - } - - public void trace(Object message) { - log.log(Level.FINER, message.toString()); - } - - public void trace(Object message, Throwable arg1) { - log.log(Level.FINER, message.toString(), arg1); - } - - public void warn(Object message) { - log.log(Level.WARNING, message.toString()); - } - - public void warn(Object message, Throwable arg1) { - log.log(Level.WARNING, message.toString(), arg1); - } - - public void debugFormat(String formatString, Object... args) { - if (isDebugEnabled()) { - Throwable throwable = extractException(args); - if (throwable != null) { - debug(transform(formatString, args), throwable); - } else { - debug(transform(formatString, args)); - } - } - } - - public void errorFormat(String formatString, Object... args) { - Throwable throwable = extractException(args); - if (throwable != null) { - error(transform(formatString, args), throwable); - } else { - error(transform(formatString, args)); - } - } - - public void fatalFormat(String formatString, Object... args) { - Throwable throwable = extractException(args); - if (throwable != null) { - error(transform(formatString, args), throwable); - } else { - error(transform(formatString, args)); - } - } - - public void infoFormat(String formatString, Object... args) { - Throwable throwable = extractException(args); - if (throwable != null) { - info(transform(formatString, args), throwable); - } else { - info(transform(formatString, args)); - } - } - - public void traceFormat(String formatString, Object... args) { - if (isTraceEnabled()) { - Throwable throwable = extractException(args); - if (throwable != null) { - trace(transform(formatString, args), throwable); - } else { - trace(transform(formatString, args)); - } - } - } - - public void warnFormat(String formatString, Object... args) { - Throwable throwable = extractException(args); - if (throwable != null) { - warn(transform(formatString, args), throwable); - } else { - warn(transform(formatString, args)); - } - } - - public boolean isDebugEnabled() { - return log.isLoggable(Level.FINE); - } - - public boolean isErrorEnabled() { - return log.isLoggable(Level.SEVERE); - } - - public boolean isFatalEnabled() { - return log.isLoggable(Level.SEVERE); - } - - public boolean isInfoEnabled() { - return log.isLoggable(Level.INFO); - } - - public boolean isTraceEnabled() { - return log.isLoggable(Level.FINER); - } - - public boolean isWarnEnabled() { - return log.isLoggable(Level.WARNING); - } - - private Throwable extractException(Object... args) { - for (Object arg : args) { - if (arg instanceof Throwable) { - return (Throwable) arg; - } - } - - return null; - } - - private String transform(String formatString, Object... args) { - formatString = formatString.replaceAll("'", ""); - return StringFormat.formatDotNet(formatString, args); - } - -} diff --git a/frontend/webadmin/modules/gwt-extension/src/main/java/org/ovirt/engine/ui/uioverrides/org/apache/commons/logging/LogFactory.java b/frontend/webadmin/modules/gwt-extension/src/main/java/org/ovirt/engine/ui/uioverrides/org/apache/commons/logging/LogFactory.java deleted file mode 100644 index a66da70..0000000 --- a/frontend/webadmin/modules/gwt-extension/src/main/java/org/ovirt/engine/ui/uioverrides/org/apache/commons/logging/LogFactory.java +++ /dev/null @@ -1,9 +0,0 @@ -package org.apache.commons.logging; - -import java.util.logging.Logger; - -public class LogFactory { - public static Log getLog(Class<?> loggedClass) { - return new Log(Logger.getLogger("")); - } -} diff --git a/frontend/webadmin/modules/gwt-extension/src/main/java/org/ovirt/engine/ui/uioverrides/org/ovirt/engine/core/compat/StringFormat.java b/frontend/webadmin/modules/gwt-extension/src/main/java/org/ovirt/engine/ui/uioverrides/org/ovirt/engine/core/compat/StringFormat.java index 9ea9030..7103bb0 100644 --- a/frontend/webadmin/modules/gwt-extension/src/main/java/org/ovirt/engine/ui/uioverrides/org/ovirt/engine/core/compat/StringFormat.java +++ b/frontend/webadmin/modules/gwt-extension/src/main/java/org/ovirt/engine/ui/uioverrides/org/ovirt/engine/core/compat/StringFormat.java @@ -1,14 +1,14 @@ package org.ovirt.engine.core.compat; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * GWT Override for StringFormat */ public final class StringFormat { - private static final Log log = LogFactory.getLog(StringFormat.class); + private static final Logger log = LoggerFactory.getLogger(StringFormat.class); /** * Format string using Java String.format() syntax (see {@link String#format(String, Object...)}) using a port of @@ -16,7 +16,7 @@ */ public static String format(String pattern, Object... args) { String message = new FormatterJava().format(pattern, args).toString(); - log.debugFormat("Formatting Java pattern: {0} With result: {1}", pattern, message); + log.debug("Formatting Java pattern: '{}' With result: {}", pattern, message); return message; } diff --git a/frontend/webadmin/modules/gwt-extension/src/main/java/org/ovirt/engine/ui/uioverrides/org/slf4j/Logger.java b/frontend/webadmin/modules/gwt-extension/src/main/java/org/ovirt/engine/ui/uioverrides/org/slf4j/Logger.java new file mode 100644 index 0000000..20b0bbc --- /dev/null +++ b/frontend/webadmin/modules/gwt-extension/src/main/java/org/ovirt/engine/ui/uioverrides/org/slf4j/Logger.java @@ -0,0 +1,126 @@ +package org.slf4j; + +import java.util.logging.Level; + +/** + * GWT Override for Log + */ +public class Logger { + private final java.util.logging.Logger log; + + public Logger(java.util.logging.Logger log) { + this.log = log; + } + + public void debug(String msg) { + log.log(Level.FINE, msg); + } + + public void debug(String format, Object... arguments) { + doFormat(Level.FINE, format, arguments); + } + + public void debug(String msg, Throwable t) { + log.log(Level.FINE, msg, t); + } + + public void error(String msg) { + log.log(Level.SEVERE, msg); + } + + public void error(String format, Object... arguments) { + doFormat(Level.SEVERE, format, arguments); + } + + public void error(String msg, Throwable t) { + log.log(Level.SEVERE, msg, t); + } + + public void info(String msg) { + log.log(Level.INFO, msg); + } + + public void info(String format, Object... arguments) { + doFormat(Level.INFO, format, arguments); + } + + public void info(String msg, Throwable t) { + log.log(Level.INFO, msg, t); + } + + public void trace(String msg) { + log.log(Level.FINER, msg); + } + + public void trace(String format, Object... arguments) { + doFormat(Level.FINER, format, arguments); + } + + public void trace(String msg, Throwable t) { + log.log(Level.FINER, msg, t); + } + + public void warn(String msg) { + log.log(Level.WARNING, msg); + } + + public void warn(String format, Object... arguments) { + doFormat(Level.WARNING, format, arguments); + } + + public void warn(String msg, Throwable t) { + log.log(Level.WARNING, msg, t); + } + + public boolean isDebugEnabled() { + return log.isLoggable(Level.FINE); + } + + public boolean isErrorEnabled() { + return log.isLoggable(Level.SEVERE); + } + + public boolean isFatalEnabled() { + return log.isLoggable(Level.SEVERE); + } + + public boolean isInfoEnabled() { + return log.isLoggable(Level.INFO); + } + + public boolean isTraceEnabled() { + return log.isLoggable(Level.FINER); + } + + public boolean isWarnEnabled() { + return log.isLoggable(Level.WARNING); + } + + public void fatal(String msg) { + error(msg); + } + + public void fatal(String format, Object... arguments) { + error(format, arguments); + } + + public void fatal(String msg, Throwable t) { + error(msg, t); + } + + private void doFormat(Level level, String format, Object... arguments) { + if (log.isLoggable(level) && format != null) { + StringBuffer msg = new StringBuffer(); + int i = 0; + int last = 0; + int current; + while ((current = format.indexOf("{}", last)) != -1) { + msg.append(format, last, current); + msg.append(arguments[i++]); + last = current + 2; + } + msg.append(format, last, format.length()); + log.log(level, msg.toString()); + } + } +} diff --git a/frontend/webadmin/modules/gwt-extension/src/main/java/org/ovirt/engine/ui/uioverrides/org/slf4j/LoggerFactory.java b/frontend/webadmin/modules/gwt-extension/src/main/java/org/ovirt/engine/ui/uioverrides/org/slf4j/LoggerFactory.java new file mode 100644 index 0000000..21b7cc5 --- /dev/null +++ b/frontend/webadmin/modules/gwt-extension/src/main/java/org/ovirt/engine/ui/uioverrides/org/slf4j/LoggerFactory.java @@ -0,0 +1,7 @@ +package org.slf4j; + +public class LoggerFactory { + public static Logger getLogger(Class<?> loggedClass) { + return new Logger(java.util.logging.Logger.getLogger("")); + } +} diff --git a/frontend/webadmin/modules/pom.xml b/frontend/webadmin/modules/pom.xml index 2826a509..b7dbf05 100644 --- a/frontend/webadmin/modules/pom.xml +++ b/frontend/webadmin/modules/pom.xml @@ -84,18 +84,6 @@ </exclusion> </exclusions> </dependency> - <!-- Exclude servlet API dependency from commons-logging --> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>${commons-logging.version}</version> - <exclusions> - <exclusion> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - </exclusion> - </exclusions> - </dependency> </dependencies> </dependencyManagement> <build> diff --git a/frontend/webadmin/modules/userportal-gwtp/pom.xml b/frontend/webadmin/modules/userportal-gwtp/pom.xml index 8dfef94..71dc6bb 100644 --- a/frontend/webadmin/modules/userportal-gwtp/pom.xml +++ b/frontend/webadmin/modules/userportal-gwtp/pom.xml @@ -125,8 +125,8 @@ <version>${aspectj.version}</version> </dependency> <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> <scope>provided</scope> </dependency> <dependency> diff --git a/frontend/webadmin/modules/webadmin/pom.xml b/frontend/webadmin/modules/webadmin/pom.xml index 71c708c..0ea73ce 100644 --- a/frontend/webadmin/modules/webadmin/pom.xml +++ b/frontend/webadmin/modules/webadmin/pom.xml @@ -114,8 +114,8 @@ <version>${aspectj.version}</version> </dependency> <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> <scope>provided</scope> </dependency> <dependency> diff --git a/pom.xml b/pom.xml index 5fa9d24..28a1a42 100644 --- a/pom.xml +++ b/pom.xml @@ -43,7 +43,6 @@ <animal.sniffer.signature>java17</animal.sniffer.signature> <!-- Dependencies Versions --> - <commons-logging.version>1.1</commons-logging.version> <junit.version>4.11</junit.version> <commons-codec.version>1.4</commons-codec.version> <commons-lang.version>2.6</commons-lang.version> @@ -342,9 +341,9 @@ <scope>test</scope> </dependency> <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>${commons-logging.version}</version> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>${slf4j.version}</version> <scope>provided</scope> </dependency> </dependencies> @@ -495,7 +494,7 @@ <addClasspath>false</addClasspath> </manifest> <manifestEntries> - <Dependencies>org.apache.commons.logging,javax.api</Dependencies> + <Dependencies>org.slf4j,javax.api</Dependencies> </manifestEntries> </archive> </configuration> -- To view, visit http://gerrit.ovirt.org/34214 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8903f7b605017f2c5bf08768d6462afdbaf14833 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alon Bar-Lev <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
