X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fkernel%2FNodeLogger.java;h=0b410379402af36dfaa35fe21b75b3d7c5822be5;hb=b71546ddc74d6ca49d252806aafd491c75dfe1fb;hp=89c7e05a67d9a9c8b2c2024c2203424660f3456a;hpb=4185ff8826f893a4a1f054f61a11b89333c3e85d;p=lgpl%2Fargeo-commons.git diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/NodeLogger.java b/org.argeo.cms/src/org/argeo/cms/internal/kernel/NodeLogger.java index 89c7e05a6..0b4103794 100644 --- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/NodeLogger.java +++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/NodeLogger.java @@ -23,11 +23,10 @@ import java.util.Properties; import java.util.concurrent.BlockingQueue; import java.util.concurrent.LinkedBlockingQueue; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.argeo.api.ArgeoLogListener; -import org.argeo.api.ArgeoLogger; -import org.argeo.api.NodeConstants; +import org.argeo.api.cms.CmsConstants; +import org.argeo.api.cms.CmsLog; +import org.argeo.cms.ArgeoLogListener; +import org.argeo.cms.ArgeoLogger; import org.argeo.cms.CmsException; import org.argeo.cms.auth.CurrentUser; import org.argeo.osgi.useradmin.UserAdminConf; @@ -151,7 +150,7 @@ class NodeLogger implements ArgeoLogger, LogListener { // @Override public void logged(LogEntry status) { - Log pluginLog = LogFactory.getLog(status.getBundle().getSymbolicName()); + CmsLog pluginLog = CmsLog.getLog(status.getBundle().getSymbolicName()); LogLevel severity = status.getLogLevel(); if (severity.equals(LogLevel.ERROR) && pluginLog.isErrorEnabled()) { // FIXME Fix Argeo TP @@ -190,9 +189,9 @@ class NodeLogger implements ArgeoLogger, LogListener { } else { sb.append(arrayToString(objectClasses)); } - Object cn = sr.getProperty(NodeConstants.CN); + Object cn = sr.getProperty(CmsConstants.CN); if (cn != null) - sb.append(" " + NodeConstants.CN + ": " + cn); + sb.append(" " + CmsConstants.CN + ": " + cn); Object factoryPid = sr.getProperty(ConfigurationAdmin.SERVICE_FACTORYPID); if (factoryPid != null) sb.append(" " + ConfigurationAdmin.SERVICE_FACTORYPID + ": " + factoryPid);