Skip to content

Item 7490: upgrade log4j #24

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 #24

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 src/org/labkey/filetransfer/globus/GlobusFileTransferProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@
import org.apache.http.impl.client.BasicResponseHandler;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClients;
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.json.JSONObject;
Expand Down Expand Up @@ -57,7 +58,7 @@
*/
public class GlobusFileTransferProvider extends FileTransferProvider
{
public static final Logger logger = Logger.getLogger(GlobusFileTransferProvider.class);
public static final Logger logger = LogManager.getLogger(GlobusFileTransferProvider.class);
public static final String NAME = "Globus";

public GlobusFileTransferProvider()
Expand Down
4 changes: 2 additions & 2 deletions src/org/labkey/filetransfer/provider/FileTransferProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@
import org.labkey.api.data.Container;
import org.labkey.api.security.User;
import org.labkey.api.view.ViewContext;
import org.labkey.filetransfer.model.TransferEndpoint;
import org.labkey.filetransfer.config.FileTransferSettings;
import org.labkey.filetransfer.globus.TransferResult;
import org.labkey.filetransfer.model.TransferEndpoint;
import org.labkey.filetransfer.security.OAuth2Authenticator;
import org.labkey.filetransfer.security.SecurePropertiesDataStore;
import org.labkey.filetransfer.config.FileTransferSettings;

import java.io.IOException;
import java.net.URISyntaxException;
Expand Down
5 changes: 3 additions & 2 deletions src/org/labkey/filetransfer/provider/Registry.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.filetransfer.provider;

import org.apache.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.labkey.api.data.Container;
import org.labkey.api.security.User;

Expand All @@ -28,7 +29,7 @@
*/
public class Registry
{
private static final Logger logger = Logger.getLogger(Registry.class);
private static final Logger logger = LogManager.getLogger(Registry.class);
private static Map<String, Class<? extends FileTransferProvider>> _providers = new ConcurrentHashMap<>();
private static Registry _instance = new Registry();

Expand Down
5 changes: 3 additions & 2 deletions src/org/labkey/filetransfer/security/OAuth2Authenticator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@
import com.google.api.client.json.JsonFactory;
import com.google.api.client.json.jackson2.JacksonFactory;
import com.google.api.client.util.store.DataStore;
import org.apache.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.labkey.api.data.Container;
import org.labkey.api.data.ContainerManager;
import org.labkey.api.security.User;
Expand All @@ -47,7 +48,7 @@
*/
public abstract class OAuth2Authenticator
{
private static final Logger logger = Logger.getLogger(OAuth2Authenticator.class);
private static final Logger logger = LogManager.getLogger(OAuth2Authenticator.class);
public static final String ACCESS_TOKEN = "transferToken";
public static final String REFRESH_TOKEN = "refreshToken";
public static final String EXPIRE_TIME_MILLIS = "expireTimeMillis";
Expand Down
5 changes: 3 additions & 2 deletions src/org/labkey/filetransfer/view/FileTransferWebPartConfigView.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.filetransfer.view;

import org.apache.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.labkey.api.view.JspView;
import org.labkey.api.view.Portal;
import org.labkey.api.view.ViewContext;
Expand All @@ -28,7 +29,7 @@
*/
public class FileTransferWebPartConfigView extends JspView<WebPartConfigBean>
{
private static final Logger logger = Logger.getLogger(FileTransferWebPartConfigView.class);
private static final Logger logger = LogManager.getLogger(FileTransferWebPartConfigView.class);
public FileTransferWebPartConfigView(Portal.WebPart webPart, ViewContext context)
{
super("/org/labkey/filetransfer/view/fileTransferWebPartConfig.jsp");
Expand Down