diff --git a/pom.xml b/pom.xml index facd1d6..21e428b 100644 --- a/pom.xml +++ b/pom.xml @@ -294,6 +294,24 @@ hapi-fhir-test-utilities ${project.version} test + + + org.eclipse.jetty.ee10 + * + + + org.eclipse.jetty.ee10.websocket + * + + + org.eclipse.jetty + * + + + org.eclipse.jetty.websocket + * + + @@ -350,14 +368,6 @@ org.springframework.boot spring-boot-starter-test - ${spring_boot_version} - test - - - - org.springframework.boot - spring-boot-starter-jetty - ${spring_boot_version} test diff --git a/src/test/java/ca/uhn/fhir/jpa/starter/JpaStarterWebsocketDispatcherConfig.java b/src/test/java/ca/uhn/fhir/jpa/starter/JpaStarterWebsocketDispatcherConfig.java index 34c8949..639fda5 100644 --- a/src/test/java/ca/uhn/fhir/jpa/starter/JpaStarterWebsocketDispatcherConfig.java +++ b/src/test/java/ca/uhn/fhir/jpa/starter/JpaStarterWebsocketDispatcherConfig.java @@ -1,10 +1,10 @@ package ca.uhn.fhir.jpa.starter; -import org.eclipse.jetty.ee10.webapp.WebAppContext; -import org.eclipse.jetty.ee10.websocket.jakarta.server.config.JakartaWebSocketServletContainerInitializer; -import org.springframework.boot.web.embedded.jetty.JettyServletWebServerFactory; -import org.springframework.boot.web.server.WebServerFactoryCustomizer; -import org.springframework.context.annotation.Bean; +//import org.eclipse.jetty.ee10.webapp.WebAppContext; +//import org.eclipse.jetty.ee10.websocket.jakarta.server.config.JakartaWebSocketServletContainerInitializer; +//import org.springframework.boot.web.embedded.jetty.JettyServletWebServerFactory; +//import org.springframework.boot.web.server.WebServerFactoryCustomizer; +//import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; /** @@ -14,21 +14,21 @@ import org.springframework.context.annotation.Configuration; @Configuration public class JpaStarterWebsocketDispatcherConfig { - @Bean - public Jetty12WebSocketServletWebServerCustomizer jetty10WebSocketServletWebServerCustomizer() { - return new Jetty12WebSocketServletWebServerCustomizer(); - } - - static class Jetty12WebSocketServletWebServerCustomizer implements WebServerFactoryCustomizer { - - @Override - public void customize(JettyServletWebServerFactory factory) { - - factory.addServerCustomizers(server -> { - WebAppContext ctx = (WebAppContext) server.getHandler(); - JakartaWebSocketServletContainerInitializer.configure(ctx, null); - }); - - } - } +// @Bean +// public Jetty12WebSocketServletWebServerCustomizer jetty10WebSocketServletWebServerCustomizer() { +// return new Jetty12WebSocketServletWebServerCustomizer(); +// } +// +// static class Jetty12WebSocketServletWebServerCustomizer implements WebServerFactoryCustomizer { +// +// @Override +// public void customize(JettyServletWebServerFactory factory) { +// +// factory.addServerCustomizers(server -> { +// WebAppContext ctx = (WebAppContext) server.getHandler(); +// JakartaWebSocketServletContainerInitializer.configure(ctx, null); +// }); +// +// } +// } }