diff --git a/snprc_ehr/src/org/labkey/snprc_ehr/SNPRCBeanFactory.java b/snprc_ehr/src/org/labkey/snprc_ehr/SNPRCBeanFactory.java index 1575b31aa..2e9a23c3e 100644 --- a/snprc_ehr/src/org/labkey/snprc_ehr/SNPRCBeanFactory.java +++ b/snprc_ehr/src/org/labkey/snprc_ehr/SNPRCBeanFactory.java @@ -18,7 +18,8 @@ import org.apache.commons.beanutils.BeanUtils; import org.apache.commons.beanutils.ConversionException; import org.apache.commons.beanutils.PropertyUtils; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.labkey.api.collections.CaseInsensitiveHashMap; @@ -41,7 +42,7 @@ public class SNPRCBeanFactory extends BeanObjectFactory { - private static Logger _log = Logger.getLogger(BeanObjectFactory.class); + private static Logger _log = LogManager.getLogger(BeanObjectFactory.class); private Class _class; diff --git a/snprc_ehr/src/org/labkey/snprc_ehr/notification/AbstractSSRSNotification.java b/snprc_ehr/src/org/labkey/snprc_ehr/notification/AbstractSSRSNotification.java index dbf22d07d..da9be2e4f 100644 --- a/snprc_ehr/src/org/labkey/snprc_ehr/notification/AbstractSSRSNotification.java +++ b/snprc_ehr/src/org/labkey/snprc_ehr/notification/AbstractSSRSNotification.java @@ -24,7 +24,8 @@ import org.apache.http.client.HttpClient; import org.apache.http.client.methods.HttpGet; import org.apache.http.impl.client.HttpClientBuilder; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.apache.poi.util.IOUtils; import org.jetbrains.annotations.Nullable; import org.labkey.api.data.Container; @@ -61,7 +62,7 @@ public abstract class AbstractSSRSNotification implements Notification private final String _textContent; private Format _format; - private static final Logger LOG = Logger.getLogger(AbstractSSRSNotification.class); + private static final Logger LOG = LogManager.getLogger(AbstractSSRSNotification.class); private final String _reportId; public enum Format diff --git a/snprc_ehr/src/org/labkey/snprc_ehr/query/SNPRC_EHRTriggerHelper.java b/snprc_ehr/src/org/labkey/snprc_ehr/query/SNPRC_EHRTriggerHelper.java index 584928d95..b3eb12c66 100644 --- a/snprc_ehr/src/org/labkey/snprc_ehr/query/SNPRC_EHRTriggerHelper.java +++ b/snprc_ehr/src/org/labkey/snprc_ehr/query/SNPRC_EHRTriggerHelper.java @@ -15,7 +15,8 @@ */ package org.labkey.snprc_ehr.query; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.labkey.api.collections.CaseInsensitiveHashMap; import org.labkey.api.data.CompareType; import org.labkey.api.data.Container; @@ -52,7 +53,7 @@ public class SNPRC_EHRTriggerHelper { - private static final Logger _log = Logger.getLogger(SNPRC_EHRTriggerHelper.class); + private static final Logger _log = LogManager.getLogger(SNPRC_EHRTriggerHelper.class); private Container _container = null; private User _user = null; private Map _cachedTables = new HashMap<>(); diff --git a/snprc_ehr/src/org/labkey/snprc_ehr/table/SNPRC_EHRCustomizer.java b/snprc_ehr/src/org/labkey/snprc_ehr/table/SNPRC_EHRCustomizer.java index f519f6b52..7b4a5816c 100644 --- a/snprc_ehr/src/org/labkey/snprc_ehr/table/SNPRC_EHRCustomizer.java +++ b/snprc_ehr/src/org/labkey/snprc_ehr/table/SNPRC_EHRCustomizer.java @@ -15,7 +15,8 @@ */ package org.labkey.snprc_ehr.table; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.labkey.api.data.AbstractTableInfo; import org.labkey.api.data.ColumnInfo; import org.labkey.api.data.Container; @@ -47,7 +48,7 @@ */ public class SNPRC_EHRCustomizer extends AbstractTableCustomizer { - private static final Logger _log = Logger.getLogger(SNPRC_EHRCustomizer.class); + private static final Logger _log = LogManager.getLogger(SNPRC_EHRCustomizer.class); public SNPRC_EHRCustomizer() { diff --git a/snprc_ehr/src/org/labkey/snprc_ehr/views/AnimalsHierarchyWebPart.java b/snprc_ehr/src/org/labkey/snprc_ehr/views/AnimalsHierarchyWebPart.java index 88c5effe1..886572184 100644 --- a/snprc_ehr/src/org/labkey/snprc_ehr/views/AnimalsHierarchyWebPart.java +++ b/snprc_ehr/src/org/labkey/snprc_ehr/views/AnimalsHierarchyWebPart.java @@ -15,12 +15,13 @@ */ package org.labkey.snprc_ehr.views; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.labkey.api.view.JspView; public class AnimalsHierarchyWebPart extends JspView { - private static final Logger _log = Logger.getLogger(AnimalsHierarchyWebPart.class); + private static final Logger _log = LogManager.getLogger(AnimalsHierarchyWebPart.class); public AnimalsHierarchyWebPart() { diff --git a/snprc_scheduler/src/org/labkey/snprc_scheduler/view/SchedulerWebPart.java b/snprc_scheduler/src/org/labkey/snprc_scheduler/view/SchedulerWebPart.java index 14c5a4606..9d3bfdf22 100644 --- a/snprc_scheduler/src/org/labkey/snprc_scheduler/view/SchedulerWebPart.java +++ b/snprc_scheduler/src/org/labkey/snprc_scheduler/view/SchedulerWebPart.java @@ -1,11 +1,12 @@ package org.labkey.snprc_scheduler.view; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.labkey.api.view.JspView; public class SchedulerWebPart extends JspView { - private static final Logger _log = Logger.getLogger(SchedulerWebPart.class); + private static final Logger _log = LogManager.getLogger(SchedulerWebPart.class); public SchedulerWebPart() {