diff --git a/moskito-aop/pom.xml b/moskito-aop/pom.xml index 3b035c3ca..ab0368641 100644 --- a/moskito-aop/pom.xml +++ b/moskito-aop/pom.xml @@ -3,13 +3,13 @@ net.anotheria moskito - 3.2.9-SNAPSHOT + 4.0.2-SNAPSHOT 4.0.0 moskito-aop - 3.2.9-SNAPSHOT + 4.0.2-SNAPSHOT moskito aop @@ -34,12 +34,12 @@ org.aspectj aspectjrt - 1.8.8 + 1.9.20 org.aspectj aspectjweaver - 1.8.8 + 1.9.20 ch.qos.logback @@ -52,4 +52,4 @@ test - \ No newline at end of file + diff --git a/moskito-aop/src/main/java/net/anotheria/moskito/aop/aspect/MonitoringBaseAspect.java b/moskito-aop/src/main/java/net/anotheria/moskito/aop/aspect/MonitoringBaseAspect.java index 9f8754359..fe7e69dee 100644 --- a/moskito-aop/src/main/java/net/anotheria/moskito/aop/aspect/MonitoringBaseAspect.java +++ b/moskito-aop/src/main/java/net/anotheria/moskito/aop/aspect/MonitoringBaseAspect.java @@ -293,7 +293,7 @@ private StringBuilder getSpecialTreatmentForCall(String methodName, Object targe private static final ConcurrentMap specialCases = new ConcurrentHashMap<>(); static{ - specialCases.put("doFilter", new SpecialCase("doFilter", "javax.servlet.Filter", new HttpFilterHandler())); + specialCases.put("doFilter", new SpecialCase("doFilter", "jakarta.servlet.Filter", new HttpFilterHandler())); } /** @@ -322,4 +322,4 @@ static class SpecialCase{ } -} \ No newline at end of file +} diff --git a/moskito-aop/src/main/java/net/anotheria/moskito/aop/aspect/specialtreater/HttpFilterHandler.java b/moskito-aop/src/main/java/net/anotheria/moskito/aop/aspect/specialtreater/HttpFilterHandler.java index ba79c9664..149bf6b71 100644 --- a/moskito-aop/src/main/java/net/anotheria/moskito/aop/aspect/specialtreater/HttpFilterHandler.java +++ b/moskito-aop/src/main/java/net/anotheria/moskito/aop/aspect/specialtreater/HttpFilterHandler.java @@ -17,7 +17,7 @@ public StringBuilder getCallDescription(Class clazz, String methodName, Object t //this is special treater for http filter. try { - Class requestClazz = Class.forName("javax.servlet.http.HttpServletRequest"); + Class requestClazz = Class.forName("jakarta.servlet.http.HttpServletRequest"); Object requestObject = args[0]; if (!requestClazz.isInstance(requestObject)) return null; diff --git a/moskito-core/pom.xml b/moskito-core/pom.xml index c629a78ea..02f9c049f 100644 --- a/moskito-core/pom.xml +++ b/moskito-core/pom.xml @@ -3,12 +3,12 @@ net.anotheria moskito - 3.2.9-SNAPSHOT + 4.0.2-SNAPSHOT 4.0.0 moskito-core - 3.2.9-SNAPSHOT + 4.0.2-SNAPSHOT moskito core @@ -20,6 +20,7 @@ org.apache.logging.log4j log4j-core + 2.21.1 provided @@ -57,7 +58,12 @@ org.apache.commons commons-lang3 - 3.11 + 3.13.0 + + jakarta.xml.bind + jakarta.xml.bind-api + 4.0.1 + diff --git a/moskito-core/src/main/java/net/anotheria/moskito/core/config/dashboards/ChartPattern.java b/moskito-core/src/main/java/net/anotheria/moskito/core/config/dashboards/ChartPattern.java index 8e7d7ec9f..4e58f2ad6 100644 --- a/moskito-core/src/main/java/net/anotheria/moskito/core/config/dashboards/ChartPattern.java +++ b/moskito-core/src/main/java/net/anotheria/moskito/core/config/dashboards/ChartPattern.java @@ -36,7 +36,7 @@ public class ChartPattern implements Serializable { /** * Stores compiled accumulatorPatterns */ - private Pattern[] patterns; + private transient Pattern[] patterns; /** * Graph data mode (single charts or combined chart). diff --git a/moskito-core/src/main/java/net/anotheria/moskito/core/config/dashboards/DashboardConfig.java b/moskito-core/src/main/java/net/anotheria/moskito/core/config/dashboards/DashboardConfig.java index 36ce5a220..99ae80def 100644 --- a/moskito-core/src/main/java/net/anotheria/moskito/core/config/dashboards/DashboardConfig.java +++ b/moskito-core/src/main/java/net/anotheria/moskito/core/config/dashboards/DashboardConfig.java @@ -84,7 +84,7 @@ public class DashboardConfig implements Serializable{ /** * Stores compiled producerNamePatterns */ - private Pattern[] patterns; + private transient Pattern[] patterns; /** * Widgets that should be present on dashboard. diff --git a/moskito-core/src/main/java/net/anotheria/moskito/core/threshold/guard/LongBarrierPassGuard.java b/moskito-core/src/main/java/net/anotheria/moskito/core/threshold/guard/LongBarrierPassGuard.java index 801ef1538..08f55bd51 100644 --- a/moskito-core/src/main/java/net/anotheria/moskito/core/threshold/guard/LongBarrierPassGuard.java +++ b/moskito-core/src/main/java/net/anotheria/moskito/core/threshold/guard/LongBarrierPassGuard.java @@ -2,7 +2,7 @@ import net.anotheria.moskito.core.threshold.ThresholdStatus; -import javax.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlElement; import java.io.Serializable; /** diff --git a/moskito-extensions/moskito-additional-producers/pom.xml b/moskito-extensions/moskito-additional-producers/pom.xml index 6c962ffe5..a623c48fa 100644 --- a/moskito-extensions/moskito-additional-producers/pom.xml +++ b/moskito-extensions/moskito-additional-producers/pom.xml @@ -3,13 +3,13 @@ net.anotheria moskito - 3.2.9-SNAPSHOT + 4.0.2-SNAPSHOT ../../pom.xml 4.0.0 moskito-additional-producers - 3.2.9-SNAPSHOT + 4.0.2-SNAPSHOT additional producers @@ -31,7 +31,7 @@ com.googlecode.concurrentlinkedhashmap concurrentlinkedhashmap-lru - 1.4 + 1.4.2 - \ No newline at end of file + diff --git a/moskito-extensions/moskito-disk-space-monitoring/pom.xml b/moskito-extensions/moskito-disk-space-monitoring/pom.xml index eec2ef788..b6cb9a9cc 100644 --- a/moskito-extensions/moskito-disk-space-monitoring/pom.xml +++ b/moskito-extensions/moskito-disk-space-monitoring/pom.xml @@ -3,13 +3,13 @@ net.anotheria moskito - 3.2.9-SNAPSHOT + 4.0.2-SNAPSHOT ../../pom.xml 4.0.0 moskito-disk-space-monitoring - 3.2.9-SNAPSHOT + 4.0.2-SNAPSHOT moskito disk space monitoring @@ -37,4 +37,4 @@ gson - \ No newline at end of file + diff --git a/moskito-extensions/moskito-mongodb/pom.xml b/moskito-extensions/moskito-mongodb/pom.xml index 85973fec2..8aa5525c8 100644 --- a/moskito-extensions/moskito-mongodb/pom.xml +++ b/moskito-extensions/moskito-mongodb/pom.xml @@ -3,12 +3,12 @@ moskito-extensions net.anotheria - 3.2.9-SNAPSHOT + 4.0.2-SNAPSHOT 4.0.0 moskito-mongodb - 3.2.9-SNAPSHOT + 4.0.2-SNAPSHOT moskito mongodb monitoring @@ -31,4 +31,4 @@ - \ No newline at end of file + diff --git a/moskito-extensions/moskito-monitoring-plugin/pom.xml b/moskito-extensions/moskito-monitoring-plugin/pom.xml index 8ab2700f0..6f495cee2 100644 --- a/moskito-extensions/moskito-monitoring-plugin/pom.xml +++ b/moskito-extensions/moskito-monitoring-plugin/pom.xml @@ -3,12 +3,12 @@ moskito-extensions net.anotheria - 3.2.9-SNAPSHOT + 4.0.2-SNAPSHOT 4.0.0 moskito-monitoring-plugin - 3.2.9-SNAPSHOT + 4.0.2-SNAPSHOT moskito generic monitoring plugin jar @@ -33,4 +33,4 @@ - \ No newline at end of file + diff --git a/moskito-extensions/moskito-monitoring-plugin/src/main/java/net/anotheria/moskito/extensions/monitoring/fetcher/HttpHelper.java b/moskito-extensions/moskito-monitoring-plugin/src/main/java/net/anotheria/moskito/extensions/monitoring/fetcher/HttpHelper.java index 01fbbcef6..93380086b 100644 --- a/moskito-extensions/moskito-monitoring-plugin/src/main/java/net/anotheria/moskito/extensions/monitoring/fetcher/HttpHelper.java +++ b/moskito-extensions/moskito-monitoring-plugin/src/main/java/net/anotheria/moskito/extensions/monitoring/fetcher/HttpHelper.java @@ -1,6 +1,6 @@ package net.anotheria.moskito.extensions.monitoring.fetcher; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.http.HttpEntity; import org.apache.http.HttpResponse; import org.apache.http.HttpStatus; diff --git a/moskito-extensions/moskito-monitoring-plugin/src/main/java/net/anotheria/moskito/extensions/monitoring/stats/GenericStats.java b/moskito-extensions/moskito-monitoring-plugin/src/main/java/net/anotheria/moskito/extensions/monitoring/stats/GenericStats.java index c62852f3c..572dec941 100644 --- a/moskito-extensions/moskito-monitoring-plugin/src/main/java/net/anotheria/moskito/extensions/monitoring/stats/GenericStats.java +++ b/moskito-extensions/moskito-monitoring-plugin/src/main/java/net/anotheria/moskito/extensions/monitoring/stats/GenericStats.java @@ -54,7 +54,7 @@ protected GenericStats(String aName, List metrics) { /** * Get 'neverUpdated' status of this GenericStats. - * @return false until first values update and true - after. + * @return false until first values update and true - after. */ public boolean isNeverUpdated() { return neverUpdated; diff --git a/moskito-extensions/moskito-notification-providers/pom.xml b/moskito-extensions/moskito-notification-providers/pom.xml index f760022b5..9eb8ebaa3 100644 --- a/moskito-extensions/moskito-notification-providers/pom.xml +++ b/moskito-extensions/moskito-notification-providers/pom.xml @@ -3,13 +3,13 @@ net.anotheria moskito - 3.2.9-SNAPSHOT + 4.0.2-SNAPSHOT ../../pom.xml 4.0.0 moskito-notification-providers - 3.2.9-SNAPSHOT + 4.0.2-SNAPSHOT notification providers @@ -37,5 +37,10 @@ net.anotheria ano-comm + + jakarta.ws.rs + jakarta.ws.rs-api + 3.1.0 + - \ No newline at end of file + diff --git a/moskito-extensions/moskito-notification-providers/src/main/java/net/anotheria/moskito/extensions/notificationproviders/MailgunNotificationProvider.java b/moskito-extensions/moskito-notification-providers/src/main/java/net/anotheria/moskito/extensions/notificationproviders/MailgunNotificationProvider.java index 6524357a9..575c5ecb7 100644 --- a/moskito-extensions/moskito-notification-providers/src/main/java/net/anotheria/moskito/extensions/notificationproviders/MailgunNotificationProvider.java +++ b/moskito-extensions/moskito-notification-providers/src/main/java/net/anotheria/moskito/extensions/notificationproviders/MailgunNotificationProvider.java @@ -1,23 +1,22 @@ package net.anotheria.moskito.extensions.notificationproviders; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.ClientBuilder; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.core.MediaType; import net.anotheria.moskito.core.config.thresholds.NotificationProviderConfig; import net.anotheria.moskito.core.threshold.alerts.NotificationProvider; import net.anotheria.moskito.core.threshold.alerts.ThresholdAlert; import net.anotheria.moskito.core.util.IOUtils; import net.anotheria.moskito.extensions.notificationtemplate.ThresholdAlertTemplate; import net.anotheria.util.StringUtils; -import org.glassfish.jersey.client.ClientConfig; import org.glassfish.jersey.client.ClientResponse; import org.glassfish.jersey.client.authentication.HttpAuthenticationFeature; import org.glassfish.jersey.internal.util.collection.MultivaluedStringMap; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.client.Entity; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; import java.util.ArrayList; /** @@ -97,11 +96,9 @@ public MailgunNotificationProvider() { sender = System.getProperty(SYSTEM_PROPERTY_SENDER, DEFAULT_SENDER); log.debug("Sender is " + sender); - ClientConfig config = new ClientConfig(); HttpAuthenticationFeature feature = HttpAuthenticationFeature.basicBuilder().nonPreemptive().credentials("api", anApiKey).build(); - config.register(feature); - client = ClientBuilder.newClient(config); - + client = ClientBuilder.newClient(); + client.register(feature); } diff --git a/moskito-extensions/moskito-php/pom.xml b/moskito-extensions/moskito-php/pom.xml index 42cdcb28f..f02a2bacf 100644 --- a/moskito-extensions/moskito-php/pom.xml +++ b/moskito-extensions/moskito-php/pom.xml @@ -3,12 +3,12 @@ moskito-extensions net.anotheria - 3.2.9-SNAPSHOT + 4.0.2-SNAPSHOT 4.0.0 moskito-php - + 4.0.2-SNAPSHOT @@ -20,14 +20,14 @@ com.rabbitmq amqp-client - 5.18.0 + 5.20.0 com.google.code.gson gson - 2.8.9 + 2.10.1 - \ No newline at end of file + diff --git a/moskito-extensions/moskito-saas/pom.xml b/moskito-extensions/moskito-saas/pom.xml index 24ba1254f..61540c821 100644 --- a/moskito-extensions/moskito-saas/pom.xml +++ b/moskito-extensions/moskito-saas/pom.xml @@ -3,13 +3,13 @@ net.anotheria moskito - 3.2.9-SNAPSHOT + 4.0.2-SNAPSHOT ../../pom.xml 4.0.0 moskito-saas-plugin - 3.2.9-SNAPSHOT + 4.0.2-SNAPSHOT moskito-saas-plugin @@ -33,4 +33,4 @@ test - \ No newline at end of file + diff --git a/moskito-extensions/moskito-sampling-api/pom.xml b/moskito-extensions/moskito-sampling-api/pom.xml index baa7107d1..cc9936c58 100644 --- a/moskito-extensions/moskito-sampling-api/pom.xml +++ b/moskito-extensions/moskito-sampling-api/pom.xml @@ -3,13 +3,13 @@ net.anotheria moskito - 3.2.9-SNAPSHOT + 4.0.2-SNAPSHOT ../../pom.xml 4.0.0 moskito-sampling-api - 3.2.9-SNAPSHOT + 4.0.2-SNAPSHOT sampling api @@ -33,10 +33,10 @@ test - javax.servlet - javax.servlet-api + jakarta.servlet + jakarta.servlet-api provided - \ No newline at end of file + diff --git a/moskito-extensions/moskito-sampling-api/src/main/java/net/anotheria/moskito/extensions/sampling/endpoints/servlet/SamplingServlet.java b/moskito-extensions/moskito-sampling-api/src/main/java/net/anotheria/moskito/extensions/sampling/endpoints/servlet/SamplingServlet.java index 6f7580fb2..928a9a41d 100644 --- a/moskito-extensions/moskito-sampling-api/src/main/java/net/anotheria/moskito/extensions/sampling/endpoints/servlet/SamplingServlet.java +++ b/moskito-extensions/moskito-sampling-api/src/main/java/net/anotheria/moskito/extensions/sampling/endpoints/servlet/SamplingServlet.java @@ -4,10 +4,10 @@ import net.anotheria.moskito.extensions.sampling.SamplingEngine; import net.anotheria.moskito.web.MoskitoHttpServlet; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.Enumeration; import java.util.HashMap; diff --git a/moskito-extensions/pom.xml b/moskito-extensions/pom.xml index 280a5cee9..47753f8bd 100644 --- a/moskito-extensions/pom.xml +++ b/moskito-extensions/pom.xml @@ -3,12 +3,12 @@ net.anotheria moskito - 3.2.9-SNAPSHOT + 4.0.2-SNAPSHOT 4.0.0 moskito-extensions - 3.2.9-SNAPSHOT + 4.0.2-SNAPSHOT moskito extensions aggregator pom diff --git a/moskito-inspect-standalone/pom.xml b/moskito-inspect-standalone/pom.xml index 6bae13489..0c3572784 100644 --- a/moskito-inspect-standalone/pom.xml +++ b/moskito-inspect-standalone/pom.xml @@ -3,16 +3,16 @@ net.anotheria moskito - 3.2.9-SNAPSHOT + 4.0.2-SNAPSHOT 4.0.0 moskito-inspect-standalone - 3.2.9-SNAPSHOT + 4.0.2-SNAPSHOT MoSKito Inspect Standalone Application war - 3.17.0 + 5.9.0 @@ -59,11 +59,11 @@ ${project.version} - - javax.servlet - javax.servlet-api - provided - + + jakarta.servlet + jakarta.servlet-api + provided + org.slf4j slf4j-api @@ -93,7 +93,7 @@ maven-war-plugin - 2.1 + 3.4.0 moskito @@ -298,4 +298,4 @@ - \ No newline at end of file + diff --git a/moskito-inspect-standalone/src/main/java/net/anotheria/inspect/testing/FibonacciAction.java b/moskito-inspect-standalone/src/main/java/net/anotheria/inspect/testing/FibonacciAction.java index aafcb058e..627babcde 100644 --- a/moskito-inspect-standalone/src/main/java/net/anotheria/inspect/testing/FibonacciAction.java +++ b/moskito-inspect-standalone/src/main/java/net/anotheria/inspect/testing/FibonacciAction.java @@ -5,8 +5,8 @@ import net.anotheria.maf.action.ActionMapping; import net.anotheria.moskito.aop.annotation.Monitor; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * TODO comment this class diff --git a/moskito-inspect-standalone/src/main/java/net/anotheria/moskitominimal/listeners/SetupThresholds.java b/moskito-inspect-standalone/src/main/java/net/anotheria/moskitominimal/listeners/SetupThresholds.java index 7f1a32d67..15d0c76e7 100644 --- a/moskito-inspect-standalone/src/main/java/net/anotheria/moskitominimal/listeners/SetupThresholds.java +++ b/moskito-inspect-standalone/src/main/java/net/anotheria/moskitominimal/listeners/SetupThresholds.java @@ -8,8 +8,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.servlet.ServletContextEvent; -import javax.servlet.ServletContextListener; +import jakarta.servlet.ServletContextEvent; +import jakarta.servlet.ServletContextListener; /** * Don't use this listener anymore, use moskito.json to configure thresholds. diff --git a/moskito-integration/moskito-cdi/pom.xml b/moskito-integration/moskito-cdi/pom.xml index 4a8311912..3d5e112df 100644 --- a/moskito-integration/moskito-cdi/pom.xml +++ b/moskito-integration/moskito-cdi/pom.xml @@ -3,13 +3,13 @@ net.anotheria moskito - 3.2.9-SNAPSHOT + 4.0.2-SNAPSHOT ../../pom.xml 4.0.0 moskito-cdi - 3.2.9-SNAPSHOT + 4.0.2-SNAPSHOT moskito cdi integration @@ -19,11 +19,12 @@ ${project.version} - javax.enterprise - cdi-api - 1.1 + jakarta.enterprise + jakarta.enterprise.cdi-api + 4.0.1 provided + org.slf4j slf4j-api @@ -33,5 +34,10 @@ logback-classic test + + jakarta.interceptor + jakarta.interceptor-api + 2.1.0 + - \ No newline at end of file + diff --git a/moskito-integration/moskito-cdi/src/main/java/net/anotheria/moskito/integration/cdi/AbstractInterceptor.java b/moskito-integration/moskito-cdi/src/main/java/net/anotheria/moskito/integration/cdi/AbstractInterceptor.java index da2e8b3a9..3537efa33 100644 --- a/moskito-integration/moskito-cdi/src/main/java/net/anotheria/moskito/integration/cdi/AbstractInterceptor.java +++ b/moskito-integration/moskito-cdi/src/main/java/net/anotheria/moskito/integration/cdi/AbstractInterceptor.java @@ -13,7 +13,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.interceptor.InvocationContext; +import jakarta.interceptor.InvocationContext; import java.lang.annotation.Annotation; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; diff --git a/moskito-integration/moskito-cdi/src/main/java/net/anotheria/moskito/integration/cdi/count/Count.java b/moskito-integration/moskito-cdi/src/main/java/net/anotheria/moskito/integration/cdi/count/Count.java index fb88225fc..ec8ee2f99 100644 --- a/moskito-integration/moskito-cdi/src/main/java/net/anotheria/moskito/integration/cdi/count/Count.java +++ b/moskito-integration/moskito-cdi/src/main/java/net/anotheria/moskito/integration/cdi/count/Count.java @@ -1,7 +1,7 @@ package net.anotheria.moskito.integration.cdi.count; -import javax.enterprise.util.Nonbinding; -import javax.interceptor.InterceptorBinding; +import jakarta.enterprise.util.Nonbinding; +import jakarta.interceptor.InterceptorBinding; import java.lang.annotation.ElementType; import java.lang.annotation.Inherited; import java.lang.annotation.Retention; diff --git a/moskito-integration/moskito-cdi/src/main/java/net/anotheria/moskito/integration/cdi/count/CountInterceptor.java b/moskito-integration/moskito-cdi/src/main/java/net/anotheria/moskito/integration/cdi/count/CountInterceptor.java index 541338f19..44a6e17ee 100644 --- a/moskito-integration/moskito-cdi/src/main/java/net/anotheria/moskito/integration/cdi/count/CountInterceptor.java +++ b/moskito-integration/moskito-cdi/src/main/java/net/anotheria/moskito/integration/cdi/count/CountInterceptor.java @@ -6,10 +6,10 @@ import net.anotheria.moskito.core.dynamic.OnDemandStatsProducer; import net.anotheria.moskito.integration.cdi.AbstractInterceptor; -import javax.interceptor.AroundInvoke; -import javax.interceptor.AroundTimeout; -import javax.interceptor.Interceptor; -import javax.interceptor.InvocationContext; +import jakarta.interceptor.AroundInvoke; +import jakarta.interceptor.AroundTimeout; +import jakarta.interceptor.Interceptor; +import jakarta.interceptor.InvocationContext; import java.io.Serializable; import java.lang.reflect.Method; diff --git a/moskito-integration/moskito-cdi/src/main/java/net/anotheria/moskito/integration/cdi/monitor/Monitor.java b/moskito-integration/moskito-cdi/src/main/java/net/anotheria/moskito/integration/cdi/monitor/Monitor.java index 3642e5319..e95b90db9 100644 --- a/moskito-integration/moskito-cdi/src/main/java/net/anotheria/moskito/integration/cdi/monitor/Monitor.java +++ b/moskito-integration/moskito-cdi/src/main/java/net/anotheria/moskito/integration/cdi/monitor/Monitor.java @@ -1,7 +1,7 @@ package net.anotheria.moskito.integration.cdi.monitor; -import javax.enterprise.util.Nonbinding; -import javax.interceptor.InterceptorBinding; +import jakarta.enterprise.util.Nonbinding; +import jakarta.interceptor.InterceptorBinding; import java.lang.annotation.ElementType; import java.lang.annotation.Inherited; import java.lang.annotation.Retention; diff --git a/moskito-integration/moskito-cdi/src/main/java/net/anotheria/moskito/integration/cdi/monitor/MonitorInterceptor.java b/moskito-integration/moskito-cdi/src/main/java/net/anotheria/moskito/integration/cdi/monitor/MonitorInterceptor.java index b69dbbf35..2f07f47e0 100644 --- a/moskito-integration/moskito-cdi/src/main/java/net/anotheria/moskito/integration/cdi/monitor/MonitorInterceptor.java +++ b/moskito-integration/moskito-cdi/src/main/java/net/anotheria/moskito/integration/cdi/monitor/MonitorInterceptor.java @@ -18,10 +18,10 @@ import net.anotheria.moskito.integration.cdi.AbstractInterceptor; import net.anotheria.moskito.integration.cdi.StatName; -import javax.interceptor.AroundInvoke; -import javax.interceptor.AroundTimeout; -import javax.interceptor.Interceptor; -import javax.interceptor.InvocationContext; +import jakarta.interceptor.AroundInvoke; +import jakarta.interceptor.AroundTimeout; +import jakarta.interceptor.Interceptor; +import jakarta.interceptor.InvocationContext; import java.io.Serializable; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; diff --git a/moskito-integration/moskito-ehcache/pom.xml b/moskito-integration/moskito-ehcache/pom.xml index e9c2c81ad..3ccab0687 100644 --- a/moskito-integration/moskito-ehcache/pom.xml +++ b/moskito-integration/moskito-ehcache/pom.xml @@ -3,19 +3,19 @@ moskito-integration net.anotheria - 3.2.9-SNAPSHOT + 4.0.2-SNAPSHOT 4.0.0 moskito-ehcache - 3.2.9-SNAPSHOT + 4.0.2-SNAPSHOT moskito ehcache integration net.sf.ehcache ehcache-core - 2.6.5 + 2.6.11 provided @@ -32,4 +32,4 @@ - \ No newline at end of file + diff --git a/moskito-integration/moskito-inspect-embedded/pom.xml b/moskito-integration/moskito-inspect-embedded/pom.xml index 20292fd60..4f147fa50 100644 --- a/moskito-integration/moskito-inspect-embedded/pom.xml +++ b/moskito-integration/moskito-inspect-embedded/pom.xml @@ -3,12 +3,12 @@ net.anotheria moskito-integration - 3.2.9-SNAPSHOT + 4.0.2-SNAPSHOT 4.0.0 moskito-inspect-embedded - 3.2.9-SNAPSHOT + 4.0.2-SNAPSHOT moskito inspect embedded This project contains dependencies and configuration (web-fragment) needed to enable moskito-inspect in embedded mode. To use it simply add it as dependency. @@ -21,4 +21,4 @@ ${project.version} - \ No newline at end of file + diff --git a/moskito-integration/moskito-inspect-jersey/pom.xml b/moskito-integration/moskito-inspect-jersey/pom.xml index f100c2bcf..f6fbc38b0 100644 --- a/moskito-integration/moskito-inspect-jersey/pom.xml +++ b/moskito-integration/moskito-inspect-jersey/pom.xml @@ -3,12 +3,12 @@ net.anotheria moskito-integration - 3.2.9-SNAPSHOT + 4.0.2-SNAPSHOT 4.0.0 moskito-inspect-jersey - 3.2.9-SNAPSHOT + 4.0.2-SNAPSHOT moskito embedded web rest interface - jersey support This project contains dependencies and configuration (web-fragment) needed to enable moskito-inspect rest interface via Jersey. To use it simply add it as dependency. @@ -38,4 +38,4 @@ jersey-hk2 - \ No newline at end of file + diff --git a/moskito-integration/moskito-inspect-remote/pom.xml b/moskito-integration/moskito-inspect-remote/pom.xml index 2d3ca6213..06ef34752 100644 --- a/moskito-integration/moskito-inspect-remote/pom.xml +++ b/moskito-integration/moskito-inspect-remote/pom.xml @@ -3,12 +3,12 @@ net.anotheria moskito-integration - 3.2.9-SNAPSHOT + 4.0.2-SNAPSHOT 4.0.0 moskito-inspect-remote - 3.2.9-SNAPSHOT + 4.0.2-SNAPSHOT moskito inspect support for remote inspect connection This project contains dependencies and configuration (web-fragment) needed to enable moskito-inspect remotely. To use it simply add it as dependency. @@ -21,4 +21,4 @@ ${project.version} - \ No newline at end of file + diff --git a/moskito-integration/moskito-springboot/pom.xml b/moskito-integration/moskito-springboot/pom.xml index f9540ba5d..c86fd6aa5 100644 --- a/moskito-integration/moskito-springboot/pom.xml +++ b/moskito-integration/moskito-springboot/pom.xml @@ -3,12 +3,12 @@ net.anotheria moskito-integration - 3.2.9-SNAPSHOT + 4.0.2-SNAPSHOT 4.0.0 moskito-springboot - 3.2.9-SNAPSHOT + 4.0.2-SNAPSHOT moskito springboot integration @@ -40,5 +40,10 @@ javax.servlet-api provided + + jakarta.annotation + jakarta.annotation-api + 1.3.5 + - \ No newline at end of file + diff --git a/moskito-integration/moskito-springboot2/pom.xml b/moskito-integration/moskito-springboot2/pom.xml index e0202375c..9e8bee3d9 100644 --- a/moskito-integration/moskito-springboot2/pom.xml +++ b/moskito-integration/moskito-springboot2/pom.xml @@ -3,12 +3,12 @@ net.anotheria moskito-integration - 3.2.9-SNAPSHOT + 4.0.0-SNAPSHOT 4.0.0 moskito-springboot2 - 3.2.9-SNAPSHOT + 4.0.0-SNAPSHOT moskito springboot 2 integration @@ -57,4 +57,4 @@ provided - \ No newline at end of file + diff --git a/moskito-integration/moskito-sql/pom.xml b/moskito-integration/moskito-sql/pom.xml index 605b681f8..47c3146cd 100644 --- a/moskito-integration/moskito-sql/pom.xml +++ b/moskito-integration/moskito-sql/pom.xml @@ -3,14 +3,14 @@ net.anotheria moskito - 3.2.9-SNAPSHOT + 4.0.2-SNAPSHOT ../../pom.xml 4.0.0 moskito-sql - 3.2.9-SNAPSHOT + 4.0.2-SNAPSHOT moskito sql integration @@ -50,31 +50,31 @@ org.apache.derby derby - 10.17.1.0 + 10.16.1.1 test org.apache.derby derbytools - 10.8.1.2 + 10.16.1.1 test org.apache.derby derbynet - 10.8.1.2 + 10.16.1.1 test org.apache.derby derbyclient - 10.8.1.2 + 10.16.1.1 test net.anotheria ano-db - 2.1.0 + 4.0.0 test @@ -85,4 +85,4 @@ - \ No newline at end of file + diff --git a/moskito-integration/moskito-sql/src/test/java/net/anotheria/moskito/sql/util/TestDBUtil.java b/moskito-integration/moskito-sql/src/test/java/net/anotheria/moskito/sql/util/TestDBUtil.java index 152792434..c18614504 100644 --- a/moskito-integration/moskito-sql/src/test/java/net/anotheria/moskito/sql/util/TestDBUtil.java +++ b/moskito-integration/moskito-sql/src/test/java/net/anotheria/moskito/sql/util/TestDBUtil.java @@ -2,7 +2,7 @@ import net.anotheria.db.config.JDBCConfig; import net.anotheria.db.config.JDBCConfigFactory; -import org.apache.commons.dbcp.BasicDataSource; +import org.apache.commons.dbcp2.BasicDataSource; import java.sql.Connection; import java.sql.SQLException; @@ -50,7 +50,7 @@ public static Connection getConnection() throws SQLException { newDataSource.setPassword(config.getPassword()); if (config.getMaxConnections() != Integer.MAX_VALUE) - newDataSource.setMaxActive(config.getMaxConnections()); + newDataSource.setMaxTotal(config.getMaxConnections()); return newDataSource.getConnection(); } } diff --git a/moskito-integration/pom.xml b/moskito-integration/pom.xml index 641e0250c..5f86a6d1d 100644 --- a/moskito-integration/pom.xml +++ b/moskito-integration/pom.xml @@ -3,12 +3,12 @@ net.anotheria moskito - 3.2.9-SNAPSHOT + 4.0.2-SNAPSHOT 4.0.0 moskito-integration - 3.2.9-SNAPSHOT + 4.0.2-SNAPSHOT moskito integration aggregator pom @@ -19,7 +19,7 @@ moskito-inspect-jersey moskito-inspect-remote moskito-inspect-embedded - moskito-springboot - moskito-springboot2 + + - \ No newline at end of file + diff --git a/moskito-web/pom.xml b/moskito-web/pom.xml index 618d6a85e..c1fe944ab 100644 --- a/moskito-web/pom.xml +++ b/moskito-web/pom.xml @@ -3,12 +3,12 @@ net.anotheria moskito - 3.2.9-SNAPSHOT + 4.0.2-SNAPSHOT 4.0.0 moskito-web - 3.2.9-SNAPSHOT + 4.0.2-SNAPSHOT moskito web support @@ -26,17 +26,17 @@ moskito-core ${project.version} - - javax.servlet - javax.servlet-api - provided - + + jakarta.servlet + jakarta.servlet-api + provided + org.mockito mockito-core - 1.10.19 + 5.6.0 test - \ No newline at end of file + diff --git a/moskito-web/src/main/java/net/anotheria/moskito/web/MoskitoFilter.java b/moskito-web/src/main/java/net/anotheria/moskito/web/MoskitoFilter.java index 3b9f54553..92ab7f4df 100644 --- a/moskito-web/src/main/java/net/anotheria/moskito/web/MoskitoFilter.java +++ b/moskito-web/src/main/java/net/anotheria/moskito/web/MoskitoFilter.java @@ -45,12 +45,12 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; import java.io.IOException; /** diff --git a/moskito-web/src/main/java/net/anotheria/moskito/web/MoskitoHttpServlet.java b/moskito-web/src/main/java/net/anotheria/moskito/web/MoskitoHttpServlet.java index 108ae5c41..9c01d05b2 100644 --- a/moskito-web/src/main/java/net/anotheria/moskito/web/MoskitoHttpServlet.java +++ b/moskito-web/src/main/java/net/anotheria/moskito/web/MoskitoHttpServlet.java @@ -47,11 +47,11 @@ import net.anotheria.moskito.core.registry.ProducerRegistryFactory; import net.anotheria.moskito.core.stats.Interval; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.ArrayList; import java.util.List; diff --git a/moskito-web/src/main/java/net/anotheria/moskito/web/filters/AsyncSourceTldFilter.java b/moskito-web/src/main/java/net/anotheria/moskito/web/filters/AsyncSourceTldFilter.java index b4d58b224..008735bc4 100644 --- a/moskito-web/src/main/java/net/anotheria/moskito/web/filters/AsyncSourceTldFilter.java +++ b/moskito-web/src/main/java/net/anotheria/moskito/web/filters/AsyncSourceTldFilter.java @@ -8,11 +8,11 @@ import net.anotheria.util.queue.QueuedProcessor; import net.anotheria.util.queue.UnrecoverableQueueOverflowException; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; +import jakarta.servlet.FilterChain; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; import java.io.IOException; import java.net.InetAddress; diff --git a/moskito-web/src/main/java/net/anotheria/moskito/web/filters/DebugRequestFilter.java b/moskito-web/src/main/java/net/anotheria/moskito/web/filters/DebugRequestFilter.java index 1780b2687..d7fe23b77 100644 --- a/moskito-web/src/main/java/net/anotheria/moskito/web/filters/DebugRequestFilter.java +++ b/moskito-web/src/main/java/net/anotheria/moskito/web/filters/DebugRequestFilter.java @@ -3,14 +3,14 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpSession; import java.io.IOException; import java.util.Enumeration; import java.util.Map; diff --git a/moskito-web/src/main/java/net/anotheria/moskito/web/filters/DomainFilter.java b/moskito-web/src/main/java/net/anotheria/moskito/web/filters/DomainFilter.java index c7fb92927..538221120 100644 --- a/moskito-web/src/main/java/net/anotheria/moskito/web/filters/DomainFilter.java +++ b/moskito-web/src/main/java/net/anotheria/moskito/web/filters/DomainFilter.java @@ -36,8 +36,8 @@ import net.anotheria.moskito.web.MoskitoFilter; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; /** * This filter counts the requests by the domain. diff --git a/moskito-web/src/main/java/net/anotheria/moskito/web/filters/GenericMonitoringFilter.java b/moskito-web/src/main/java/net/anotheria/moskito/web/filters/GenericMonitoringFilter.java index 39ae5b004..39696350e 100644 --- a/moskito-web/src/main/java/net/anotheria/moskito/web/filters/GenericMonitoringFilter.java +++ b/moskito-web/src/main/java/net/anotheria/moskito/web/filters/GenericMonitoringFilter.java @@ -17,14 +17,14 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.Collections; import java.util.HashMap; diff --git a/moskito-web/src/main/java/net/anotheria/moskito/web/filters/JSTalkBackFilter.java b/moskito-web/src/main/java/net/anotheria/moskito/web/filters/JSTalkBackFilter.java index ba4faf656..a597ed5a2 100644 --- a/moskito-web/src/main/java/net/anotheria/moskito/web/filters/JSTalkBackFilter.java +++ b/moskito-web/src/main/java/net/anotheria/moskito/web/filters/JSTalkBackFilter.java @@ -11,14 +11,14 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.PrintWriter; diff --git a/moskito-web/src/main/java/net/anotheria/moskito/web/filters/JourneyFilter.java b/moskito-web/src/main/java/net/anotheria/moskito/web/filters/JourneyFilter.java index a1005bbf8..f26a8f77d 100644 --- a/moskito-web/src/main/java/net/anotheria/moskito/web/filters/JourneyFilter.java +++ b/moskito-web/src/main/java/net/anotheria/moskito/web/filters/JourneyFilter.java @@ -19,14 +19,14 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpSession; import java.io.IOException; diff --git a/moskito-web/src/main/java/net/anotheria/moskito/web/filters/JourneyStarterFilter.java b/moskito-web/src/main/java/net/anotheria/moskito/web/filters/JourneyStarterFilter.java index 2ce4fd4d2..66d1ad679 100644 --- a/moskito-web/src/main/java/net/anotheria/moskito/web/filters/JourneyStarterFilter.java +++ b/moskito-web/src/main/java/net/anotheria/moskito/web/filters/JourneyStarterFilter.java @@ -8,14 +8,14 @@ import net.anotheria.moskito.core.journey.JourneyManagerFactory; import net.anotheria.moskito.core.journey.NoSuchJourneyException; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpSession; import java.io.IOException; /** diff --git a/moskito-web/src/main/java/net/anotheria/moskito/web/filters/MethodFilter.java b/moskito-web/src/main/java/net/anotheria/moskito/web/filters/MethodFilter.java index 9a82335a1..a14bd4254 100644 --- a/moskito-web/src/main/java/net/anotheria/moskito/web/filters/MethodFilter.java +++ b/moskito-web/src/main/java/net/anotheria/moskito/web/filters/MethodFilter.java @@ -36,9 +36,9 @@ import net.anotheria.moskito.web.MoskitoFilter; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletRequest; /** * This filter distinguishes by the method of the request. diff --git a/moskito-web/src/main/java/net/anotheria/moskito/web/filters/MoskitoCommandFilter.java b/moskito-web/src/main/java/net/anotheria/moskito/web/filters/MoskitoCommandFilter.java index 383a3d907..b371a3bc8 100644 --- a/moskito-web/src/main/java/net/anotheria/moskito/web/filters/MoskitoCommandFilter.java +++ b/moskito-web/src/main/java/net/anotheria/moskito/web/filters/MoskitoCommandFilter.java @@ -2,12 +2,12 @@ import net.anotheria.moskito.core.command.CommandControllerFactory; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; import java.io.IOException; import java.util.Map; diff --git a/moskito-web/src/main/java/net/anotheria/moskito/web/filters/RefererFilter.java b/moskito-web/src/main/java/net/anotheria/moskito/web/filters/RefererFilter.java index b12ad1933..b39266822 100644 --- a/moskito-web/src/main/java/net/anotheria/moskito/web/filters/RefererFilter.java +++ b/moskito-web/src/main/java/net/anotheria/moskito/web/filters/RefererFilter.java @@ -36,9 +36,9 @@ import net.anotheria.moskito.web.MoskitoFilter; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletRequest; /** * This filter measures calls by referer. diff --git a/moskito-web/src/main/java/net/anotheria/moskito/web/filters/RequestURIFilter.java b/moskito-web/src/main/java/net/anotheria/moskito/web/filters/RequestURIFilter.java index 1b206e217..26db19c5d 100644 --- a/moskito-web/src/main/java/net/anotheria/moskito/web/filters/RequestURIFilter.java +++ b/moskito-web/src/main/java/net/anotheria/moskito/web/filters/RequestURIFilter.java @@ -36,9 +36,9 @@ import net.anotheria.moskito.web.MoskitoFilter; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletRequest; /** * This filter measures the urls by the request uri. diff --git a/moskito-web/src/main/java/net/anotheria/moskito/web/filters/SourceIpSegmentFilter.java b/moskito-web/src/main/java/net/anotheria/moskito/web/filters/SourceIpSegmentFilter.java index fa27010d5..3abb02e87 100644 --- a/moskito-web/src/main/java/net/anotheria/moskito/web/filters/SourceIpSegmentFilter.java +++ b/moskito-web/src/main/java/net/anotheria/moskito/web/filters/SourceIpSegmentFilter.java @@ -2,9 +2,9 @@ import net.anotheria.moskito.web.MoskitoFilter; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletRequest; /** * This filter separates the traffic by first part of the ip address. diff --git a/moskito-web/src/main/java/net/anotheria/moskito/web/filters/SourceTldFilter.java b/moskito-web/src/main/java/net/anotheria/moskito/web/filters/SourceTldFilter.java index 8a6c6b70e..4522a0032 100644 --- a/moskito-web/src/main/java/net/anotheria/moskito/web/filters/SourceTldFilter.java +++ b/moskito-web/src/main/java/net/anotheria/moskito/web/filters/SourceTldFilter.java @@ -2,9 +2,9 @@ import net.anotheria.moskito.web.MoskitoFilter; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletRequest; /** * This filter separates the traffic by source top level domain. diff --git a/moskito-web/src/main/java/net/anotheria/moskito/web/filters/UserAgentFilter.java b/moskito-web/src/main/java/net/anotheria/moskito/web/filters/UserAgentFilter.java index 7c106d9b6..f9e60944f 100644 --- a/moskito-web/src/main/java/net/anotheria/moskito/web/filters/UserAgentFilter.java +++ b/moskito-web/src/main/java/net/anotheria/moskito/web/filters/UserAgentFilter.java @@ -36,9 +36,9 @@ import net.anotheria.moskito.web.MoskitoFilter; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletRequest; /** * This filter measures the url calls by the used user-agent. diff --git a/moskito-web/src/main/java/net/anotheria/moskito/web/filters/caseextractor/DomainCaseExtractor.java b/moskito-web/src/main/java/net/anotheria/moskito/web/filters/caseextractor/DomainCaseExtractor.java index 27a13d655..cdef56907 100644 --- a/moskito-web/src/main/java/net/anotheria/moskito/web/filters/caseextractor/DomainCaseExtractor.java +++ b/moskito-web/src/main/java/net/anotheria/moskito/web/filters/caseextractor/DomainCaseExtractor.java @@ -34,7 +34,7 @@ */ package net.anotheria.moskito.web.filters.caseextractor; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; /** * This filter measures calls by server name used by the user / domain field. diff --git a/moskito-web/src/main/java/net/anotheria/moskito/web/filters/caseextractor/FilterCaseExtractor.java b/moskito-web/src/main/java/net/anotheria/moskito/web/filters/caseextractor/FilterCaseExtractor.java index 0dc8f7657..fc652acb8 100644 --- a/moskito-web/src/main/java/net/anotheria/moskito/web/filters/caseextractor/FilterCaseExtractor.java +++ b/moskito-web/src/main/java/net/anotheria/moskito/web/filters/caseextractor/FilterCaseExtractor.java @@ -1,6 +1,6 @@ package net.anotheria.moskito.web.filters.caseextractor; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; /** * TODO comment this class diff --git a/moskito-web/src/main/java/net/anotheria/moskito/web/filters/caseextractor/MethodCaseExtractor.java b/moskito-web/src/main/java/net/anotheria/moskito/web/filters/caseextractor/MethodCaseExtractor.java index 8843fe329..dc07a31c3 100644 --- a/moskito-web/src/main/java/net/anotheria/moskito/web/filters/caseextractor/MethodCaseExtractor.java +++ b/moskito-web/src/main/java/net/anotheria/moskito/web/filters/caseextractor/MethodCaseExtractor.java @@ -34,7 +34,7 @@ */ package net.anotheria.moskito.web.filters.caseextractor; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; /** * This filter measures calls by http-method (GET, POST) diff --git a/moskito-web/src/main/java/net/anotheria/moskito/web/filters/caseextractor/RefererCaseExtractor.java b/moskito-web/src/main/java/net/anotheria/moskito/web/filters/caseextractor/RefererCaseExtractor.java index 8bd536dd2..6c832bedd 100644 --- a/moskito-web/src/main/java/net/anotheria/moskito/web/filters/caseextractor/RefererCaseExtractor.java +++ b/moskito-web/src/main/java/net/anotheria/moskito/web/filters/caseextractor/RefererCaseExtractor.java @@ -34,7 +34,7 @@ */ package net.anotheria.moskito.web.filters.caseextractor; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; /** diff --git a/moskito-web/src/main/java/net/anotheria/moskito/web/filters/caseextractor/RequestURICaseExtractor.java b/moskito-web/src/main/java/net/anotheria/moskito/web/filters/caseextractor/RequestURICaseExtractor.java index dd4d9ab81..9fd805340 100644 --- a/moskito-web/src/main/java/net/anotheria/moskito/web/filters/caseextractor/RequestURICaseExtractor.java +++ b/moskito-web/src/main/java/net/anotheria/moskito/web/filters/caseextractor/RequestURICaseExtractor.java @@ -34,7 +34,7 @@ */ package net.anotheria.moskito.web.filters.caseextractor; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; /** * This filter measures the urls by the request uri. diff --git a/moskito-web/src/main/java/net/anotheria/moskito/web/filters/caseextractor/UserAgentCaseExtractor.java b/moskito-web/src/main/java/net/anotheria/moskito/web/filters/caseextractor/UserAgentCaseExtractor.java index ad92d71be..008870caa 100644 --- a/moskito-web/src/main/java/net/anotheria/moskito/web/filters/caseextractor/UserAgentCaseExtractor.java +++ b/moskito-web/src/main/java/net/anotheria/moskito/web/filters/caseextractor/UserAgentCaseExtractor.java @@ -34,7 +34,7 @@ */ package net.anotheria.moskito.web.filters.caseextractor; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; /** * This filter measures calls by user-agent header field. diff --git a/moskito-web/src/main/java/net/anotheria/moskito/web/session/SessionByTldListener.java b/moskito-web/src/main/java/net/anotheria/moskito/web/session/SessionByTldListener.java index 118a00642..88d9338b8 100644 --- a/moskito-web/src/main/java/net/anotheria/moskito/web/session/SessionByTldListener.java +++ b/moskito-web/src/main/java/net/anotheria/moskito/web/session/SessionByTldListener.java @@ -10,12 +10,12 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.servlet.ServletRequestEvent; -import javax.servlet.ServletRequestListener; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; -import javax.servlet.http.HttpSessionEvent; -import javax.servlet.http.HttpSessionListener; +import jakarta.servlet.ServletRequestEvent; +import jakarta.servlet.ServletRequestListener; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpSession; +import jakarta.servlet.http.HttpSessionEvent; +import jakarta.servlet.http.HttpSessionListener; import java.net.InetAddress; /** diff --git a/moskito-web/src/main/java/net/anotheria/moskito/web/session/SessionCountProducer.java b/moskito-web/src/main/java/net/anotheria/moskito/web/session/SessionCountProducer.java index a14dbb300..2dc775dcd 100644 --- a/moskito-web/src/main/java/net/anotheria/moskito/web/session/SessionCountProducer.java +++ b/moskito-web/src/main/java/net/anotheria/moskito/web/session/SessionCountProducer.java @@ -6,8 +6,8 @@ import net.anotheria.moskito.core.util.AbstractBuiltInProducer; import net.anotheria.moskito.core.util.session.SessionCountStats; -import javax.servlet.http.HttpSessionEvent; -import javax.servlet.http.HttpSessionListener; +import jakarta.servlet.http.HttpSessionEvent; +import jakarta.servlet.http.HttpSessionListener; import java.util.ArrayList; import java.util.List; diff --git a/moskito-web/src/main/java/net/anotheria/moskito/web/session/TestListener.java b/moskito-web/src/main/java/net/anotheria/moskito/web/session/TestListener.java index ba2088b04..3929a82c1 100644 --- a/moskito-web/src/main/java/net/anotheria/moskito/web/session/TestListener.java +++ b/moskito-web/src/main/java/net/anotheria/moskito/web/session/TestListener.java @@ -1,11 +1,11 @@ package net.anotheria.moskito.web.session; -import javax.servlet.ServletRequestEvent; -import javax.servlet.ServletRequestListener; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; -import javax.servlet.http.HttpSessionEvent; -import javax.servlet.http.HttpSessionListener; +import jakarta.servlet.ServletRequestEvent; +import jakarta.servlet.ServletRequestListener; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpSession; +import jakarta.servlet.http.HttpSessionEvent; +import jakarta.servlet.http.HttpSessionListener; import java.util.concurrent.atomic.AtomicLong; /** diff --git a/moskito-web/src/main/java/net/anotheria/moskito/web/util/SessionThrottleFilter.java b/moskito-web/src/main/java/net/anotheria/moskito/web/util/SessionThrottleFilter.java index 87912b3d0..5eda36b55 100644 --- a/moskito-web/src/main/java/net/anotheria/moskito/web/util/SessionThrottleFilter.java +++ b/moskito-web/src/main/java/net/anotheria/moskito/web/util/SessionThrottleFilter.java @@ -10,15 +10,15 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import java.io.IOException; /** diff --git a/moskito-web/src/test/java/net/anotheria/moskito/web/MoskitoFilterTest.java b/moskito-web/src/test/java/net/anotheria/moskito/web/MoskitoFilterTest.java index 9bef5daef..36f9932e8 100644 --- a/moskito-web/src/test/java/net/anotheria/moskito/web/MoskitoFilterTest.java +++ b/moskito-web/src/test/java/net/anotheria/moskito/web/MoskitoFilterTest.java @@ -2,7 +2,7 @@ import org.junit.Test; -import javax.servlet.FilterConfig; +import jakarta.servlet.FilterConfig; import static org.junit.Assert.assertEquals; diff --git a/moskito-web/src/test/java/net/anotheria/moskito/web/MoskitoHttpServletTest.java b/moskito-web/src/test/java/net/anotheria/moskito/web/MoskitoHttpServletTest.java index 10b3468da..b148cebd9 100644 --- a/moskito-web/src/test/java/net/anotheria/moskito/web/MoskitoHttpServletTest.java +++ b/moskito-web/src/test/java/net/anotheria/moskito/web/MoskitoHttpServletTest.java @@ -1,5 +1,9 @@ package net.anotheria.moskito.web; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import net.anotheria.moskito.core.predefined.ServletStats; import net.anotheria.moskito.core.producers.IStats; import net.anotheria.moskito.core.producers.IStatsProducer; @@ -10,12 +14,8 @@ import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/moskito-web/src/test/java/net/anotheria/moskito/web/TestFilter.java b/moskito-web/src/test/java/net/anotheria/moskito/web/TestFilter.java index 8706bc130..2fdf285c6 100644 --- a/moskito-web/src/test/java/net/anotheria/moskito/web/TestFilter.java +++ b/moskito-web/src/test/java/net/anotheria/moskito/web/TestFilter.java @@ -1,7 +1,7 @@ package net.anotheria.moskito.web; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; public class TestFilter extends MoskitoFilter{ diff --git a/moskito-web/src/test/java/net/anotheria/moskito/web/TestServlet.java b/moskito-web/src/test/java/net/anotheria/moskito/web/TestServlet.java index fc47d91d4..afe606e68 100644 --- a/moskito-web/src/test/java/net/anotheria/moskito/web/TestServlet.java +++ b/moskito-web/src/test/java/net/anotheria/moskito/web/TestServlet.java @@ -1,8 +1,8 @@ package net.anotheria.moskito.web; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; public class TestServlet extends MoskitoHttpServlet{ diff --git a/moskito-web/src/test/java/net/anotheria/moskito/web/TestingUtil.java b/moskito-web/src/test/java/net/anotheria/moskito/web/TestingUtil.java index 847653ebe..5247f5fbb 100644 --- a/moskito-web/src/test/java/net/anotheria/moskito/web/TestingUtil.java +++ b/moskito-web/src/test/java/net/anotheria/moskito/web/TestingUtil.java @@ -1,7 +1,7 @@ package net.anotheria.moskito.web; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; +import jakarta.servlet.FilterChain; +import jakarta.servlet.FilterConfig; import static org.mockito.Mockito.mock; diff --git a/moskito-web/src/test/java/net/anotheria/moskito/web/filters/DomainFilterTest.java b/moskito-web/src/test/java/net/anotheria/moskito/web/filters/DomainFilterTest.java index 840f1c770..bb61281b2 100644 --- a/moskito-web/src/test/java/net/anotheria/moskito/web/filters/DomainFilterTest.java +++ b/moskito-web/src/test/java/net/anotheria/moskito/web/filters/DomainFilterTest.java @@ -10,9 +10,9 @@ import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; -import javax.servlet.FilterChain; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.FilterChain; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.util.List; import static org.junit.Assert.assertEquals; diff --git a/moskito-web/src/test/java/net/anotheria/moskito/web/filters/JSTalkBackFilterTest.java b/moskito-web/src/test/java/net/anotheria/moskito/web/filters/JSTalkBackFilterTest.java index 720166d7d..175cb9c9d 100644 --- a/moskito-web/src/test/java/net/anotheria/moskito/web/filters/JSTalkBackFilterTest.java +++ b/moskito-web/src/test/java/net/anotheria/moskito/web/filters/JSTalkBackFilterTest.java @@ -9,11 +9,11 @@ import org.junit.Before; import org.junit.Test; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.FilterChain; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.PrintWriter; import java.util.List; diff --git a/moskito-web/src/test/java/net/anotheria/moskito/web/filters/MethodFilterTest.java b/moskito-web/src/test/java/net/anotheria/moskito/web/filters/MethodFilterTest.java index a93deb29a..256a7f9f4 100644 --- a/moskito-web/src/test/java/net/anotheria/moskito/web/filters/MethodFilterTest.java +++ b/moskito-web/src/test/java/net/anotheria/moskito/web/filters/MethodFilterTest.java @@ -12,8 +12,8 @@ import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; -import javax.servlet.FilterChain; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.FilterChain; +import jakarta.servlet.http.HttpServletRequest; import java.util.List; import static org.junit.Assert.assertEquals; diff --git a/moskito-web/src/test/java/net/anotheria/moskito/web/filters/UserAgentFilterTest.java b/moskito-web/src/test/java/net/anotheria/moskito/web/filters/UserAgentFilterTest.java index e9cd2ebdb..a50a14b7d 100644 --- a/moskito-web/src/test/java/net/anotheria/moskito/web/filters/UserAgentFilterTest.java +++ b/moskito-web/src/test/java/net/anotheria/moskito/web/filters/UserAgentFilterTest.java @@ -11,8 +11,8 @@ import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; -import javax.servlet.FilterChain; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.FilterChain; +import jakarta.servlet.http.HttpServletRequest; import java.util.List; import static org.junit.Assert.assertEquals; diff --git a/moskito-web/src/test/java/net/anotheria/moskito/web/session/SessionCountProducerIntervalTest.java b/moskito-web/src/test/java/net/anotheria/moskito/web/session/SessionCountProducerIntervalTest.java index aea002c34..9f1162252 100644 --- a/moskito-web/src/test/java/net/anotheria/moskito/web/session/SessionCountProducerIntervalTest.java +++ b/moskito-web/src/test/java/net/anotheria/moskito/web/session/SessionCountProducerIntervalTest.java @@ -4,8 +4,8 @@ import net.anotheria.moskito.core.util.session.SessionCountStats; import org.junit.Test; -import javax.servlet.http.HttpSession; -import javax.servlet.http.HttpSessionEvent; +import jakarta.servlet.http.HttpSession; +import jakarta.servlet.http.HttpSessionEvent; import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.mock; diff --git a/moskito-web/src/test/java/net/anotheria/moskito/web/session/SessionCountProducerTest.java b/moskito-web/src/test/java/net/anotheria/moskito/web/session/SessionCountProducerTest.java index 686b7e337..63991b34b 100644 --- a/moskito-web/src/test/java/net/anotheria/moskito/web/session/SessionCountProducerTest.java +++ b/moskito-web/src/test/java/net/anotheria/moskito/web/session/SessionCountProducerTest.java @@ -3,8 +3,8 @@ import net.anotheria.moskito.core.util.session.SessionCountStats; import org.junit.Test; -import javax.servlet.http.HttpSession; -import javax.servlet.http.HttpSessionEvent; +import jakarta.servlet.http.HttpSession; +import jakarta.servlet.http.HttpSessionEvent; import java.util.concurrent.CountDownLatch; import static org.junit.Assert.assertEquals; diff --git a/moskito-webui/pom.xml b/moskito-webui/pom.xml index 5734979e1..4796387da 100644 --- a/moskito-webui/pom.xml +++ b/moskito-webui/pom.xml @@ -3,16 +3,13 @@ net.anotheria moskito - 3.2.9-SNAPSHOT + 4.0.2-SNAPSHOT 4.0.0 moskito-webui - 3.2.9-SNAPSHOT + 4.0.2-SNAPSHOT moskito embedded web user interface - - 2.0.10 - @@ -30,7 +27,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.5.1 + 3.11.0 ${source-version} ${target-version} @@ -62,9 +59,9 @@ ano-tags - jstl - jstl - 1.2 + org.glassfish.web + jakarta.servlet.jsp.jstl + 3.0.1 commons-codec @@ -80,6 +77,11 @@ com.google.code.gson gson + + org.json + json + 20231013 + net.anotheria moskito-core @@ -98,10 +100,20 @@ ${project.version} - javax.servlet - javax.servlet-api + jakarta.servlet + jakarta.servlet-api provided + + jakarta.xml.bind + jakarta.xml.bind-api + 4.0.1 + + + jakarta.ws.rs + jakarta.ws.rs-api + 3.1.0 + @@ -153,26 +165,17 @@ - javax.servlet.jsp - jsp-api - 2.0 + jakarta.servlet.jsp + jakarta.servlet.jsp-api + 3.1.1 provided - - javax.ws.rs - javax.ws.rs-api - 2.1.1 - com.fasterxml.jackson.core jackson-annotations - 2.15.2 + 2.15.3 - + diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/MoSKitoWebUIContext.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/MoSKitoWebUIContext.java index 8bb71be42..cf9756833 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/MoSKitoWebUIContext.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/MoSKitoWebUIContext.java @@ -3,7 +3,7 @@ import net.anotheria.moskito.core.stats.TimeUnit; import net.anotheria.moskito.webui.journey.api.AnalyzedProducerCallsAOSortType; -import javax.servlet.http.HttpSession; +import jakarta.servlet.http.HttpSession; import java.io.Serializable; import java.util.HashMap; import java.util.Map; diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/MoskitoUIFilter.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/MoskitoUIFilter.java index 8aecbdede..19ce2d578 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/MoskitoUIFilter.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/MoskitoUIFilter.java @@ -15,14 +15,14 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.FilterChain; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.Arrays; import java.util.List; diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/accumulators/action/BaseAccumulatorsAction.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/accumulators/action/BaseAccumulatorsAction.java index ac39f22b5..6b1b8735d 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/accumulators/action/BaseAccumulatorsAction.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/accumulators/action/BaseAccumulatorsAction.java @@ -3,7 +3,7 @@ import net.anotheria.moskito.webui.shared.action.BaseMoskitoUIAction; import net.anotheria.moskito.webui.shared.bean.NaviItem; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; /** * Base action for accumulators. diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/accumulators/action/CreateAccumulatorAction.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/accumulators/action/CreateAccumulatorAction.java index 7426150af..075b36366 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/accumulators/action/CreateAccumulatorAction.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/accumulators/action/CreateAccumulatorAction.java @@ -6,8 +6,8 @@ import net.anotheria.moskito.webui.accumulators.api.AccumulatorPO; import net.anotheria.moskito.webui.accumulators.api.AccumulatorPOHelper; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * This action creates a new accumulator. diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/accumulators/action/DeleteAccumulatorAction.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/accumulators/action/DeleteAccumulatorAction.java index ce3f8e806..17a8aeebb 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/accumulators/action/DeleteAccumulatorAction.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/accumulators/action/DeleteAccumulatorAction.java @@ -3,8 +3,8 @@ import net.anotheria.maf.action.ActionCommand; import net.anotheria.maf.action.ActionMapping; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * Deletes a single accumulator. diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/accumulators/action/GenerateChartAction.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/accumulators/action/GenerateChartAction.java index 79a2aa611..57768f76c 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/accumulators/action/GenerateChartAction.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/accumulators/action/GenerateChartAction.java @@ -22,8 +22,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.util.Arrays; diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/accumulators/action/ShowAccumulatorsAction.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/accumulators/action/ShowAccumulatorsAction.java index df764b742..d16781786 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/accumulators/action/ShowAccumulatorsAction.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/accumulators/action/ShowAccumulatorsAction.java @@ -3,7 +3,6 @@ import net.anotheria.anoplass.api.APIException; import net.anotheria.maf.action.ActionCommand; import net.anotheria.maf.action.ActionMapping; -import net.anotheria.maf.bean.FormBean; import net.anotheria.moskito.core.config.MoskitoConfiguration; import net.anotheria.moskito.core.config.accumulators.AccumulatorSetConfig; import net.anotheria.moskito.core.config.accumulators.AccumulatorSetMode; @@ -17,8 +16,8 @@ import net.anotheria.moskito.webui.accumulators.util.AccumulatorUtility; import net.anotheria.moskito.webui.util.WebUIConfig; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.util.ArrayList; import java.util.Enumeration; import java.util.LinkedHashMap; diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/accumulators/api/AccumulatedSingleGraphAO.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/accumulators/api/AccumulatedSingleGraphAO.java index cb43f1230..e5651bfb1 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/accumulators/api/AccumulatedSingleGraphAO.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/accumulators/api/AccumulatedSingleGraphAO.java @@ -7,10 +7,10 @@ import org.json.JSONObject; import org.slf4j.LoggerFactory; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; import java.io.Serializable; import java.util.ArrayList; import java.util.HashMap; diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/accumulators/api/AccumulatedValueAO.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/accumulators/api/AccumulatedValueAO.java index eda61b6b7..d226fe523 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/accumulators/api/AccumulatedValueAO.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/accumulators/api/AccumulatedValueAO.java @@ -3,10 +3,10 @@ import net.anotheria.util.BasicComparable; import net.anotheria.util.sorter.IComparable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; import java.io.Serializable; import java.util.ArrayList; import java.util.List; diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/accumulators/api/AccumulatorDefinitionAO.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/accumulators/api/AccumulatorDefinitionAO.java index 8892e5472..d6da56932 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/accumulators/api/AccumulatorDefinitionAO.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/accumulators/api/AccumulatorDefinitionAO.java @@ -3,10 +3,10 @@ import net.anotheria.util.BasicComparable; import net.anotheria.util.sorter.IComparable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; import java.io.Serializable; diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/accumulators/api/AccumulatorPO.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/accumulators/api/AccumulatorPO.java index 7a958808b..8f673e1de 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/accumulators/api/AccumulatorPO.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/accumulators/api/AccumulatorPO.java @@ -2,6 +2,7 @@ import net.anotheria.moskito.webui.shared.api.TieablePO; +import jakarta.servlet.http.HttpServletRequest; import java.io.Serializable; /** diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/accumulators/api/AccumulatorPOHelper.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/accumulators/api/AccumulatorPOHelper.java index a4731bff2..04eab9f87 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/accumulators/api/AccumulatorPOHelper.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/accumulators/api/AccumulatorPOHelper.java @@ -2,7 +2,7 @@ import net.anotheria.moskito.webui.shared.api.TieablePOHelper; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; public class AccumulatorPOHelper { public static AccumulatorPO fromHttpServletRequest(HttpServletRequest request){ diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/accumulators/api/MultilineChartAO.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/accumulators/api/MultilineChartAO.java index 41767e853..a78975553 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/accumulators/api/MultilineChartAO.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/accumulators/api/MultilineChartAO.java @@ -1,14 +1,14 @@ package net.anotheria.moskito.webui.accumulators.api; import com.fasterxml.jackson.annotation.JsonIgnore; -import org.apache.commons.lang.StringUtils; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import org.apache.commons.lang3.StringUtils; import org.json.JSONArray; import org.json.JSONObject; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; import java.io.Serializable; import java.util.Collections; import java.util.List; diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/accumulators/jsp/Accumulators.jsp b/moskito-webui/src/main/java/net/anotheria/moskito/webui/accumulators/jsp/Accumulators.jsp index c9d0a2aa0..7e6a3bee1 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/accumulators/jsp/Accumulators.jsp +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/accumulators/jsp/Accumulators.jsp @@ -1,6 +1,6 @@ <%@ page language="java" contentType="text/html;charset=UTF-8" session="true" %> <%@ taglib uri="http://www.anotheria.net/ano-tags" prefix="ano" %> -<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> +<%@ taglib prefix="fn" uri="jakarta.tags.functions" %> <%@ taglib prefix="mos" uri="http://www.moskito.org/inspect/tags" %> diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/accumulators/resource/AccumulatorResource.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/accumulators/resource/AccumulatorResource.java index d4d206f4f..59bbbbafb 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/accumulators/resource/AccumulatorResource.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/accumulators/resource/AccumulatorResource.java @@ -6,12 +6,12 @@ import net.anotheria.moskito.webui.shared.resource.AbstractResource; import net.anotheria.moskito.webui.shared.resource.ReplyObject; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.QueryParam; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.QueryParam; import java.util.List; /** diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/accumulators/util/AccumulatorUtility.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/accumulators/util/AccumulatorUtility.java index ff54a2354..7418f1d0d 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/accumulators/util/AccumulatorUtility.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/accumulators/util/AccumulatorUtility.java @@ -1,7 +1,7 @@ package net.anotheria.moskito.webui.accumulators.util; import net.anotheria.moskito.webui.accumulators.api.AccumulatedSingleGraphAO; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.json.JSONArray; import org.json.JSONObject; diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/auth/actions/SignInAction.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/auth/actions/SignInAction.java index 2d9831644..2123408cd 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/auth/actions/SignInAction.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/auth/actions/SignInAction.java @@ -12,9 +12,9 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; public class SignInAction implements Action { diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/auth/actions/SignOutAction.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/auth/actions/SignOutAction.java index 9a150ac4a..fad15faf1 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/auth/actions/SignOutAction.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/auth/actions/SignOutAction.java @@ -5,9 +5,9 @@ import net.anotheria.maf.action.ActionMapping; import net.anotheria.moskito.webui.auth.AuthConstants; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; public class SignOutAction implements Action { diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/auth/jsp/Login.jsp b/moskito-webui/src/main/java/net/anotheria/moskito/webui/auth/jsp/Login.jsp index 21df31d7d..2689332f5 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/auth/jsp/Login.jsp +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/auth/jsp/Login.jsp @@ -1,6 +1,6 @@ <%@ page language="java" contentType="text/html;charset=UTF-8" session="true" %> <%@ taglib uri="http://www.anotheria.net/ano-tags" prefix="ano" %> -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="c" uri="jakarta.tags.core" %> diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/dashboards/action/BaseDashboardAction.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/dashboards/action/BaseDashboardAction.java index 33e42d70d..c6a761e79 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/dashboards/action/BaseDashboardAction.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/dashboards/action/BaseDashboardAction.java @@ -6,8 +6,8 @@ import net.anotheria.moskito.webui.shared.action.BaseMoskitoUIAction; import net.anotheria.moskito.webui.shared.bean.NaviItem; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.util.LinkedList; import java.util.List; diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/dashboards/action/CreateDashboardAction.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/dashboards/action/CreateDashboardAction.java index 805a86470..75ab33895 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/dashboards/action/CreateDashboardAction.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/dashboards/action/CreateDashboardAction.java @@ -4,8 +4,8 @@ import net.anotheria.maf.action.ActionMapping; import net.anotheria.util.StringUtils; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * This action creates a new accumulator. diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/dashboards/action/DashboardAddChartAction.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/dashboards/action/DashboardAddChartAction.java index 127fe4d7a..39933afdd 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/dashboards/action/DashboardAddChartAction.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/dashboards/action/DashboardAddChartAction.java @@ -4,8 +4,8 @@ import net.anotheria.maf.action.ActionMapping; import net.anotheria.util.StringUtils; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * This action creates a new accumulator. diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/dashboards/action/DashboardAddGaugeAction.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/dashboards/action/DashboardAddGaugeAction.java index a8a58b1dd..128493ec1 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/dashboards/action/DashboardAddGaugeAction.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/dashboards/action/DashboardAddGaugeAction.java @@ -4,8 +4,8 @@ import net.anotheria.maf.action.ActionMapping; import net.anotheria.util.StringUtils; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * This action creates a new accumulator. diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/dashboards/action/DashboardAddProducerAction.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/dashboards/action/DashboardAddProducerAction.java index 26a59e566..3d5420116 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/dashboards/action/DashboardAddProducerAction.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/dashboards/action/DashboardAddProducerAction.java @@ -4,8 +4,8 @@ import net.anotheria.maf.action.ActionMapping; import net.anotheria.util.StringUtils; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * @author strel diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/dashboards/action/DashboardAddThresholdAction.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/dashboards/action/DashboardAddThresholdAction.java index 3c8bfee59..c9282ce9b 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/dashboards/action/DashboardAddThresholdAction.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/dashboards/action/DashboardAddThresholdAction.java @@ -4,8 +4,8 @@ import net.anotheria.maf.action.ActionMapping; import net.anotheria.util.StringUtils; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * This action creates a new accumulator. diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/dashboards/action/DashboardRemoveChartAction.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/dashboards/action/DashboardRemoveChartAction.java index 90aacc25b..5e6141b6a 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/dashboards/action/DashboardRemoveChartAction.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/dashboards/action/DashboardRemoveChartAction.java @@ -4,8 +4,8 @@ import net.anotheria.maf.action.ActionMapping; import net.anotheria.util.StringUtils; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * TODO comment this class diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/dashboards/action/DashboardRemoveGaugeAction.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/dashboards/action/DashboardRemoveGaugeAction.java index c73b9dab4..376ddb26a 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/dashboards/action/DashboardRemoveGaugeAction.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/dashboards/action/DashboardRemoveGaugeAction.java @@ -3,8 +3,8 @@ import net.anotheria.maf.action.ActionCommand; import net.anotheria.maf.action.ActionMapping; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * TODO comment this class diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/dashboards/action/DashboardRemoveProducerAction.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/dashboards/action/DashboardRemoveProducerAction.java index 65d820fa8..f65b5d870 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/dashboards/action/DashboardRemoveProducerAction.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/dashboards/action/DashboardRemoveProducerAction.java @@ -3,8 +3,8 @@ import net.anotheria.maf.action.ActionCommand; import net.anotheria.maf.action.ActionMapping; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * @author strel diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/dashboards/action/DashboardRemoveThresholdAction.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/dashboards/action/DashboardRemoveThresholdAction.java index fd370bba3..8accbebc9 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/dashboards/action/DashboardRemoveThresholdAction.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/dashboards/action/DashboardRemoveThresholdAction.java @@ -3,8 +3,8 @@ import net.anotheria.maf.action.ActionCommand; import net.anotheria.maf.action.ActionMapping; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * TODO comment this class diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/dashboards/action/DeleteDashboardAction.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/dashboards/action/DeleteDashboardAction.java index 321cc08bb..216eba3a4 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/dashboards/action/DeleteDashboardAction.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/dashboards/action/DeleteDashboardAction.java @@ -4,8 +4,8 @@ import net.anotheria.maf.action.ActionMapping; import net.anotheria.util.StringUtils; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * This action creates a new accumulator. diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/dashboards/action/ShowDashboardAction.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/dashboards/action/ShowDashboardAction.java index e481a0202..8c8ca1ff6 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/dashboards/action/ShowDashboardAction.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/dashboards/action/ShowDashboardAction.java @@ -20,8 +20,8 @@ import net.anotheria.moskito.webui.util.WebUIConfig; import net.anotheria.util.StringUtils; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.util.ArrayList; import java.util.HashMap; import java.util.LinkedHashMap; @@ -136,7 +136,7 @@ public ActionCommand execute(ActionMapping actionMapping, HttpServletRequest req request.setAttribute("widgets", widgets); // Setting possible dashboard names where producer can be added - request.setAttribute("dashboardNames", org.apache.commons.lang.StringUtils.join(getDashboardAPI().getDashboardNames(), ',')); + request.setAttribute("dashboardNames", org.apache.commons.lang3.StringUtils.join(getDashboardAPI().getDashboardNames(), ',')); //maybe the value has changed. request.setAttribute("gaugesPresent", gaugesPresent); diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/dashboards/api/DashboardAO.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/dashboards/api/DashboardAO.java index dad117afc..bda8191d3 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/dashboards/api/DashboardAO.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/dashboards/api/DashboardAO.java @@ -3,10 +3,10 @@ import net.anotheria.moskito.webui.gauges.api.GaugeAO; import net.anotheria.moskito.webui.threshold.api.ThresholdStatusAO; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; import java.io.Serializable; import java.util.List; diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/dashboards/api/DashboardChartAO.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/dashboards/api/DashboardChartAO.java index 3df0ddfae..9281268d2 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/dashboards/api/DashboardChartAO.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/dashboards/api/DashboardChartAO.java @@ -2,10 +2,10 @@ import net.anotheria.moskito.webui.accumulators.api.MultilineChartAO; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; import java.io.Serializable; /** diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/dashboards/api/DashboardChartDefinitionAO.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/dashboards/api/DashboardChartDefinitionAO.java index 4fca40248..6ffd850a2 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/dashboards/api/DashboardChartDefinitionAO.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/dashboards/api/DashboardChartDefinitionAO.java @@ -1,9 +1,9 @@ package net.anotheria.moskito.webui.dashboards.api; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; import java.io.Serializable; import java.util.Collections; import java.util.List; diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/dashboards/api/DashboardDefinitionAO.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/dashboards/api/DashboardDefinitionAO.java index f68de0eaf..f0cbc5c7d 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/dashboards/api/DashboardDefinitionAO.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/dashboards/api/DashboardDefinitionAO.java @@ -1,9 +1,9 @@ package net.anotheria.moskito.webui.dashboards.api; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; import java.io.Serializable; import java.util.Collections; import java.util.LinkedList; diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/dashboards/resource/DashboardResource.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/dashboards/resource/DashboardResource.java index bd0e1cd64..235e480f9 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/dashboards/resource/DashboardResource.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/dashboards/resource/DashboardResource.java @@ -6,9 +6,9 @@ import net.anotheria.moskito.webui.shared.resource.AbstractResource; import net.anotheria.moskito.webui.shared.resource.ReplyObject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; /** * The REST Resource for Dashboards API. diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/embedded/StartMoSKitoInspectBackendForRemoteListener.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/embedded/StartMoSKitoInspectBackendForRemoteListener.java index 3a640ba1e..186948740 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/embedded/StartMoSKitoInspectBackendForRemoteListener.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/embedded/StartMoSKitoInspectBackendForRemoteListener.java @@ -3,8 +3,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.servlet.ServletContextEvent; -import javax.servlet.ServletContextListener; +import jakarta.servlet.ServletContextEvent; +import jakarta.servlet.ServletContextListener; /** * This listener can be used to start MoSKito Inspect in embedded mode in a webapp. diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/errors/action/ShowErrorAction.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/errors/action/ShowErrorAction.java index d03f13d0b..8785b4f73 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/errors/action/ShowErrorAction.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/errors/action/ShowErrorAction.java @@ -4,8 +4,8 @@ import net.anotheria.maf.action.ActionMapping; import net.anotheria.moskito.webui.shared.api.CaughtErrorAO; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.util.List; /** diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/errors/action/ShowErrorsAction.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/errors/action/ShowErrorsAction.java index fe455779f..5027ea441 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/errors/action/ShowErrorsAction.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/errors/action/ShowErrorsAction.java @@ -4,8 +4,8 @@ import net.anotheria.maf.action.ActionMapping; import net.anotheria.moskito.webui.shared.api.ErrorCatcherAO; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.util.List; /** diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/gauges/action/BaseGaugesAction.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/gauges/action/BaseGaugesAction.java index 48b9a0d1a..a96b30b8b 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/gauges/action/BaseGaugesAction.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/gauges/action/BaseGaugesAction.java @@ -3,7 +3,7 @@ import net.anotheria.moskito.webui.shared.action.BaseMoskitoUIAction; import net.anotheria.moskito.webui.shared.bean.NaviItem; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; /** * Base class for gauge handling. diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/gauges/action/ShowGaugesAction.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/gauges/action/ShowGaugesAction.java index 8aeb67821..b24a9c5fa 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/gauges/action/ShowGaugesAction.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/gauges/action/ShowGaugesAction.java @@ -7,8 +7,8 @@ import net.anotheria.moskito.webui.gauges.bean.GaugeBean; import net.anotheria.moskito.webui.shared.bean.NaviItem; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.util.ArrayList; import java.util.List; diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/gauges/api/GaugeAO.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/gauges/api/GaugeAO.java index 3704cccd4..e0568f1f6 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/gauges/api/GaugeAO.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/gauges/api/GaugeAO.java @@ -3,11 +3,11 @@ import net.anotheria.moskito.core.decorators.value.StatValueAO; import net.anotheria.moskito.webui.shared.resource.adapters.StatValueAOMarshallingAdapter; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import java.io.Serializable; import java.util.LinkedList; import java.util.List; diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/gauges/resource/GaugeResource.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/gauges/resource/GaugeResource.java index 04150dee1..c516b4994 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/gauges/resource/GaugeResource.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/gauges/resource/GaugeResource.java @@ -4,9 +4,9 @@ import net.anotheria.moskito.webui.shared.resource.AbstractResource; import net.anotheria.moskito.webui.shared.resource.ReplyObject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.WebApplicationException; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.WebApplicationException; /** * TODO comment this class diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/journey/action/AnalyzeJourneyAction.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/journey/action/AnalyzeJourneyAction.java index cf152bd5c..621025411 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/journey/action/AnalyzeJourneyAction.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/journey/action/AnalyzeJourneyAction.java @@ -9,8 +9,8 @@ import net.anotheria.moskito.webui.journey.api.AnalyzedProducerCallsMapAO; import net.anotheria.moskito.webui.shared.bean.GraphDataBean; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.util.HashMap; import java.util.LinkedList; import java.util.List; diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/journey/action/AnalyzeJourneyByMethodAction.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/journey/action/AnalyzeJourneyByMethodAction.java index 2fbe2e261..710271f26 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/journey/action/AnalyzeJourneyByMethodAction.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/journey/action/AnalyzeJourneyByMethodAction.java @@ -9,8 +9,8 @@ import net.anotheria.moskito.webui.journey.api.AnalyzedProducerCallsMapAO; import net.anotheria.moskito.webui.shared.bean.GraphDataBean; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.util.HashMap; import java.util.LinkedList; import java.util.List; diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/journey/action/BaseJourneyAction.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/journey/action/BaseJourneyAction.java index 475eb6939..943200e36 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/journey/action/BaseJourneyAction.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/journey/action/BaseJourneyAction.java @@ -7,7 +7,7 @@ import net.anotheria.moskito.webui.shared.bean.GraphDataValueBean; import net.anotheria.moskito.webui.shared.bean.NaviItem; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.HashMap; import java.util.Map; diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/journey/action/DeleteJourneyAction.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/journey/action/DeleteJourneyAction.java index ee0850f5e..2eab8c5b8 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/journey/action/DeleteJourneyAction.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/journey/action/DeleteJourneyAction.java @@ -4,8 +4,8 @@ import net.anotheria.maf.action.ActionCommand; import net.anotheria.maf.action.ActionMapping; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * Deletes a journey. diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/journey/action/ShowJourneyAction.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/journey/action/ShowJourneyAction.java index c7a04eeb1..7a5cd9f42 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/journey/action/ShowJourneyAction.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/journey/action/ShowJourneyAction.java @@ -7,8 +7,8 @@ import net.anotheria.moskito.webui.journey.api.JourneyListItemAO; import net.anotheria.util.NumberUtils; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * The action displays a journey as a whole. diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/journey/action/ShowJourneyCallAction.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/journey/action/ShowJourneyCallAction.java index a2920c715..0face7ed3 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/journey/action/ShowJourneyCallAction.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/journey/action/ShowJourneyCallAction.java @@ -8,8 +8,8 @@ import net.anotheria.moskito.webui.journey.api.TracedCallDuplicateStepsAOSortType; import net.anotheria.util.sorter.StaticQuickSorter; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.util.List; /** diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/journey/action/ShowJourneysAction.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/journey/action/ShowJourneysAction.java index 30a2f0bec..49216e338 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/journey/action/ShowJourneysAction.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/journey/action/ShowJourneysAction.java @@ -4,8 +4,8 @@ import net.anotheria.maf.action.ActionMapping; import net.anotheria.moskito.webui.journey.api.JourneyListItemAO; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.util.List; /** diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/journey/api/JourneyListItemAO.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/journey/api/JourneyListItemAO.java index 699ac3059..a4a8f43ad 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/journey/api/JourneyListItemAO.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/journey/api/JourneyListItemAO.java @@ -1,8 +1,8 @@ package net.anotheria.moskito.webui.journey.api; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlRootElement; import java.io.Serializable; /** diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/journey/resource/JourneyResource.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/journey/resource/JourneyResource.java index f2833fea8..03dfe5ac6 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/journey/resource/JourneyResource.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/journey/resource/JourneyResource.java @@ -4,9 +4,9 @@ import net.anotheria.moskito.webui.shared.resource.AbstractResource; import net.anotheria.moskito.webui.shared.resource.ReplyObject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.WebApplicationException; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.WebApplicationException; /** * REST Resource for journey endpoint. diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/loadfactors/action/BaseLoadFactorsAction.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/loadfactors/action/BaseLoadFactorsAction.java index 954decf0f..30a023337 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/loadfactors/action/BaseLoadFactorsAction.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/loadfactors/action/BaseLoadFactorsAction.java @@ -3,7 +3,7 @@ import net.anotheria.moskito.webui.shared.action.BaseMoskitoUIAction; import net.anotheria.moskito.webui.shared.bean.NaviItem; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; /** * TODO comment this class diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/loadfactors/action/ShowLoadFactorsAction.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/loadfactors/action/ShowLoadFactorsAction.java index 7649dd7a6..9e841c9d4 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/loadfactors/action/ShowLoadFactorsAction.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/loadfactors/action/ShowLoadFactorsAction.java @@ -4,8 +4,8 @@ import net.anotheria.maf.action.ActionMapping; import net.anotheria.moskito.webui.loadfactors.api.LoadFactorAO; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.util.List; /** diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/more/action/AdditionalSectionAction.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/more/action/AdditionalSectionAction.java index 16a99ce57..7144bbd41 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/more/action/AdditionalSectionAction.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/more/action/AdditionalSectionAction.java @@ -3,8 +3,8 @@ import net.anotheria.maf.action.ActionCommand; import net.anotheria.maf.action.ActionMapping; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * This action returns simply forward to the "everything else" navigation point. diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/more/action/ShowConfigAction.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/more/action/ShowConfigAction.java index e8851fda3..57d102ee8 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/more/action/ShowConfigAction.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/more/action/ShowConfigAction.java @@ -6,7 +6,6 @@ import com.google.gson.JsonParser; import net.anotheria.maf.action.ActionCommand; import net.anotheria.maf.action.ActionMapping; -import net.anotheria.maf.bean.FormBean; import net.anotheria.moskito.core.config.MoskitoConfiguration; import net.anotheria.moskito.core.config.MoskitoConfigurationHolder; import net.anotheria.moskito.core.threshold.Threshold; @@ -14,8 +13,8 @@ import net.anotheria.moskito.webui.shared.bean.NaviItem; import net.anotheria.moskito.webui.util.APILookupUtility; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.util.ArrayList; import java.util.List; diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/more/action/ShowKillSwitchAction.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/more/action/ShowKillSwitchAction.java index c34e839c3..d5c5a8c56 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/more/action/ShowKillSwitchAction.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/more/action/ShowKillSwitchAction.java @@ -4,8 +4,8 @@ import net.anotheria.maf.action.ActionMapping; import net.anotheria.moskito.webui.shared.bean.NaviItem; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * This action shows current kill switch options. diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/more/action/ShowLibsAction.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/more/action/ShowLibsAction.java index d5be87901..e1c3804aa 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/more/action/ShowLibsAction.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/more/action/ShowLibsAction.java @@ -18,8 +18,8 @@ import javax.management.ObjectInstance; import javax.management.ObjectName; import javax.management.QueryExp; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.File; import java.net.URL; import java.util.ArrayList; diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/more/action/ShowMBeansAction.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/more/action/ShowMBeansAction.java index 0b827bc34..7353cb4cd 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/more/action/ShowMBeansAction.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/more/action/ShowMBeansAction.java @@ -5,8 +5,8 @@ import net.anotheria.moskito.webui.shared.api.MBeanWrapperAO; import net.anotheria.moskito.webui.shared.bean.NaviItem; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.util.List; /** diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/more/action/SwitchKillSettingAction.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/more/action/SwitchKillSettingAction.java index db9bc8b0b..ddf099fab 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/more/action/SwitchKillSettingAction.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/more/action/SwitchKillSettingAction.java @@ -7,8 +7,8 @@ import net.anotheria.moskito.webui.shared.api.AdditionalFunctionalityAPI; import net.anotheria.moskito.webui.util.APILookupUtility; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * This action allows to change SwitchKill setting values. diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/more/action/UpdateAction.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/more/action/UpdateAction.java index 81739da91..c9cfc97ad 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/more/action/UpdateAction.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/more/action/UpdateAction.java @@ -7,8 +7,8 @@ import org.json.JSONArray; import org.json.JSONObject; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.InputStream; import java.net.URL; import java.net.URLConnection; diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/nowrunning/action/BaseNowRunningAction.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/nowrunning/action/BaseNowRunningAction.java index 5bdca4053..2b9729bdc 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/nowrunning/action/BaseNowRunningAction.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/nowrunning/action/BaseNowRunningAction.java @@ -3,7 +3,7 @@ import net.anotheria.moskito.webui.shared.action.BaseMoskitoUIAction; import net.anotheria.moskito.webui.shared.bean.NaviItem; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; /** * TODO comment this class diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/nowrunning/action/DeleteNowRunningAction.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/nowrunning/action/DeleteNowRunningAction.java index 954518d4d..d2d551153 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/nowrunning/action/DeleteNowRunningAction.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/nowrunning/action/DeleteNowRunningAction.java @@ -4,8 +4,8 @@ import net.anotheria.maf.action.ActionMapping; import net.anotheria.moskito.webui.accumulators.action.BaseAccumulatorsAction; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * Deletes a single accumulator. diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/nowrunning/action/ShowEntryPointsAction.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/nowrunning/action/ShowEntryPointsAction.java index a5e77084b..16f9c693a 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/nowrunning/action/ShowEntryPointsAction.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/nowrunning/action/ShowEntryPointsAction.java @@ -4,8 +4,8 @@ import net.anotheria.maf.action.ActionMapping; import net.anotheria.moskito.webui.nowrunning.api.EntryPointAO; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.util.List; /** diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/plugins/action/BasePluginAction.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/plugins/action/BasePluginAction.java index 7870ab18e..02d35178c 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/plugins/action/BasePluginAction.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/plugins/action/BasePluginAction.java @@ -7,8 +7,8 @@ import net.anotheria.moskito.webui.shared.bean.NaviItem; import net.anotheria.moskito.webui.util.APILookupUtility; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.util.LinkedList; /** diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/plugins/action/RemovePluginAction.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/plugins/action/RemovePluginAction.java index 250a1a449..83326e752 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/plugins/action/RemovePluginAction.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/plugins/action/RemovePluginAction.java @@ -3,8 +3,8 @@ import net.anotheria.maf.action.ActionCommand; import net.anotheria.maf.action.ActionMapping; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * Removes a plugin with given name from plugin repository. diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/plugins/action/ShowPluginsAction.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/plugins/action/ShowPluginsAction.java index 284c4faaf..0dd208142 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/plugins/action/ShowPluginsAction.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/plugins/action/ShowPluginsAction.java @@ -4,8 +4,8 @@ import net.anotheria.maf.action.ActionMapping; import net.anotheria.moskito.webui.shared.api.PluginAO; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.util.List; /** diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/producers/action/BaseShowProducersAction.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/producers/action/BaseShowProducersAction.java index fba5078a0..d40a29f4c 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/producers/action/BaseShowProducersAction.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/producers/action/BaseShowProducersAction.java @@ -43,10 +43,10 @@ import net.anotheria.moskito.webui.shared.action.BaseMoskitoUIAction; import net.anotheria.moskito.webui.shared.bean.GraphDataBean; import net.anotheria.moskito.webui.shared.bean.NaviItem; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/producers/action/DisableProducerLoggingAction.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/producers/action/DisableProducerLoggingAction.java index 4f6584c2b..37b474002 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/producers/action/DisableProducerLoggingAction.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/producers/action/DisableProducerLoggingAction.java @@ -5,8 +5,8 @@ import net.anotheria.moskito.webui.shared.action.BaseMoskitoUIAction; import net.anotheria.moskito.webui.shared.bean.NaviItem; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.net.URLEncoder; /** diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/producers/action/DisableSourceMonitoringAction.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/producers/action/DisableSourceMonitoringAction.java index 57f9ba25b..e3949be4c 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/producers/action/DisableSourceMonitoringAction.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/producers/action/DisableSourceMonitoringAction.java @@ -5,8 +5,8 @@ import net.anotheria.moskito.webui.shared.action.BaseMoskitoUIAction; import net.anotheria.moskito.webui.shared.bean.NaviItem; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.net.URLEncoder; /** diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/producers/action/EnableProducerLoggingAction.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/producers/action/EnableProducerLoggingAction.java index 81bd93074..20821db8b 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/producers/action/EnableProducerLoggingAction.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/producers/action/EnableProducerLoggingAction.java @@ -5,8 +5,8 @@ import net.anotheria.moskito.webui.shared.action.BaseMoskitoUIAction; import net.anotheria.moskito.webui.shared.bean.NaviItem; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.net.URLEncoder; /** diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/producers/action/EnableSourceMonitoringAction.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/producers/action/EnableSourceMonitoringAction.java index aa1bd7630..6a1f76e92 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/producers/action/EnableSourceMonitoringAction.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/producers/action/EnableSourceMonitoringAction.java @@ -5,8 +5,8 @@ import net.anotheria.moskito.webui.shared.action.BaseMoskitoUIAction; import net.anotheria.moskito.webui.shared.bean.NaviItem; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.net.URLEncoder; /** diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/producers/action/ShowAllProducersAction.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/producers/action/ShowAllProducersAction.java index 6c03e13fa..ccd3f2af3 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/producers/action/ShowAllProducersAction.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/producers/action/ShowAllProducersAction.java @@ -37,7 +37,7 @@ import net.anotheria.anoplass.api.APIException; import net.anotheria.moskito.webui.producers.api.ProducerAO; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.ArrayList; import java.util.List; diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/producers/action/ShowCumulatedProducersAction.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/producers/action/ShowCumulatedProducersAction.java index c9294127f..a86fb919e 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/producers/action/ShowCumulatedProducersAction.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/producers/action/ShowCumulatedProducersAction.java @@ -52,12 +52,12 @@ import net.anotheria.moskito.webui.shared.bean.ProducerDecoratorBean; import net.anotheria.moskito.webui.shared.bean.UnitBean; import net.anotheria.moskito.webui.threshold.bean.ThresholdStatusBean; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.text.NumberFormat; import java.text.ParseException; import java.util.ArrayList; diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/producers/action/ShowProducerAction.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/producers/action/ShowProducerAction.java index 390bcdb83..628335ece 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/producers/action/ShowProducerAction.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/producers/action/ShowProducerAction.java @@ -56,12 +56,12 @@ import net.anotheria.moskito.webui.util.WebUIConfig; import net.anotheria.util.NumberUtils; import net.anotheria.util.sorter.StaticQuickSorter; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.net.URLDecoder; import java.util.ArrayList; import java.util.HashMap; diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/producers/action/ShowProducersAction.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/producers/action/ShowProducersAction.java index be03bb9cd..7d9956570 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/producers/action/ShowProducersAction.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/producers/action/ShowProducersAction.java @@ -40,8 +40,8 @@ import net.anotheria.moskito.core.registry.filters.SubsystemFilter; import net.anotheria.moskito.webui.producers.api.ProducerAO; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.util.ArrayList; import java.util.List; diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/producers/action/ShowProducersForCategoryAction.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/producers/action/ShowProducersForCategoryAction.java index 4962e232a..ac8d6fc0b 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/producers/action/ShowProducersForCategoryAction.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/producers/action/ShowProducersForCategoryAction.java @@ -37,7 +37,7 @@ import net.anotheria.anoplass.api.APIException; import net.anotheria.moskito.webui.producers.api.ProducerAO; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.List; public class ShowProducersForCategoryAction extends BaseShowProducersAction{ diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/producers/action/ShowProducersForSubsystemAction.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/producers/action/ShowProducersForSubsystemAction.java index e7badc49f..68a2a895f 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/producers/action/ShowProducersForSubsystemAction.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/producers/action/ShowProducersForSubsystemAction.java @@ -37,7 +37,7 @@ import net.anotheria.anoplass.api.APIException; import net.anotheria.moskito.webui.producers.api.ProducerAO; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.List; /** diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/producers/api/UnitCountAO.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/producers/api/UnitCountAO.java index 63acd8d33..013d254aa 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/producers/api/UnitCountAO.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/producers/api/UnitCountAO.java @@ -34,10 +34,10 @@ */ package net.anotheria.moskito.webui.producers.api; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; import java.io.Serializable; /** diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/producers/jsp/CumulatedProducers.jsp b/moskito-webui/src/main/java/net/anotheria/moskito/webui/producers/jsp/CumulatedProducers.jsp index 276a784ad..fd8174e78 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/producers/jsp/CumulatedProducers.jsp +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/producers/jsp/CumulatedProducers.jsp @@ -1,6 +1,6 @@ <%@ page language="java" contentType="text/html;charset=UTF-8" session="true" %><%@ taglib uri="http://www.anotheria.net/ano-tags" prefix="ano" -%><%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" +%><%@ taglib prefix="c" uri="jakarta.tags.core" %> <%@ taglib prefix="mos" uri="http://www.moskito.org/inspect/tags" %> diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/producers/jsp/Producer.jsp b/moskito-webui/src/main/java/net/anotheria/moskito/webui/producers/jsp/Producer.jsp index 2ffd72cc7..be9f6a5e5 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/producers/jsp/Producer.jsp +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/producers/jsp/Producer.jsp @@ -1,6 +1,6 @@ <%@ page language="java" contentType="text/html;charset=UTF-8" session="true" %><%@ taglib uri="http://www.anotheria.net/ano-tags" prefix="ano" -%><%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" +%><%@ taglib prefix="c" uri="jakarta.tags.core" %> <%@ taglib prefix="mos" uri="http://www.moskito.org/inspect/tags" %> diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/producers/resource/ProducerResource.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/producers/resource/ProducerResource.java index cac0b8c77..0405a6c67 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/producers/resource/ProducerResource.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/producers/resource/ProducerResource.java @@ -8,9 +8,9 @@ import net.anotheria.moskito.webui.shared.resource.AbstractResource; import net.anotheria.moskito.webui.shared.resource.ReplyObject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; /** * Resource for producer related resources. diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/producers/resource/ValueResource.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/producers/resource/ValueResource.java index f22ddb475..9ad18fd02 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/producers/resource/ValueResource.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/producers/resource/ValueResource.java @@ -9,10 +9,10 @@ import net.anotheria.moskito.webui.shared.resource.AbstractResource; import net.anotheria.moskito.webui.shared.resource.ReplyObject; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; import java.util.Arrays; import java.util.List; diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/producers/util/ProducerUtility.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/producers/util/ProducerUtility.java index 06dcec836..d26651577 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/producers/util/ProducerUtility.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/producers/util/ProducerUtility.java @@ -15,7 +15,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.ArrayList; import java.util.HashMap; import java.util.List; diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/shared/action/BaseAJAXMoskitoUIAction.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/shared/action/BaseAJAXMoskitoUIAction.java index d8f1f6f41..58a6dee7c 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/shared/action/BaseAJAXMoskitoUIAction.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/shared/action/BaseAJAXMoskitoUIAction.java @@ -8,8 +8,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.PrintWriter; diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/shared/action/BaseMoskitoUIAction.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/shared/action/BaseMoskitoUIAction.java index 231677d6f..ac0636dcc 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/shared/action/BaseMoskitoUIAction.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/shared/action/BaseMoskitoUIAction.java @@ -75,8 +75,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.UnsupportedEncodingException; import java.net.URLDecoder; import java.util.ArrayList; diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/shared/action/ForceIntervalUpdateAction.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/shared/action/ForceIntervalUpdateAction.java index f683e5aac..88718dbdc 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/shared/action/ForceIntervalUpdateAction.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/shared/action/ForceIntervalUpdateAction.java @@ -5,8 +5,8 @@ import net.anotheria.moskito.webui.shared.bean.NaviItem; import net.anotheria.moskito.webui.util.APILookupUtility; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * This action fires an interval update. This is useful for intervals that are not updated by a timer, like snapshots. diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/shared/action/GetExplanationsByDecoratorNameAction.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/shared/action/GetExplanationsByDecoratorNameAction.java index a15b1c8fc..50cdc1b3c 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/shared/action/GetExplanationsByDecoratorNameAction.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/shared/action/GetExplanationsByDecoratorNameAction.java @@ -9,8 +9,8 @@ import net.anotheria.moskito.core.decorators.IDecorator; import net.anotheria.moskito.core.decorators.IDecoratorRegistry; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.util.List; /** diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/shared/action/QuickConnectAction.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/shared/action/QuickConnectAction.java index 1cf2926c2..21c6612f8 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/shared/action/QuickConnectAction.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/shared/action/QuickConnectAction.java @@ -2,15 +2,14 @@ import net.anotheria.maf.action.ActionCommand; import net.anotheria.maf.action.ActionMapping; -import net.anotheria.maf.bean.FormBean; import net.anotheria.moskito.webui.shared.bean.NaviItem; import net.anotheria.moskito.webui.util.APILookupUtility; import net.anotheria.moskito.webui.util.ConnectivityMode; import net.anotheria.moskito.webui.util.RemoteInstance; import net.anotheria.moskito.webui.util.WebUIConfig; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * TODO comment this class diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/shared/action/SaveNavMenuStateAction.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/shared/action/SaveNavMenuStateAction.java index 641723622..41a1639a3 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/shared/action/SaveNavMenuStateAction.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/shared/action/SaveNavMenuStateAction.java @@ -3,8 +3,8 @@ import net.anotheria.maf.action.ActionMapping; import net.anotheria.maf.json.JSONResponse; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * Save nav menu state action. diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/shared/action/SelectServerAction.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/shared/action/SelectServerAction.java index c4f5cbccb..c075b1b4c 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/shared/action/SelectServerAction.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/shared/action/SelectServerAction.java @@ -8,8 +8,8 @@ import net.anotheria.moskito.webui.util.RemoteInstance; import net.anotheria.moskito.webui.util.WebUIConfig; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * This action sets the target server. diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/shared/action/ShowExplanationsAction.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/shared/action/ShowExplanationsAction.java index f55fb1a68..955aa9375 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/shared/action/ShowExplanationsAction.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/shared/action/ShowExplanationsAction.java @@ -9,8 +9,8 @@ import net.anotheria.util.sorter.DummySortType; import net.anotheria.util.sorter.StaticQuickSorter; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.util.ArrayList; import java.util.List; diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/shared/api/TieablePO.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/shared/api/TieablePO.java index 401c2bbfd..01c9f1043 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/shared/api/TieablePO.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/shared/api/TieablePO.java @@ -2,6 +2,7 @@ import net.anotheria.maf.bean.FormBean; +import jakarta.servlet.http.HttpServletRequest; import java.io.Serializable; /** diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/shared/api/TieablePOHelper.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/shared/api/TieablePOHelper.java index 1a29363c4..153d1b72f 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/shared/api/TieablePOHelper.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/shared/api/TieablePOHelper.java @@ -1,6 +1,6 @@ package net.anotheria.moskito.webui.shared.api; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; public class TieablePOHelper { public static void parseHttpRequest(TieablePO po, HttpServletRequest request) { diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/shared/jsp/Alerts.jsp b/moskito-webui/src/main/java/net/anotheria/moskito/webui/shared/jsp/Alerts.jsp index 019184dae..e7b395ed6 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/shared/jsp/Alerts.jsp +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/shared/jsp/Alerts.jsp @@ -1,6 +1,6 @@ <%@ page contentType="text/html;charset=UTF-8" %> <%@ taglib uri="http://www.anotheria.net/ano-tags" prefix="ano" %> -<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="core" %> +<%@ taglib uri="jakarta.tags.core" prefix="core" %> <%@ page isELIgnored="false" %> <%@ taglib uri="http://www.moskito.org/inspect/tags" prefix="mos" %> diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/shared/jsp/Header.jsp b/moskito-webui/src/main/java/net/anotheria/moskito/webui/shared/jsp/Header.jsp index ba77888cb..1eac76355 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/shared/jsp/Header.jsp +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/shared/jsp/Header.jsp @@ -1,6 +1,6 @@ <%@ page language="java" contentType="text/html;charset=UTF-8" session="true" %><%@ taglib uri="http://www.anotheria.net/ano-tags" prefix="ano" - %><%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="core" + %><%@ taglib uri="jakarta.tags.core" prefix="core" %><%@ page isELIgnored="false" %> <%@ taglib uri="http://www.moskito.org/inspect/tags" prefix="mos" %> diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/shared/resource/ReplyObject.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/shared/resource/ReplyObject.java index b2242e8dd..c8c936957 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/shared/resource/ReplyObject.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/shared/resource/ReplyObject.java @@ -1,9 +1,9 @@ package net.anotheria.moskito.webui.shared.resource; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; import java.util.HashMap; /** diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/shared/resource/ReplyObjectWriter.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/shared/resource/ReplyObjectWriter.java index 46d74c673..f2da681de 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/shared/resource/ReplyObjectWriter.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/shared/resource/ReplyObjectWriter.java @@ -8,15 +8,15 @@ import net.anotheria.moskito.webui.threshold.api.ThresholdDefinitionAO; import net.anotheria.moskito.webui.threshold.api.ThresholdStatusAO; -import javax.ws.rs.Produces; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.ext.MessageBodyWriter; -import javax.ws.rs.ext.Provider; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Marshaller; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.ext.MessageBodyWriter; +import jakarta.ws.rs.ext.Provider; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Marshaller; import java.io.IOException; import java.io.OutputStream; import java.lang.annotation.Annotation; diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/shared/resource/VersionResource.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/shared/resource/VersionResource.java index 5d55c4eba..a0e8bdc9e 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/shared/resource/VersionResource.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/shared/resource/VersionResource.java @@ -3,10 +3,10 @@ import net.anotheria.moskito.webui.util.VersionUtil; import net.anotheria.util.maven.MavenVersion; -import javax.servlet.ServletContext; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.core.Context; +import jakarta.servlet.ServletContext; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.Context; /** * TODO comment this class diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/shared/resource/adapters/StatValueAOMarshallingAdapter.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/shared/resource/adapters/StatValueAOMarshallingAdapter.java index a4cd27b1d..bb561e39f 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/shared/resource/adapters/StatValueAOMarshallingAdapter.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/shared/resource/adapters/StatValueAOMarshallingAdapter.java @@ -2,7 +2,7 @@ import net.anotheria.moskito.core.decorators.value.StatValueAO; -import javax.xml.bind.annotation.adapters.XmlAdapter; +import jakarta.xml.bind.annotation.adapters.XmlAdapter; /** * {@link XmlAdapter} adapter used for marshaling {@link StatValueAO}'s raw value to {@link String}. diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/shared/tags/DeepLinkTag.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/shared/tags/DeepLinkTag.java index 2128778f2..e56094f55 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/shared/tags/DeepLinkTag.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/shared/tags/DeepLinkTag.java @@ -2,10 +2,10 @@ import net.anotheria.moskito.webui.util.DeepLinkUtil; -import javax.servlet.jsp.JspException; -import javax.servlet.jsp.JspWriter; -import javax.servlet.jsp.tagext.DynamicAttributes; -import javax.servlet.jsp.tagext.SimpleTagSupport; +import jakarta.servlet.jsp.JspException; +import jakarta.servlet.jsp.JspWriter; +import jakarta.servlet.jsp.tagext.DynamicAttributes; +import jakarta.servlet.jsp.tagext.SimpleTagSupport; import java.io.IOException; import java.io.StringWriter; import java.util.HashMap; diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/tags/action/AddTagAction.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/tags/action/AddTagAction.java index ffeb51e4d..62e3f7f4c 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/tags/action/AddTagAction.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/tags/action/AddTagAction.java @@ -8,8 +8,8 @@ import net.anotheria.moskito.webui.shared.action.BaseMoskitoUIAction; import net.anotheria.moskito.webui.shared.bean.NaviItem; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.util.Arrays; /** diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/tags/action/ShowTagsAction.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/tags/action/ShowTagsAction.java index c874ce090..5895d1ef6 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/tags/action/ShowTagsAction.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/tags/action/ShowTagsAction.java @@ -9,8 +9,8 @@ import net.anotheria.moskito.webui.tags.api.TagAO; import net.anotheria.moskito.webui.tags.bean.TagBean; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.util.ArrayList; import java.util.List; diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/threads/action/BaseThreadsAction.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/threads/action/BaseThreadsAction.java index 598ad8369..d914af76a 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/threads/action/BaseThreadsAction.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/threads/action/BaseThreadsAction.java @@ -5,7 +5,7 @@ import net.anotheria.moskito.webui.threads.api.ThreadAPI; import net.anotheria.moskito.webui.util.APILookupUtility; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; /** * Base threads action. diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/threads/action/HistoryOffAction.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/threads/action/HistoryOffAction.java index 4d2e7e1e4..b321d257c 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/threads/action/HistoryOffAction.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/threads/action/HistoryOffAction.java @@ -3,8 +3,8 @@ import net.anotheria.maf.action.ActionCommand; import net.anotheria.maf.action.ActionMapping; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * Switches the history off. diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/threads/action/HistoryOnAction.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/threads/action/HistoryOnAction.java index 98fe390b5..465ab0bfb 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/threads/action/HistoryOnAction.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/threads/action/HistoryOnAction.java @@ -3,8 +3,8 @@ import net.anotheria.maf.action.ActionCommand; import net.anotheria.maf.action.ActionMapping; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * Switches the history on. diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/threads/action/SetHistoryListSizeAction.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/threads/action/SetHistoryListSizeAction.java index a26912afe..3bd1f8f9d 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/threads/action/SetHistoryListSizeAction.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/threads/action/SetHistoryListSizeAction.java @@ -4,8 +4,8 @@ import net.anotheria.maf.action.ActionMapping; import net.anotheria.moskito.core.util.threadhistory.ThreadHistoryUtility; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * Sets the size of the history array and therefore history length. diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/threads/action/StartThreadAction.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/threads/action/StartThreadAction.java index b9899b16b..928d3cf69 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/threads/action/StartThreadAction.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/threads/action/StartThreadAction.java @@ -3,8 +3,8 @@ import net.anotheria.maf.action.ActionCommand; import net.anotheria.maf.action.ActionMapping; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * Starts a new thread for testing purposes of the thread history. diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/threads/action/ThreadsDumpAction.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/threads/action/ThreadsDumpAction.java index 6d6a9597f..1e491314c 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/threads/action/ThreadsDumpAction.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/threads/action/ThreadsDumpAction.java @@ -5,8 +5,8 @@ import net.anotheria.moskito.webui.shared.bean.NaviItem; import net.anotheria.moskito.webui.threads.api.ThreadInfoAO; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.util.List; /** diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/threads/action/ThreadsHistoryAction.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/threads/action/ThreadsHistoryAction.java index d1999ce26..29ddc83ca 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/threads/action/ThreadsHistoryAction.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/threads/action/ThreadsHistoryAction.java @@ -5,8 +5,8 @@ import net.anotheria.moskito.webui.shared.bean.NaviItem; import net.anotheria.moskito.webui.threads.api.ActiveThreadHistoryAO; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * This action shows the ThreadsHistory. diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/threads/action/ThreadsListAction.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/threads/action/ThreadsListAction.java index c2ea4fec7..50fa5b801 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/threads/action/ThreadsListAction.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/threads/action/ThreadsListAction.java @@ -8,8 +8,8 @@ import net.anotheria.util.sorter.DummySortType; import net.anotheria.util.sorter.StaticQuickSorter; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.util.HashMap; import java.util.List; diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/threads/action/ThreadsOverviewAction.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/threads/action/ThreadsOverviewAction.java index b92e473ee..87a978471 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/threads/action/ThreadsOverviewAction.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/threads/action/ThreadsOverviewAction.java @@ -4,8 +4,8 @@ import net.anotheria.maf.action.ActionMapping; import net.anotheria.moskito.webui.threads.api.ThreadsInfoAO; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * This action renders the overview page of the threads section of the webui. diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/threshold/action/BaseThresholdsAction.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/threshold/action/BaseThresholdsAction.java index 5f33b3948..e07dbed63 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/threshold/action/BaseThresholdsAction.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/threshold/action/BaseThresholdsAction.java @@ -5,7 +5,7 @@ import net.anotheria.moskito.webui.threshold.api.ThresholdAPI; import net.anotheria.moskito.webui.util.APILookupUtility; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; /** * Base class for thresholds. diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/threshold/action/CreateThresholdAction.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/threshold/action/CreateThresholdAction.java index f5fe049a8..eacd4ab0b 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/threshold/action/CreateThresholdAction.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/threshold/action/CreateThresholdAction.java @@ -5,8 +5,8 @@ import net.anotheria.moskito.webui.threshold.api.ThresholdPO; import net.anotheria.moskito.webui.threshold.api.ThresholdPOHelper; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * Creates a new threshold. diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/threshold/action/DeleteThresholdAction.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/threshold/action/DeleteThresholdAction.java index 40f7602ae..6fa9b5050 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/threshold/action/DeleteThresholdAction.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/threshold/action/DeleteThresholdAction.java @@ -3,8 +3,8 @@ import net.anotheria.maf.action.ActionCommand; import net.anotheria.maf.action.ActionMapping; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * Deletes a threshold. diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/threshold/action/EditThresholdAction.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/threshold/action/EditThresholdAction.java index c4beaa285..6fffcf2f7 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/threshold/action/EditThresholdAction.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/threshold/action/EditThresholdAction.java @@ -7,8 +7,8 @@ import net.anotheria.moskito.core.threshold.guard.BarrierPassGuard; import net.anotheria.moskito.webui.threshold.api.ThresholdDefinitionAO; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.util.EnumMap; import java.util.List; import java.util.Map; diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/threshold/action/GetThresholdDefinitionAction.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/threshold/action/GetThresholdDefinitionAction.java index 782a61c44..f65fb0ba8 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/threshold/action/GetThresholdDefinitionAction.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/threshold/action/GetThresholdDefinitionAction.java @@ -8,8 +8,8 @@ import net.anotheria.moskito.webui.threshold.api.ThresholdDefinitionAO; import net.anotheria.moskito.webui.util.APILookupUtility; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * This action returns the threshold definition for a threshold as json object. diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/threshold/action/ShowThresholdsAction.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/threshold/action/ShowThresholdsAction.java index 287db65f6..55ff85c8a 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/threshold/action/ShowThresholdsAction.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/threshold/action/ShowThresholdsAction.java @@ -3,8 +3,8 @@ import net.anotheria.maf.action.ActionCommand; import net.anotheria.maf.action.ActionMapping; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import static net.anotheria.moskito.webui.threshold.util.ThresholdStatusBeanUtility.getThresholdBeans; diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/threshold/action/UpdateThresholdAction.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/threshold/action/UpdateThresholdAction.java index 3b40f19bc..2850a1a32 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/threshold/action/UpdateThresholdAction.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/threshold/action/UpdateThresholdAction.java @@ -5,8 +5,8 @@ import net.anotheria.moskito.webui.threshold.api.ThresholdPO; import net.anotheria.moskito.webui.threshold.api.ThresholdPOHelper; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * Updates an existing threshold. diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/threshold/api/ThresholdAlertAO.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/threshold/api/ThresholdAlertAO.java index 1adefcbac..eed77e164 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/threshold/api/ThresholdAlertAO.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/threshold/api/ThresholdAlertAO.java @@ -1,9 +1,9 @@ package net.anotheria.moskito.webui.threshold.api; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; import java.io.Serializable; /** diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/threshold/api/ThresholdDefinitionAO.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/threshold/api/ThresholdDefinitionAO.java index 8fb61ca31..aa36af915 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/threshold/api/ThresholdDefinitionAO.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/threshold/api/ThresholdDefinitionAO.java @@ -3,11 +3,11 @@ import net.anotheria.moskito.core.stats.TimeUnit; import net.anotheria.moskito.core.threshold.ThresholdConditionGuard; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlTransient; import java.io.Serializable; import java.util.ArrayList; import java.util.List; diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/threshold/api/ThresholdPO.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/threshold/api/ThresholdPO.java index a9ead315a..652d2446a 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/threshold/api/ThresholdPO.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/threshold/api/ThresholdPO.java @@ -3,8 +3,9 @@ import net.anotheria.maf.bean.FormBean; import net.anotheria.moskito.webui.shared.api.TieablePO; +import jakarta.servlet.http.HttpServletRequest; import java.io.Serializable; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; /** * This parameter object is used to create a new threshold. diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/threshold/api/ThresholdPOHelper.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/threshold/api/ThresholdPOHelper.java index e4549974e..4fd799adb 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/threshold/api/ThresholdPOHelper.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/threshold/api/ThresholdPOHelper.java @@ -2,7 +2,7 @@ import net.anotheria.moskito.webui.shared.api.TieablePOHelper; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; /** * Utility class. diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/threshold/api/ThresholdStatusAO.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/threshold/api/ThresholdStatusAO.java index d8d824496..3e63696c1 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/threshold/api/ThresholdStatusAO.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/threshold/api/ThresholdStatusAO.java @@ -4,11 +4,11 @@ import net.anotheria.util.BasicComparable; import net.anotheria.util.sorter.IComparable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlTransient; import java.io.Serializable; /** diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/threshold/resource/AlertsResource.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/threshold/resource/AlertsResource.java index 0ed737ed8..ba476bd3d 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/threshold/resource/AlertsResource.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/threshold/resource/AlertsResource.java @@ -4,8 +4,8 @@ import net.anotheria.moskito.webui.shared.resource.AbstractResource; import net.anotheria.moskito.webui.shared.resource.ReplyObject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; /** * Rest resource, returns alerts in the system. diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/threshold/resource/StatusForm.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/threshold/resource/StatusForm.java index 6049a24d9..1257bce3e 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/threshold/resource/StatusForm.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/threshold/resource/StatusForm.java @@ -1,7 +1,7 @@ package net.anotheria.moskito.webui.threshold.resource; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; import java.util.List; /** diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/threshold/resource/StatusResource.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/threshold/resource/StatusResource.java index f4b8d8c9d..41ab6de4d 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/threshold/resource/StatusResource.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/threshold/resource/StatusResource.java @@ -4,10 +4,10 @@ import net.anotheria.moskito.webui.shared.resource.AbstractResource; import net.anotheria.moskito.webui.shared.resource.ReplyObject; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.WebApplicationException; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.WebApplicationException; /** * Returns the status of the application. diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/threshold/resource/ThresholdResource.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/threshold/resource/ThresholdResource.java index 971768444..cfd2a1748 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/threshold/resource/ThresholdResource.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/threshold/resource/ThresholdResource.java @@ -5,12 +5,12 @@ import net.anotheria.moskito.webui.shared.resource.ReplyObject; import net.anotheria.moskito.webui.threshold.api.ThresholdPO; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.WebApplicationException; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.WebApplicationException; /** * This resource handles thresholds in the moskito-inspect rest interface. diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/tracers/action/BaseTracersAction.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/tracers/action/BaseTracersAction.java index e1fbe14f6..a7ce60485 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/tracers/action/BaseTracersAction.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/tracers/action/BaseTracersAction.java @@ -5,8 +5,8 @@ import net.anotheria.moskito.webui.shared.bean.NaviItem; import net.anotheria.moskito.webui.tracers.api.TracerAO; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.util.LinkedList; import java.util.List; diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/tracers/action/CreateTracerAction.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/tracers/action/CreateTracerAction.java index 6db588fac..eb06ad372 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/tracers/action/CreateTracerAction.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/tracers/action/CreateTracerAction.java @@ -3,8 +3,8 @@ import net.anotheria.maf.action.ActionCommand; import net.anotheria.maf.action.ActionMapping; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.net.URLEncoder; /** diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/tracers/action/DisableTracerAction.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/tracers/action/DisableTracerAction.java index 7fc342da8..433cd6502 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/tracers/action/DisableTracerAction.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/tracers/action/DisableTracerAction.java @@ -3,8 +3,8 @@ import net.anotheria.maf.action.ActionCommand; import net.anotheria.maf.action.ActionMapping; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * Disables a tracer. diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/tracers/action/EnableTracerAction.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/tracers/action/EnableTracerAction.java index 2b8e998cb..c3995555d 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/tracers/action/EnableTracerAction.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/tracers/action/EnableTracerAction.java @@ -3,8 +3,8 @@ import net.anotheria.maf.action.ActionCommand; import net.anotheria.maf.action.ActionMapping; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * Enables a tracer. diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/tracers/action/RemoveTracerAction.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/tracers/action/RemoveTracerAction.java index 2a7a60f47..bb2ace2a7 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/tracers/action/RemoveTracerAction.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/tracers/action/RemoveTracerAction.java @@ -3,8 +3,8 @@ import net.anotheria.maf.action.ActionCommand; import net.anotheria.maf.action.ActionMapping; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * Removes a single tracer. diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/tracers/action/ShowTracerAction.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/tracers/action/ShowTracerAction.java index b4957d865..a54b0e5de 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/tracers/action/ShowTracerAction.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/tracers/action/ShowTracerAction.java @@ -4,8 +4,8 @@ import net.anotheria.maf.action.ActionMapping; import net.anotheria.moskito.core.tracer.Tracers; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * Prepares a single tracer for display. diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/tracers/action/ShowTracersAction.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/tracers/action/ShowTracersAction.java index 95e375c9a..e2d1af3b1 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/tracers/action/ShowTracersAction.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/tracers/action/ShowTracersAction.java @@ -4,8 +4,8 @@ import net.anotheria.maf.action.ActionMapping; import net.anotheria.moskito.webui.tracers.api.TracerAO; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.util.List; /** diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/tracers/jsp/Tracers.jsp b/moskito-webui/src/main/java/net/anotheria/moskito/webui/tracers/jsp/Tracers.jsp index 5c1a7f3e7..08d4adeef 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/tracers/jsp/Tracers.jsp +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/tracers/jsp/Tracers.jsp @@ -1,6 +1,6 @@ <%@ page language="java" contentType="text/html;charset=UTF-8" session="true" %> <%@ taglib prefix="ano" uri="http://www.anotheria.net/ano-tags" %> -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="c" uri="jakarta.tags.core" %> <%@ taglib prefix="mos" uri="http://www.moskito.org/inspect/tags" %> diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/util/APILookupUtility.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/util/APILookupUtility.java index 46f4bd593..a1ac682d5 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/util/APILookupUtility.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/util/APILookupUtility.java @@ -18,7 +18,7 @@ import net.anotheria.moskito.webui.tracers.api.TracerAPI; import org.distributeme.core.ServiceDescriptor; -import javax.servlet.http.HttpSession; +import jakarta.servlet.http.HttpSession; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/util/EnableWebUIBackend.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/util/EnableWebUIBackend.java index 1cfecf797..96005e91a 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/util/EnableWebUIBackend.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/util/EnableWebUIBackend.java @@ -3,8 +3,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.servlet.ServletContextEvent; -import javax.servlet.ServletContextListener; +import jakarta.servlet.ServletContextEvent; +import jakarta.servlet.ServletContextListener; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/util/SetupPreconfiguredAccumulators.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/util/SetupPreconfiguredAccumulators.java index e603a3586..c27b2fe06 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/util/SetupPreconfiguredAccumulators.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/util/SetupPreconfiguredAccumulators.java @@ -5,8 +5,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.servlet.ServletContextEvent; -import javax.servlet.ServletContextListener; +import jakarta.servlet.ServletContextEvent; +import jakarta.servlet.ServletContextListener; /** * Configures preconfigured accumulators and adds them to the running app. diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/util/StartStopListener.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/util/StartStopListener.java index 1b8119166..29d5069e4 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/util/StartStopListener.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/util/StartStopListener.java @@ -10,8 +10,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.servlet.ServletContextEvent; -import javax.servlet.ServletContextListener; +import jakarta.servlet.ServletContextEvent; +import jakarta.servlet.ServletContextListener; /** * This listener sets the name of the application according to the context name and tries to cleanup threadlocals on application stop. diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/util/VersionUtil.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/util/VersionUtil.java index daf5bb09c..168d171ca 100644 --- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/util/VersionUtil.java +++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/util/VersionUtil.java @@ -3,7 +3,7 @@ import net.anotheria.util.maven.MavenVersion; import net.anotheria.util.maven.MavenVersionReader; -import javax.servlet.ServletContext; +import jakarta.servlet.ServletContext; import java.io.File; /** diff --git a/moskito-webui/src/test/java/net/anotheria/moskito/webui/util/DeepLinkUtilTest.java b/moskito-webui/src/test/java/net/anotheria/moskito/webui/util/DeepLinkUtilTest.java index ca09531b4..8219c2b39 100644 --- a/moskito-webui/src/test/java/net/anotheria/moskito/webui/util/DeepLinkUtilTest.java +++ b/moskito-webui/src/test/java/net/anotheria/moskito/webui/util/DeepLinkUtilTest.java @@ -1,13 +1,11 @@ package net.anotheria.moskito.webui.util; +import jakarta.servlet.ServletContext; +import jakarta.servlet.http.HttpSession; import net.anotheria.moskito.webui.MoSKitoWebUIContext; import org.junit.Before; import org.junit.Test; -import javax.servlet.ServletContext; -import javax.servlet.http.HttpSession; -import javax.servlet.http.HttpSessionContext; - import java.util.Enumeration; import java.util.HashMap; import java.util.Map; @@ -174,51 +172,27 @@ public int getMaxInactiveInterval() { return 0; } - @Override - public HttpSessionContext getSessionContext() { - return null; - } @Override public Object getAttribute(String name) { return attributes.get(name); } - @Override - public Object getValue(String name) { - return null; - } - @Override public Enumeration getAttributeNames() { return null; } - @Override - public String[] getValueNames() { - return new String[0]; - } - @Override public void setAttribute(String name, Object value) { attributes.put(name, value); } - @Override - public void putValue(String name, Object value) { - - } - @Override public void removeAttribute(String name) { } - @Override - public void removeValue(String name) { - - } - @Override public void invalidate() { @@ -228,6 +202,7 @@ public void invalidate() { public boolean isNew() { return false; } + } } diff --git a/moskito-webui/src/test/java/net/anotheria/moskito/webui/util/Ping.java b/moskito-webui/src/test/java/net/anotheria/moskito/webui/util/Ping.java index 4e9f33167..c45c0c500 100644 --- a/moskito-webui/src/test/java/net/anotheria/moskito/webui/util/Ping.java +++ b/moskito-webui/src/test/java/net/anotheria/moskito/webui/util/Ping.java @@ -1,11 +1,10 @@ package net.anotheria.moskito.webui.util; +import jakarta.servlet.ServletContext; +import jakarta.servlet.http.HttpSession; import net.anotheria.anoplass.api.APIException; import net.anotheria.moskito.webui.MoSKitoWebUIContext; -import javax.servlet.ServletContext; -import javax.servlet.http.HttpSession; -import javax.servlet.http.HttpSessionContext; import java.util.Enumeration; import java.util.HashMap; import java.util.Map; @@ -17,112 +16,88 @@ * @since 21.10.20 13:16 */ public class Ping { - public static void main(String[] a) throws APIException { - String host = "localhost"; - int port = 9451; + public static void main(String[] a) throws APIException { + String host = "localhost"; + int port = 9451; - - MoSKitoWebUIContext context = MoSKitoWebUIContext.getCallContextAndReset(); - context.setCurrentSession(new HttpSessionMock()); - APILookupUtility.setCurrentConnectivityMode(ConnectivityMode.REMOTE); - RemoteInstance ri = new RemoteInstance(); - ri.setHost(host); - ri.setPort(port); - APILookupUtility.setCurrentRemoteInstance(ri); + MoSKitoWebUIContext context = MoSKitoWebUIContext.getCallContextAndReset(); + context.setCurrentSession(new HttpSessionMock()); - System.out.println(APILookupUtility.describeConnectivity()); - System.out.println(APILookupUtility.getThresholdAPI().getThresholdStatuses()); - } - private static class HttpSessionMock implements HttpSession { + APILookupUtility.setCurrentConnectivityMode(ConnectivityMode.REMOTE); + RemoteInstance ri = new RemoteInstance(); + ri.setHost(host); + ri.setPort(port); + APILookupUtility.setCurrentRemoteInstance(ri); - private final Map attributes = new HashMap<>(); + System.out.println(APILookupUtility.describeConnectivity()); + System.out.println(APILookupUtility.getThresholdAPI().getThresholdStatuses()); + } - @Override - public long getCreationTime() { - return 0; - } + private static class HttpSessionMock implements HttpSession { - @Override - public String getId() { - return null; - } + private final Map attributes = new HashMap<>(); - @Override - public long getLastAccessedTime() { - return 0; - } + @Override + public long getCreationTime() { + return 0; + } - @Override - public ServletContext getServletContext() { - return null; - } + @Override + public String getId() { + return null; + } - @Override - public void setMaxInactiveInterval(int interval) { + @Override + public long getLastAccessedTime() { + return 0; + } - } + @Override + public ServletContext getServletContext() { + return null; + } - @Override - public int getMaxInactiveInterval() { - return 0; - } + @Override + public void setMaxInactiveInterval(int interval) { - @Override - public HttpSessionContext getSessionContext() { - return null; - } + } - @Override - public Object getAttribute(String name) { - return attributes.get(name); - } + @Override + public int getMaxInactiveInterval() { + return 0; + } - @Override - public Object getValue(String name) { - return null; - } + @Override + public Object getAttribute(String name) { + return attributes.get(name); + } - @Override - public Enumeration getAttributeNames() { - return null; - } + @Override + public Enumeration getAttributeNames() { + return null; + } - @Override - public String[] getValueNames() { - return new String[0]; - } + @Override + public void setAttribute(String name, Object value) { + attributes.put(name, value); + } - @Override - public void setAttribute(String name, Object value) { - attributes.put(name, value); - } + @Override + public void removeAttribute(String name) { - @Override - public void putValue(String name, Object value) { + } - } + @Override + public void invalidate() { - @Override - public void removeAttribute(String name) { + } - } - - @Override - public void removeValue(String name) { - - } - - @Override - public void invalidate() { - - } - - @Override - public boolean isNew() { - return false; - } - } + @Override + public boolean isNew() { + return false; + } + } } diff --git a/pom.xml b/pom.xml index d5c52cbaa..7097101ca 100644 --- a/pom.xml +++ b/pom.xml @@ -4,12 +4,12 @@ net.anotheria parent - 2.15 + 4.0 4.0.0 moskito - 3.2.9-SNAPSHOT + 4.0.2-SNAPSHOT MoSKito MoSKito, the open source java monitoring pom @@ -25,14 +25,14 @@ - 2.38 - 1.8 - 1.8 - 1.8.7 - 1.8 - 1.8 + 3.1.3 + 11 + 11 + 1.9.20 + 1.14.0 + 11 ${project.version} - 2.5.1 + 4.0.2 1.0.0-SNAPSHOT @@ -47,47 +47,47 @@ net.anotheria configureme - 2.5.1 + 4.0.0 net.anotheria ano-util - 2.2.0 + 4.0.0 net.anotheria ano-comm - 2.1.0 + 4.0.0 net.anotheria ano-maf - 3.0.0 + 4.0.0 net.anotheria ano-tags - 2.1.1 + 4.0.0 net.anotheria ano-plass - 2.1.6 + 4.0.0 net.anotheria ano-prise - 2.2.1 + 4.0.0 net.anotheria ano-net - 2.1.0 + 4.0.0 commons-codec commons-codec - 1.5 + 1.16.0 org.aspectj @@ -102,7 +102,7 @@ com.google.code.gson gson - 2.8.9 + 2.10.1 @@ -130,6 +130,11 @@ jersey-hk2 ${jersey-version} + + ch.qos.logback + logback-classic + 1.4.11 + + + jakarta.xml.bind + jakarta.xml.bind-api + 4.0.1 + org.hamcrest hamcrest-all @@ -155,7 +165,7 @@ org.mockito mockito-core - 1.10.19 + 5.6.0