File tree Expand file tree Collapse file tree
io.cloudbeaver.server.ce/src/io/cloudbeaver/server
io.cloudbeaver.server/src/io/cloudbeaver
io.cloudbeaver.service.fs/src/io/cloudbeaver/service/fs/model Expand file tree Collapse file tree Original file line number Diff line number Diff line change 3232import io .cloudbeaver .service .DBWServiceBindingServlet ;
3333import io .cloudbeaver .service .DBWServiceBindingWebSocket ;
3434import jakarta .websocket .server .ServerEndpointConfig ;
35- import org .eclipse .jetty .ee10 .servlet .*;
36- import org .eclipse .jetty .ee10 .websocket .jakarta .server .config .JakartaWebSocketServletContainerInitializer ;
35+ import org .eclipse .jetty .ee11 .servlet .*;
36+ import org .eclipse .jetty .ee11 .websocket .jakarta .server .config .JakartaWebSocketServletContainerInitializer ;
3737import org .eclipse .jetty .server .*;
3838import org .eclipse .jetty .util .resource .ResourceFactory ;
3939import org .eclipse .jetty .xml .XmlConfiguration ;
Original file line number Diff line number Diff line change 3434import jakarta .servlet .annotation .WebServlet ;
3535import jakarta .servlet .http .HttpServletRequest ;
3636import jakarta .servlet .http .HttpServletResponse ;
37- import org .eclipse .jetty .ee10 .servlet .DefaultServlet ;
37+ import org .eclipse .jetty .ee11 .servlet .DefaultServlet ;
3838import org .eclipse .jetty .http .HttpHeader ;
3939import org .jkiss .code .NotNull ;
4040import org .jkiss .dbeaver .DBException ;
Original file line number Diff line number Diff line change 1919
2020import io .cloudbeaver .service .DBWServletContext ;
2121import jakarta .servlet .http .HttpServlet ;
22- import org .eclipse .jetty .ee10 .servlet .ServletContextHandler ;
23- import org .eclipse .jetty .ee10 .servlet .ServletHolder ;
22+ import org .eclipse .jetty .ee11 .servlet .ServletContextHandler ;
23+ import org .eclipse .jetty .ee11 .servlet .ServletHolder ;
2424
2525public class CBJettyServletContext implements DBWServletContext {
2626 private final ServletContextHandler contextHandler ;
Original file line number Diff line number Diff line change 1818
1919import io .cloudbeaver .service .DBWWebSocketContext ;
2020import jakarta .websocket .server .ServerEndpointConfig ;
21- import org .eclipse .jetty .ee10 .servlet .ServletContextHandler ;
22- import org .eclipse .jetty .ee10 .websocket .jakarta .server .config .JakartaWebSocketServletContainerInitializer ;
21+ import org .eclipse .jetty .ee11 .servlet .ServletContextHandler ;
22+ import org .eclipse .jetty .ee11 .websocket .jakarta .server .config .JakartaWebSocketServletContainerInitializer ;
2323import org .eclipse .jetty .server .Server ;
2424import org .jkiss .code .NotNull ;
2525
Original file line number Diff line number Diff line change 1717package io .cloudbeaver .server .jetty ;
1818
1919import io .cloudbeaver .server .WebApplication ;
20- import org .eclipse .jetty .ee10 .servlet .SessionHandler ;
20+ import org .eclipse .jetty .ee11 .servlet .SessionHandler ;
2121import org .jkiss .code .NotNull ;
2222
2323public class CBSessionHandler extends SessionHandler {
Original file line number Diff line number Diff line change 1717package io .cloudbeaver .server .jetty ;
1818
1919import io .cloudbeaver .server .WebApplication ;
20- import org .eclipse .jetty .ee10 .servlet .ServletContextHandler ;
20+ import org .eclipse .jetty .ee11 .servlet .ServletContextHandler ;
2121import org .eclipse .jetty .server .Server ;
2222import org .eclipse .jetty .session .DefaultSessionCache ;
2323import org .eclipse .jetty .session .DefaultSessionIdManager ;
Original file line number Diff line number Diff line change 2323import jakarta .servlet .annotation .WebServlet ;
2424import jakarta .servlet .http .HttpServletRequest ;
2525import jakarta .servlet .http .HttpServletResponse ;
26- import org .eclipse .jetty .ee10 .servlet .DefaultServlet ;
26+ import org .eclipse .jetty .ee11 .servlet .DefaultServlet ;
2727import org .jkiss .dbeaver .Log ;
2828import org .jkiss .dbeaver .model .data .json .JSONUtils ;
2929import org .jkiss .dbeaver .utils .GeneralUtils ;
Original file line number Diff line number Diff line change 2323import jakarta .websocket .HandshakeResponse ;
2424import jakarta .websocket .server .HandshakeRequest ;
2525import jakarta .websocket .server .ServerEndpointConfig ;
26- import org .eclipse .jetty .ee10 .websocket .jakarta .server .internal .JakartaWebSocketCreator ;
26+ import org .eclipse .jetty .ee11 .websocket .jakarta .server .internal .JakartaWebSocketCreator ;
2727import org .eclipse .jetty .http .BadMessageException ;
2828import org .jkiss .code .NotNull ;
2929import org .jkiss .code .Nullable ;
Original file line number Diff line number Diff line change 3030import jakarta .servlet .annotation .MultipartConfig ;
3131import jakarta .servlet .http .HttpServletRequest ;
3232import jakarta .servlet .http .HttpServletResponse ;
33- import org .eclipse .jetty .ee10 .servlet .ServletContextRequest ;
33+ import org .eclipse .jetty .ee11 .servlet .ServletContextRequest ;
3434import org .jkiss .dbeaver .DBException ;
3535import org .jkiss .dbeaver .Log ;
3636import org .jkiss .dbeaver .model .data .json .JSONUtils ;
Original file line number Diff line number Diff line change 2828import jakarta .servlet .http .HttpServletRequest ;
2929import jakarta .servlet .http .HttpServletResponse ;
3030import jakarta .servlet .http .Part ;
31- import org .eclipse .jetty .ee10 .servlet .ServletContextRequest ;
31+ import org .eclipse .jetty .ee11 .servlet .ServletContextRequest ;
3232import org .jkiss .dbeaver .DBException ;
3333import org .jkiss .dbeaver .Log ;
3434import org .jkiss .dbeaver .model .data .json .JSONUtils ;
You can’t perform that action at this time.
0 commit comments