From 2757e4dcb60c4fcd782f4d20ed18388cff9d50f0 Mon Sep 17 00:00:00 2001 From: labkey-ankurj Date: Fri, 10 Jul 2020 17:02:11 -0700 Subject: [PATCH] Item 7490: upgrade log4j --- api-src/org/labkey/api/workflow/WorkflowRegistry.java | 5 +++-- src/org/labkey/workflow/PermissionsHandlerImpl.java | 3 --- src/org/labkey/workflow/ProcessInstanceEventListener.java | 2 +- src/org/labkey/workflow/WorkflowContainerListener.java | 4 ++-- src/org/labkey/workflow/WorkflowManager.java | 5 +++-- src/org/labkey/workflow/WorkflowSchema.java | 1 - src/org/labkey/workflow/delegate/DataManager.java | 5 +++-- src/org/labkey/workflow/delegate/EmailNotifier.java | 5 +++-- src/org/labkey/workflow/model/TaskFormFieldImpl.java | 1 - 9 files changed, 15 insertions(+), 16 deletions(-) diff --git a/api-src/org/labkey/api/workflow/WorkflowRegistry.java b/api-src/org/labkey/api/workflow/WorkflowRegistry.java index 8b6e93b..deff517 100644 --- a/api-src/org/labkey/api/workflow/WorkflowRegistry.java +++ b/api-src/org/labkey/api/workflow/WorkflowRegistry.java @@ -15,7 +15,8 @@ */ package org.labkey.api.workflow; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.labkey.api.data.Container; @@ -36,7 +37,7 @@ */ public class WorkflowRegistry { - private static final Logger _log = Logger.getLogger(WorkflowRegistry.class); + private static final Logger _log = LogManager.getLogger(WorkflowRegistry.class); private static String _defaultHandler = null; private static final WorkflowRegistry _instance = new WorkflowRegistry(); private static final Map> _permissionsRegistry = new ConcurrentHashMap<>(); diff --git a/src/org/labkey/workflow/PermissionsHandlerImpl.java b/src/org/labkey/workflow/PermissionsHandlerImpl.java index c1eaae1..3412576 100644 --- a/src/org/labkey/workflow/PermissionsHandlerImpl.java +++ b/src/org/labkey/workflow/PermissionsHandlerImpl.java @@ -16,15 +16,12 @@ package org.labkey.workflow; import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; import org.labkey.api.data.Container; import org.labkey.api.data.SimpleFilter; import org.labkey.api.security.User; import org.labkey.api.security.permissions.AdminPermission; import org.labkey.api.security.permissions.Permission; -import org.labkey.api.security.permissions.ReadPermission; import org.labkey.api.workflow.PermissionsHandler; -import org.labkey.api.workflow.WorkflowProcess; import org.labkey.api.workflow.WorkflowTask; import java.util.Collections; diff --git a/src/org/labkey/workflow/ProcessInstanceEventListener.java b/src/org/labkey/workflow/ProcessInstanceEventListener.java index 98f7bbb..1d225fa 100644 --- a/src/org/labkey/workflow/ProcessInstanceEventListener.java +++ b/src/org/labkey/workflow/ProcessInstanceEventListener.java @@ -21,8 +21,8 @@ import org.labkey.api.data.Container; import org.labkey.api.security.User; import org.labkey.api.view.HttpView; -import org.labkey.api.workflow.WorkflowProcessEventListener; import org.labkey.api.workflow.WorkflowProcess; +import org.labkey.api.workflow.WorkflowProcessEventListener; import org.labkey.api.workflow.WorkflowRegistry; import org.labkey.workflow.model.WorkflowProcessImpl; diff --git a/src/org/labkey/workflow/WorkflowContainerListener.java b/src/org/labkey/workflow/WorkflowContainerListener.java index db99d5a..7199f2f 100644 --- a/src/org/labkey/workflow/WorkflowContainerListener.java +++ b/src/org/labkey/workflow/WorkflowContainerListener.java @@ -19,10 +19,10 @@ import org.labkey.api.data.Container; import org.labkey.api.data.ContainerManager.ContainerListener; import org.labkey.api.security.User; -import java.util.Collections; -import java.util.Collection; import java.beans.PropertyChangeEvent; +import java.util.Collection; +import java.util.Collections; public class WorkflowContainerListener implements ContainerListener { diff --git a/src/org/labkey/workflow/WorkflowManager.java b/src/org/labkey/workflow/WorkflowManager.java index d6b889e..23ae037 100644 --- a/src/org/labkey/workflow/WorkflowManager.java +++ b/src/org/labkey/workflow/WorkflowManager.java @@ -46,7 +46,8 @@ import org.activiti.engine.task.TaskQuery; import org.apache.commons.lang3.StringUtils; import org.apache.ibatis.exceptions.PersistenceException; -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.junit.AfterClass; @@ -112,7 +113,7 @@ public class WorkflowManager implements WorkflowService { - private static final Logger logger = Logger.getLogger(WorkflowManager.class); + private static final Logger logger = LogManager.getLogger(WorkflowManager.class); private static final String ACTIVITI_CONFIG_FILE = "resources/workflow/config/activiti.cfg.xml"; private static final String WORKFLOW_FILE_NAME_EXTENSION = ".bpmn20.xml"; diff --git a/src/org/labkey/workflow/WorkflowSchema.java b/src/org/labkey/workflow/WorkflowSchema.java index c91f332..ccaf4ad 100644 --- a/src/org/labkey/workflow/WorkflowSchema.java +++ b/src/org/labkey/workflow/WorkflowSchema.java @@ -17,7 +17,6 @@ import org.labkey.api.data.DbSchema; import org.labkey.api.data.DbSchemaType; -import org.labkey.api.data.dialect.SqlDialect; public class WorkflowSchema { diff --git a/src/org/labkey/workflow/delegate/DataManager.java b/src/org/labkey/workflow/delegate/DataManager.java index fe4994b..1c5bfaf 100644 --- a/src/org/labkey/workflow/delegate/DataManager.java +++ b/src/org/labkey/workflow/delegate/DataManager.java @@ -18,7 +18,8 @@ import org.activiti.engine.delegate.DelegateExecution; import org.activiti.engine.delegate.Expression; import org.activiti.engine.delegate.JavaDelegate; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.labkey.api.admin.notification.Notification; import org.labkey.api.admin.notification.NotificationService; import org.labkey.api.workflow.DataManagerConfig; @@ -32,7 +33,7 @@ */ public class DataManager implements JavaDelegate { - private static final Logger _log = Logger.getLogger(DataManager.class); + private static final Logger _log = LogManager.getLogger(DataManager.class); private Expression _dataManagerClassName; public Expression getDataManagerClassName() diff --git a/src/org/labkey/workflow/delegate/EmailNotifier.java b/src/org/labkey/workflow/delegate/EmailNotifier.java index 41a0351..7f54297 100644 --- a/src/org/labkey/workflow/delegate/EmailNotifier.java +++ b/src/org/labkey/workflow/delegate/EmailNotifier.java @@ -18,7 +18,8 @@ import org.activiti.engine.delegate.DelegateExecution; import org.activiti.engine.delegate.Expression; import org.activiti.engine.delegate.JavaDelegate; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.labkey.api.admin.notification.Notification; import org.labkey.api.admin.notification.NotificationService; import org.labkey.api.data.Container; @@ -47,7 +48,7 @@ */ public class EmailNotifier implements JavaDelegate { - private static final Logger _log = Logger.getLogger(EmailNotifier.class); + private static final Logger _log = LogManager.getLogger(EmailNotifier.class); private Expression _notificationClassName; public Expression getNotificationClassName() diff --git a/src/org/labkey/workflow/model/TaskFormFieldImpl.java b/src/org/labkey/workflow/model/TaskFormFieldImpl.java index 3d60374..ad0ef6d 100644 --- a/src/org/labkey/workflow/model/TaskFormFieldImpl.java +++ b/src/org/labkey/workflow/model/TaskFormFieldImpl.java @@ -17,7 +17,6 @@ import org.activiti.engine.form.FormProperty; -import org.activiti.engine.form.FormType; import org.labkey.api.workflow.TaskFormField; /**