Skip to content

Item 7490: upgrade log4j #45

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
labkey-ankurj merged 1 commit into from
Aug 5, 2020
Merged

Item 7490: upgrade log4j #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions api-src/org/labkey/api/workflow/WorkflowRegistry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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<String, Class<? extends PermissionsHandler>> _permissionsRegistry = new ConcurrentHashMap<>();
Expand Down
3 changes: 0 additions & 3 deletions src/org/labkey/workflow/PermissionsHandlerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/org/labkey/workflow/ProcessInstanceEventListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
4 changes: 2 additions & 2 deletions src/org/labkey/workflow/WorkflowContainerListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
5 changes: 3 additions & 2 deletions src/org/labkey/workflow/WorkflowManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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";
Expand Down
1 change: 0 additions & 1 deletion src/org/labkey/workflow/WorkflowSchema.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
5 changes: 3 additions & 2 deletions src/org/labkey/workflow/delegate/DataManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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()
Expand Down
5 changes: 3 additions & 2 deletions src/org/labkey/workflow/delegate/EmailNotifier.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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()
Expand Down
1 change: 0 additions & 1 deletion src/org/labkey/workflow/model/TaskFormFieldImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@


import org.activiti.engine.form.FormProperty;
import org.activiti.engine.form.FormType;
import org.labkey.api.workflow.TaskFormField;

/**
Expand Down