From 42ebdc1bc386fbb68a65d179a8b8d24816c376ef Mon Sep 17 00:00:00 2001 From: Lachlan Roberts Date: Tue, 10 Nov 2020 01:44:12 +1100 Subject: [PATCH] Issue #5320 - changes from review Signed-off-by: Lachlan Roberts --- .../JettyWebSocketClientConfiguration.java | 17 ----------------- .../config/JettyWebSocketConfiguration.java | 17 ----------------- 2 files changed, 34 deletions(-) diff --git a/jetty-websocket/websocket-jetty-client/src/main/java/org/eclipse/jetty/websocket/client/config/JettyWebSocketClientConfiguration.java b/jetty-websocket/websocket-jetty-client/src/main/java/org/eclipse/jetty/websocket/client/config/JettyWebSocketClientConfiguration.java index b0527b9de7aa..62537d15f421 100644 --- a/jetty-websocket/websocket-jetty-client/src/main/java/org/eclipse/jetty/websocket/client/config/JettyWebSocketClientConfiguration.java +++ b/jetty-websocket/websocket-jetty-client/src/main/java/org/eclipse/jetty/websocket/client/config/JettyWebSocketClientConfiguration.java @@ -47,7 +47,6 @@ public class JettyWebSocketClientConfiguration extends AbstractConfiguration public JettyWebSocketClientConfiguration() { addDependencies(WebXmlConfiguration.class, MetaInfConfiguration.class, WebInfConfiguration.class, FragmentConfiguration.class); - addDependents("org.eclipse.jetty.osgi.annotations.AnnotationConfiguration", WebAppConfiguration.class.getName()); addDependents("org.eclipse.jetty.annotations.AnnotationConfiguration", WebAppConfiguration.class.getName()); protectAndExpose("org.eclipse.jetty.websocket.api."); @@ -55,20 +54,4 @@ public JettyWebSocketClientConfiguration() hide("org.eclipse.jetty.client.impl."); hide("org.eclipse.jetty.client.config."); } - - @Override - public boolean isAvailable() - { - try - { - ClassLoader classLoader = JettyWebSocketClientConfiguration.class.getClassLoader(); - return classLoader.loadClass("org.eclipse.jetty.websocket.client.WebSocketClient") != null; - } - catch (Throwable e) - { - LOG.trace("IGNORED", e); - } - - return false; - } } diff --git a/jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/config/JettyWebSocketConfiguration.java b/jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/config/JettyWebSocketConfiguration.java index 30e1787a5403..3490ef65f211 100644 --- a/jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/config/JettyWebSocketConfiguration.java +++ b/jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/config/JettyWebSocketConfiguration.java @@ -48,7 +48,6 @@ public class JettyWebSocketConfiguration extends AbstractConfiguration public JettyWebSocketConfiguration() { addDependencies(WebXmlConfiguration.class, MetaInfConfiguration.class, WebInfConfiguration.class, FragmentConfiguration.class); - addDependents("org.eclipse.jetty.osgi.annotations.AnnotationConfiguration", WebAppConfiguration.class.getName()); addDependents("org.eclipse.jetty.annotations.AnnotationConfiguration", WebAppConfiguration.class.getName()); protectAndExpose("org.eclipse.jetty.websocket.api."); @@ -57,20 +56,4 @@ public JettyWebSocketConfiguration() hide("org.eclipse.jetty.server.internal."); hide("org.eclipse.jetty.server.config."); } - - @Override - public boolean isAvailable() - { - try - { - ClassLoader classLoader = JettyWebSocketConfiguration.class.getClassLoader(); - return classLoader.loadClass("org.eclipse.jetty.websocket.server.JettyWebSocketServerContainer") != null; - } - catch (Throwable e) - { - LOG.trace("IGNORED", e); - } - - return false; - } }