Improve merging

[gpl/argeo-slc.git] / cms / org.argeo.cms.integration / src / org / argeo / cms / integration / CmsExceptionsChain.java

diff --git a/cms/org.argeo.cms.integration/src/org/argeo/cms/integration/CmsExceptionsChain.java b/cms/org.argeo.cms.integration/src/org/argeo/cms/integration/CmsExceptionsChain.java
index bbac176a5fd7c916b8ea686e5c06b342197ce0f4..fb289c18e946de59dbe2c85a4d25bc76a81687bb 100644 (file)
--- a/cms/org.argeo.cms.integration/src/org/argeo/cms/integration/CmsExceptionsChain.java
+++ b/cms/org.argeo.cms.integration/src/org/argeo/cms/integration/CmsExceptionsChain.java
@@ -7,8 +7,7 @@ import java.util.List;
 
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.argeo.api.cms.CmsLog;
 
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonProcessingException;
@@ -16,7 +15,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 
 /** Serialisable wrapper of a {@link Throwable}. */
 public class CmsExceptionsChain {
-       public final static Log log = LogFactory.getLog(CmsExceptionsChain.class);
+       public final static CmsLog log = CmsLog.getLog(CmsExceptionsChain.class);
 
        private List<SystemException> exceptions = new ArrayList<>();