[tomcat] 05/05: Add JPMS metadata for use of ServiceProvider API by WebSocket

[markt]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit d0b4638662b6d0d87b6f137823e4155025e748f8
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Nov 6 10:01:49 2020 +0000

    Add JPMS metadata for use of ServiceProvider API by WebSocket
---
 java/javax/websocket/ContainerProvider.java                            | 3 +++
 java/javax/websocket/server/ServerEndpointConfig.java                  | 3 +++
 java/org/apache/tomcat/websocket/WsContainerProvider.java              | 1 +
 .../tomcat/websocket/server/DefaultServerEndpointConfigurator.java     | 1 +
 4 files changed, 8 insertions(+)

diff --git a/java/javax/websocket/ContainerProvider.java 
b/java/javax/websocket/ContainerProvider.java
index f95c9ad..f800b34 100644
--- a/java/javax/websocket/ContainerProvider.java
+++ b/java/javax/websocket/ContainerProvider.java
@@ -19,10 +19,13 @@ package javax.websocket;
 import java.util.Iterator;
 import java.util.ServiceLoader;
 
+import aQute.bnd.annotation.spi.ServiceConsumer;
+
 /**
  * Use the {@link ServiceLoader} mechanism to provide instances of the 
WebSocket
  * client container.
  */
+@ServiceConsumer(value=ContainerProvider.class)
 public abstract class ContainerProvider {
 
     private static final String DEFAULT_PROVIDER_CLASS_NAME =
diff --git a/java/javax/websocket/server/ServerEndpointConfig.java 
b/java/javax/websocket/server/ServerEndpointConfig.java
index fa56ce4..11204c8 100644
--- a/java/javax/websocket/server/ServerEndpointConfig.java
+++ b/java/javax/websocket/server/ServerEndpointConfig.java
@@ -29,6 +29,8 @@ import javax.websocket.EndpointConfig;
 import javax.websocket.Extension;
 import javax.websocket.HandshakeResponse;
 
+import aQute.bnd.annotation.spi.ServiceConsumer;
+
 /**
  * Provides configuration information for WebSocket endpoints published to a
  * server. Applications may provide their own implementation or use
@@ -139,6 +141,7 @@ public interface ServerEndpointConfig extends 
EndpointConfig {
     }
 
 
+    @ServiceConsumer(value=Configurator.class)
     public class Configurator {
 
         private static volatile Configurator defaultImpl = null;
diff --git a/java/org/apache/tomcat/websocket/WsContainerProvider.java 
b/java/org/apache/tomcat/websocket/WsContainerProvider.java
index 654ad79..3cb8873 100644
--- a/java/org/apache/tomcat/websocket/WsContainerProvider.java
+++ b/java/org/apache/tomcat/websocket/WsContainerProvider.java
@@ -19,6 +19,7 @@ package org.apache.tomcat.websocket;
 import javax.websocket.ContainerProvider;
 import javax.websocket.WebSocketContainer;
 
+@aQute.bnd.annotation.spi.ServiceProvider(value=ContainerProvider.class)
 public class WsContainerProvider extends ContainerProvider {
 
     @Override
diff --git 
a/java/org/apache/tomcat/websocket/server/DefaultServerEndpointConfigurator.java
 
b/java/org/apache/tomcat/websocket/server/DefaultServerEndpointConfigurator.java
index 75b8d70..5c385ed 100644
--- 
a/java/org/apache/tomcat/websocket/server/DefaultServerEndpointConfigurator.java
+++ 
b/java/org/apache/tomcat/websocket/server/DefaultServerEndpointConfigurator.java
@@ -26,6 +26,7 @@ import javax.websocket.HandshakeResponse;
 import javax.websocket.server.HandshakeRequest;
 import javax.websocket.server.ServerEndpointConfig;
 
+@aQute.bnd.annotation.spi.ServiceProvider(value=ServerEndpointConfig.Configurator.class)
 public class DefaultServerEndpointConfigurator
         extends ServerEndpointConfig.Configurator {
 


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org