Skip to content

Commit

Permalink
moving to jakarta.servlet
Browse files Browse the repository at this point in the history 
Signed-off-by: Ceki Gulcu <ceki@qos.ch>
  • Loading branch information
@ceki
ceki committed Sep 9, 2021
1 parent 5586c25 commit 2ff2d4e
Show file tree
Hide file tree
Showing 32 changed files with 109 additions and 107 deletions.
3 changes: 1 addition & 2 deletions logback-access/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,8 +131,7 @@
<Import-Package>
ch.qos.logback.core.rolling,
ch.qos.logback.core.rolling.helper,
javax.servlet.*;version="2.5",
javax.*;resolution:=optional,
jakarta.servlet.*;version="5.0.0",
org.apache.catalina.*;version="${tomcat.version}";resolution:=optional,
org.eclipse.jetty.*;version="${jetty.version}";resolution:=optional,
*
Expand Down
6 changes: 3 additions & 3 deletions logback-access/src/main/java/ch/qos/logback/access/ViewStatusMessagesServlet.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
*/
package ch.qos.logback.access;

import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.ServletContext;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;

import ch.qos.logback.core.status.StatusManager;
import ch.qos.logback.core.status.ViewStatusMessagesServletBase;
Expand Down
19 changes: 11 additions & 8 deletions logback-access/src/main/java/ch/qos/logback/access/jetty/RequestLogImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@

import java.io.File;
import java.net.URL;
import java.util.EventListener;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
Expand Down Expand Up @@ -310,14 +311,16 @@ public FilterReply getFilterChainDecision(IAccessEvent event) {
return fai.getFilterChainDecision(event);
}

@Override
public void addLifeCycleListener(Listener listener) {
// we'll implement this when asked
}
@Override
public boolean addEventListener(EventListener listener) {
// we'll implement this when asked
return false;
}

@Override
public void removeLifeCycleListener(Listener listener) {
// we'll implement this when asked
}
@Override
public boolean removeEventListener(EventListener listener) {
// we'll implement this when asked
return false;
}

}
16 changes: 8 additions & 8 deletions logback-access/src/main/java/ch/qos/logback/access/servlet/TeeFilter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@
import java.util.ArrayList;
import java.util.List;

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 static ch.qos.logback.access.AccessConstants.LB_OUTPUT_BUFFER;
import static ch.qos.logback.access.AccessConstants.TEE_FILTER_INCLUDES_PARAM;
Expand Down
6 changes: 3 additions & 3 deletions logback-access/src/main/java/ch/qos/logback/access/servlet/TeeHttpServletRequest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
import java.io.IOException;
import java.io.InputStreamReader;

import javax.servlet.ServletInputStream;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletRequestWrapper;
import jakarta.servlet.ServletInputStream;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletRequestWrapper;

import static ch.qos.logback.access.AccessConstants.LB_INPUT_BUFFER;

Expand Down
6 changes: 3 additions & 3 deletions logback-access/src/main/java/ch/qos/logback/access/servlet/TeeHttpServletResponse.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
import java.io.OutputStreamWriter;
import java.io.PrintWriter;

import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpServletResponseWrapper;
import jakarta.servlet.ServletOutputStream;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponseWrapper;

public class TeeHttpServletResponse extends HttpServletResponseWrapper {

Expand Down
6 changes: 3 additions & 3 deletions logback-access/src/main/java/ch/qos/logback/access/servlet/TeeServletInputStream.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
import java.io.IOException;
import java.io.InputStream;

import javax.servlet.ReadListener;
import javax.servlet.ServletInputStream;
import javax.servlet.http.HttpServletRequest;
import jakarta.servlet.ReadListener;
import jakarta.servlet.ServletInputStream;
import jakarta.servlet.http.HttpServletRequest;

class TeeServletInputStream extends ServletInputStream {

Expand Down
6 changes: 3 additions & 3 deletions logback-access/src/main/java/ch/qos/logback/access/servlet/TeeServletOutputStream.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
import java.io.ByteArrayOutputStream;
import java.io.IOException;

import javax.servlet.ServletOutputStream;
import javax.servlet.ServletResponse;
import javax.servlet.WriteListener;
import jakarta.servlet.ServletOutputStream;
import jakarta.servlet.ServletResponse;
import jakarta.servlet.WriteListener;

public class TeeServletOutputStream extends ServletOutputStream {

Expand Down
4 changes: 2 additions & 2 deletions logback-access/src/main/java/ch/qos/logback/access/servlet/Util.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@

import ch.qos.logback.access.AccessConstants;

import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;

public class Util {

Expand Down
8 changes: 4 additions & 4 deletions logback-access/src/main/java/ch/qos/logback/access/spi/AccessEvent.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@
import ch.qos.logback.core.Context;
import ch.qos.logback.core.spi.SequenceNumberGenerator;

import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
import jakarta.servlet.http.Cookie;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpSession;

import java.io.Serializable;
import java.util.ArrayList;
Expand Down
4 changes: 2 additions & 2 deletions logback-access/src/main/java/ch/qos/logback/access/spi/IAccessEvent.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@

import ch.qos.logback.core.spi.DeferredProcessingAware;

import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import java.util.Enumeration;
import java.util.List;
import java.util.Map;
Expand Down
4 changes: 2 additions & 2 deletions logback-access/src/main/java/ch/qos/logback/access/tomcat/LogbackValve.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.ScheduledFuture;

import javax.servlet.ServletContext;
import javax.servlet.ServletException;
import jakarta.servlet.ServletContext;
import jakarta.servlet.ServletException;

import org.apache.catalina.Lifecycle;
import org.apache.catalina.LifecycleException;
Expand Down
4 changes: 2 additions & 2 deletions logback-access/src/test/java/ch/qos/logback/access/dummy/DummyRequest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@

import ch.qos.logback.access.AccessConstants;

import javax.servlet.*;
import javax.servlet.http.*;
import jakarta.servlet.*;
import jakarta.servlet.http.*;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
Expand Down
6 changes: 3 additions & 3 deletions logback-access/src/test/java/ch/qos/logback/access/dummy/DummyResponse.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
import java.io.PrintWriter;
import java.util.*;

import javax.servlet.ServletOutputStream;
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.ServletOutputStream;
import jakarta.servlet.http.Cookie;
import jakarta.servlet.http.HttpServletResponse;

public class DummyResponse implements HttpServletResponse {

Expand Down
4 changes: 2 additions & 2 deletions logback-access/src/test/java/ch/qos/logback/access/dummy/DummyServletOutputStream.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
*/
package ch.qos.logback.access.dummy;

import javax.servlet.ServletOutputStream;
import javax.servlet.WriteListener;
import jakarta.servlet.ServletOutputStream;
import jakarta.servlet.WriteListener;

import java.io.IOException;
import java.io.OutputStream;
Expand Down
6 changes: 3 additions & 3 deletions logback-access/src/test/java/ch/qos/logback/access/jetty/JettyFixtureBase.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
import java.io.IOException;
import java.io.OutputStream;

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 org.eclipse.jetty.server.Connector;
import org.eclipse.jetty.server.Handler;
Expand Down
2 changes: 1 addition & 1 deletion logback-access/src/test/java/ch/qos/logback/access/pattern/ConverterTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
import java.util.ArrayList;
import java.util.List;

import javax.servlet.http.Cookie;
import jakarta.servlet.http.Cookie;

import ch.qos.logback.access.spi.IAccessEvent;
import org.junit.After;
Expand Down
6 changes: 3 additions & 3 deletions logback-classic/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,10 +123,10 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
</dependency>
<dependency>
<groupId>com.icegreen</groupId>
<artifactId>greenmail</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions logback-classic/src/main/java/ch/qos/logback/classic/ViewStatusMessagesServlet.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
*/
package ch.qos.logback.classic;

import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;

import org.slf4j.LoggerFactory;

Expand Down
14 changes: 7 additions & 7 deletions logback-classic/src/main/java/ch/qos/logback/classic/helpers/MDCInsertingServletFilter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@

import java.io.IOException;

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 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 org.slf4j.MDC;

Expand Down
4 changes: 2 additions & 2 deletions ...ck-classic/src/main/java/ch/qos/logback/classic/selector/servlet/ContextDetachingSCL.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@

import javax.naming.Context;
import javax.naming.NamingException;
import javax.servlet.ServletContextEvent;
import javax.servlet.ServletContextListener;
import jakarta.servlet.ServletContextEvent;
import jakarta.servlet.ServletContextListener;

import org.slf4j.Logger;

Expand Down
12 changes: 6 additions & 6 deletions ...ck-classic/src/main/java/ch/qos/logback/classic/selector/servlet/LoggerContextFilter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@

import java.io.IOException;

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 org.slf4j.LoggerFactory;

Expand Down
6 changes: 3 additions & 3 deletions ...ssic/src/main/java/ch/qos/logback/classic/servlet/LogbackServletContainerInitializer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@

import java.util.Set;

This comment has been minimized.

Sign in to view

Copy link
@cocorossello

cocorossello Sep 10, 2021

I think you should also rename the file /src/main/resources/META-INF/services/javax.servlet.ServletContainerInitializer to jakarta.servlet.ServletContainerInitializer as well

This comment has been minimized.

Sign in to view

Copy link
@ceki

ceki Sep 10, 2021

Author Member

@cocorossello Thank you! Done.

import javax.servlet.ServletContainerInitializer;
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
import jakarta.servlet.ServletContainerInitializer;
import jakarta.servlet.ServletContext;
import jakarta.servlet.ServletException;

import ch.qos.logback.classic.util.StatusViaSLF4JLoggerFactory;
import ch.qos.logback.core.util.OptionHelper;
Expand Down
4 changes: 2 additions & 2 deletions ...k-classic/src/main/java/ch/qos/logback/classic/servlet/LogbackServletContextListener.java
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package ch.qos.logback.classic.servlet;

import javax.servlet.ServletContextEvent;
import javax.servlet.ServletContextListener;
import jakarta.servlet.ServletContextEvent;
import jakarta.servlet.ServletContextListener;

import org.slf4j.ILoggerFactory;
import org.slf4j.LoggerFactory;
Expand Down
2 changes: 1 addition & 1 deletion logback-classic/src/main/java9/module-info.java
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
module ch.qos.logback.classic {
requires org.slf4j;
requires static java.management;
requires static javax.servlet.api;
requires static jakarta.servlet;

requires ch.qos.logback.core;
uses ch.qos.logback.classic.spi.Configurator;
Expand Down
4 changes: 2 additions & 2 deletions .../src/test/java/ch/qos/logback/classic/servlet/LogbackServletContainerInitializerTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;

import javax.servlet.ServletContext;
import javax.servlet.ServletException;
import jakarta.servlet.ServletContext;
import jakarta.servlet.ServletException;

import org.junit.After;
import org.junit.Before;
Expand Down
10 changes: 5 additions & 5 deletions logback-core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,11 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<scope>compile</scope>
<optional>true</optional>
</dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
Expand Down
8 changes: 4 additions & 4 deletions logback-core/src/main/java/ch/qos/logback/core/status/ViewStatusMessagesServletBase.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@
import java.io.StringWriter;
import java.util.List;

import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.ServletException;
import jakarta.servlet.http.HttpServlet;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;

import ch.qos.logback.core.CoreConstants;
import ch.qos.logback.core.helpers.Transform;
Expand Down
2 changes: 1 addition & 1 deletion logback-core/src/main/java9/module-info.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
requires static jakarta.mail;
requires static jakarta.activation;

requires static javax.servlet.api;
requires static jakarta.servlet;
requires static janino;
requires static commons.compiler;

Expand Down
Loading

0 comments on commit 2ff2d4e

Please sign in to comment.