diff --git a/src/org/labkey/mobileappstudy/DynamicListProcessor.java b/src/org/labkey/mobileappstudy/DynamicListProcessor.java index 916e17b..9dfe892 100644 --- a/src/org/labkey/mobileappstudy/DynamicListProcessor.java +++ b/src/org/labkey/mobileappstudy/DynamicListProcessor.java @@ -1,6 +1,7 @@ package org.labkey.mobileappstudy; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.labkey.api.data.Container; import org.labkey.api.data.JdbcType; import org.labkey.api.data.PropertyStorageSpec; @@ -19,12 +20,12 @@ public abstract class DynamicListProcessor public DynamicListProcessor() { - this(Logger.getLogger(MobileAppStudy.class)); + this(LogManager.getLogger(MobileAppStudy.class)); } public DynamicListProcessor(Logger logger) { - this.logger = logger != null ? logger : Logger.getLogger(MobileAppStudy.class); + this.logger = logger != null ? logger : LogManager.getLogger(MobileAppStudy.class); } /** diff --git a/src/org/labkey/mobileappstudy/MobileAppStudyController.java b/src/org/labkey/mobileappstudy/MobileAppStudyController.java index 37b1599..63a0735 100644 --- a/src/org/labkey/mobileappstudy/MobileAppStudyController.java +++ b/src/org/labkey/mobileappstudy/MobileAppStudyController.java @@ -19,7 +19,8 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.databind.JsonNode; import org.apache.commons.lang3.StringUtils; -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.action.Action; @@ -90,7 +91,7 @@ @Marshal(Marshaller.Jackson) public class MobileAppStudyController extends SpringActionController { - private static final Logger LOG = Logger.getLogger(MobileAppStudyController.class); + private static final Logger LOG = LogManager.getLogger(MobileAppStudyController.class); private static final DefaultActionResolver _actionResolver = new DefaultActionResolver(MobileAppStudyController.class); public static final String NAME = "mobileappstudy"; diff --git a/src/org/labkey/mobileappstudy/MobileAppStudyManager.java b/src/org/labkey/mobileappstudy/MobileAppStudyManager.java index c761833..9b252c7 100644 --- a/src/org/labkey/mobileappstudy/MobileAppStudyManager.java +++ b/src/org/labkey/mobileappstudy/MobileAppStudyManager.java @@ -18,7 +18,8 @@ import org.apache.commons.lang3.RandomStringUtils; import org.apache.commons.lang3.StringUtils; -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.collections.ArrayListMap; @@ -104,7 +105,7 @@ public class MobileAppStudyManager private static final int THREAD_COUNT = 10; private static JobRunner _shredder; - private static final Logger logger = Logger.getLogger(MobileAppStudy.class); + private static final Logger logger = LogManager.getLogger(MobileAppStudy.class); public static final String OTHER_OPTION_TITLE = "_Other_Text"; diff --git a/src/org/labkey/mobileappstudy/SurveyDesignProcessor.java b/src/org/labkey/mobileappstudy/SurveyDesignProcessor.java index ecfd23e..8f42bec 100644 --- a/src/org/labkey/mobileappstudy/SurveyDesignProcessor.java +++ b/src/org/labkey/mobileappstudy/SurveyDesignProcessor.java @@ -16,7 +16,8 @@ package org.labkey.mobileappstudy; import org.apache.commons.lang3.StringUtils; -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; diff --git a/src/org/labkey/mobileappstudy/forwarder/BasicAuthForwarder.java b/src/org/labkey/mobileappstudy/forwarder/BasicAuthForwarder.java index a40597b..dd0d287 100644 --- a/src/org/labkey/mobileappstudy/forwarder/BasicAuthForwarder.java +++ b/src/org/labkey/mobileappstudy/forwarder/BasicAuthForwarder.java @@ -1,6 +1,7 @@ package org.labkey.mobileappstudy.forwarder; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.labkey.api.data.Container; import org.labkey.api.pipeline.PipelineJob; import org.labkey.api.security.User; diff --git a/src/org/labkey/mobileappstudy/forwarder/Forwarder.java b/src/org/labkey/mobileappstudy/forwarder/Forwarder.java index f3e9ec9..d68cf80 100644 --- a/src/org/labkey/mobileappstudy/forwarder/Forwarder.java +++ b/src/org/labkey/mobileappstudy/forwarder/Forwarder.java @@ -1,6 +1,7 @@ package org.labkey.mobileappstudy.forwarder; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.labkey.api.data.Container; import org.labkey.api.pipeline.PipelineJob; import org.labkey.api.security.User; @@ -21,7 +22,7 @@ public abstract class Forwarder public Forwarder(Container container, Logger logger) { - this.logger = logger != null ? logger : Logger.getLogger(Forwarder.class.getName()); + this.logger = logger != null ? logger : LogManager.getLogger(Forwarder.class.getName()); this.container = container; this.properties = Collections.unmodifiableMap(new ForwarderProperties().getForwarderConnection(container)); } diff --git a/src/org/labkey/mobileappstudy/forwarder/ForwardingScheduler.java b/src/org/labkey/mobileappstudy/forwarder/ForwardingScheduler.java index dfcd3cd..444dc2d 100644 --- a/src/org/labkey/mobileappstudy/forwarder/ForwardingScheduler.java +++ b/src/org/labkey/mobileappstudy/forwarder/ForwardingScheduler.java @@ -15,7 +15,8 @@ */ package org.labkey.mobileappstudy.forwarder; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.labkey.api.collections.ConcurrentHashSet; import org.labkey.api.data.Container; import org.labkey.api.data.ContainerManager; @@ -39,7 +40,7 @@ public class ForwardingScheduler { private static JobDetail job = null; - private static final Logger logger = Logger.getLogger(ForwardingScheduler.class); + private static final Logger logger = LogManager.getLogger(ForwardingScheduler.class); private static final int INTERVAL_MINUTES = 5; private static final ForwardingScheduler instance = new ForwardingScheduler(); private static Set enabledContainers = new ConcurrentHashSet<>(); diff --git a/src/org/labkey/mobileappstudy/forwarder/ForwardingType.java b/src/org/labkey/mobileappstudy/forwarder/ForwardingType.java index 7d6c8c1..d4192f5 100644 --- a/src/org/labkey/mobileappstudy/forwarder/ForwardingType.java +++ b/src/org/labkey/mobileappstudy/forwarder/ForwardingType.java @@ -1,7 +1,8 @@ package org.labkey.mobileappstudy.forwarder; import org.apache.commons.lang3.StringUtils; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.labkey.api.data.Container; import org.labkey.api.util.EnumHasHtmlString; import org.labkey.mobileappstudy.MobileAppStudyController; diff --git a/src/org/labkey/mobileappstudy/forwarder/OAuthForwarder.java b/src/org/labkey/mobileappstudy/forwarder/OAuthForwarder.java index 13973c5..69c3f84 100644 --- a/src/org/labkey/mobileappstudy/forwarder/OAuthForwarder.java +++ b/src/org/labkey/mobileappstudy/forwarder/OAuthForwarder.java @@ -4,7 +4,8 @@ import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.commons.lang3.StringUtils; import org.apache.http.auth.AuthenticationException; -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.cache.Cache; @@ -28,7 +29,7 @@ public class OAuthForwarder extends Forwarder private static final int MAX_RETRIES = 1; private static final Cache authTokenCache = CacheManager.getBlockingCache(100, TimeUnit.HOURS.toMillis(1), "Mobile app forwarding tokens", - (key, args) -> requestNewAuthToken(key, Logger.getLogger(OAuthForwarder.class))); + (key, args) -> requestNewAuthToken(key, LogManager.getLogger(OAuthForwarder.class))); public OAuthForwarder(Container container, Logger logger) { diff --git a/src/org/labkey/mobileappstudy/forwarder/SurveyResponseForwardingJob.java b/src/org/labkey/mobileappstudy/forwarder/SurveyResponseForwardingJob.java index 0e6d13f..0639096 100644 --- a/src/org/labkey/mobileappstudy/forwarder/SurveyResponseForwardingJob.java +++ b/src/org/labkey/mobileappstudy/forwarder/SurveyResponseForwardingJob.java @@ -16,7 +16,8 @@ package org.labkey.mobileappstudy.forwarder; import org.apache.commons.lang3.StringUtils; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.labkey.api.data.Container; import org.labkey.api.data.ContainerManager; import org.labkey.api.pipeline.PipeRoot; @@ -41,7 +42,7 @@ public class SurveyResponseForwardingJob implements org.quartz.Job, Callable { - private static final Logger logger = Logger.getLogger(SurveyResponseForwardingJob.class); + private static final Logger logger = LogManager.getLogger(SurveyResponseForwardingJob.class); private static volatile Set unsuccessful = new HashSet<>(); // Private service user diff --git a/src/org/labkey/mobileappstudy/participantproperties/ParticipantPropertiesProcessor.java b/src/org/labkey/mobileappstudy/participantproperties/ParticipantPropertiesProcessor.java index c808efd..cfe33ac 100644 --- a/src/org/labkey/mobileappstudy/participantproperties/ParticipantPropertiesProcessor.java +++ b/src/org/labkey/mobileappstudy/participantproperties/ParticipantPropertiesProcessor.java @@ -1,7 +1,8 @@ package org.labkey.mobileappstudy.participantproperties; import org.apache.commons.lang3.StringUtils; -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; diff --git a/src/org/labkey/mobileappstudy/surveydesign/AbstractSurveyDesignProviderImpl.java b/src/org/labkey/mobileappstudy/surveydesign/AbstractSurveyDesignProviderImpl.java index 205c54d..8cce1b7 100644 --- a/src/org/labkey/mobileappstudy/surveydesign/AbstractSurveyDesignProviderImpl.java +++ b/src/org/labkey/mobileappstudy/surveydesign/AbstractSurveyDesignProviderImpl.java @@ -17,7 +17,8 @@ import com.fasterxml.jackson.databind.MapperFeature; import com.fasterxml.jackson.databind.ObjectMapper; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.labkey.api.data.Container; import org.labkey.mobileappstudy.data.ActivityMetadataResponse; import org.labkey.mobileappstudy.participantproperties.ParticipantPropertiesDesign; diff --git a/src/org/labkey/mobileappstudy/surveydesign/FileSurveyDesignProvider.java b/src/org/labkey/mobileappstudy/surveydesign/FileSurveyDesignProvider.java index b286f93..f0b64d0 100644 --- a/src/org/labkey/mobileappstudy/surveydesign/FileSurveyDesignProvider.java +++ b/src/org/labkey/mobileappstudy/surveydesign/FileSurveyDesignProvider.java @@ -15,7 +15,8 @@ */ package org.labkey.mobileappstudy.surveydesign; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.labkey.api.data.Container; import org.labkey.api.module.Module; import org.labkey.api.module.ModuleLoader; diff --git a/src/org/labkey/mobileappstudy/surveydesign/ServiceSurveyDesignProvider.java b/src/org/labkey/mobileappstudy/surveydesign/ServiceSurveyDesignProvider.java index 5f474de..78fe918 100644 --- a/src/org/labkey/mobileappstudy/surveydesign/ServiceSurveyDesignProvider.java +++ b/src/org/labkey/mobileappstudy/surveydesign/ServiceSurveyDesignProvider.java @@ -25,7 +25,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.Logger; +import org.apache.logging.log4j.LogManager; import org.labkey.api.data.Container; import org.labkey.api.module.Module; import org.labkey.api.module.ModuleLoader;