You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2020/11/06 11:16:29 UTC
[tomcat] branch master updated (3b6e149 -> c0032f2)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git.
from 3b6e149 Update to bnd 5.3.0-SNAPSHOT to workaround JDK-8255854
new 557c64e Simplify
new 3f20e75 Add JPMS metadata for use of ServiceProvider API by WebSocket
new c0032f2 Add BZ reference
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
java/jakarta/el/ExpressionFactory.java | 2 +-
java/jakarta/websocket/ContainerProvider.java | 3 +++
java/jakarta/websocket/server/ServerEndpointConfig.java | 3 +++
java/org/apache/el/ExpressionFactoryImpl.java | 2 +-
java/org/apache/tomcat/websocket/WsContainerProvider.java | 1 +
.../tomcat/websocket/server/DefaultServerEndpointConfigurator.java | 1 +
webapps/docs/changelog.xml | 2 +-
7 files changed, 11 insertions(+), 3 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 01/03: Simplify
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 557c64e19c078ea45ec59348caf478f7bbbdda0c
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Nov 6 10:01:24 2020 +0000
Simplify
---
java/jakarta/el/ExpressionFactory.java | 2 +-
java/org/apache/el/ExpressionFactoryImpl.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/java/jakarta/el/ExpressionFactory.java b/java/jakarta/el/ExpressionFactory.java
index dd17ddd..599a179 100644
--- a/java/jakarta/el/ExpressionFactory.java
+++ b/java/jakarta/el/ExpressionFactory.java
@@ -42,7 +42,7 @@ import aQute.bnd.annotation.spi.ServiceConsumer;
*
* @since 2.1
*/
-@ServiceConsumer(value=jakarta.el.ExpressionFactory.class)
+@ServiceConsumer(value=ExpressionFactory.class)
public abstract class ExpressionFactory {
private static final boolean IS_SECURITY_ENABLED =
diff --git a/java/org/apache/el/ExpressionFactoryImpl.java b/java/org/apache/el/ExpressionFactoryImpl.java
index e3aa471..d85ed93 100644
--- a/java/org/apache/el/ExpressionFactoryImpl.java
+++ b/java/org/apache/el/ExpressionFactoryImpl.java
@@ -33,7 +33,7 @@ import org.apache.el.util.MessageFactory;
*
* @author Jacob Hookom [jacob@hookom.net]
*/
-@aQute.bnd.annotation.spi.ServiceProvider(value=jakarta.el.ExpressionFactory.class)
+@aQute.bnd.annotation.spi.ServiceProvider(value=ExpressionFactory.class)
public class ExpressionFactoryImpl extends ExpressionFactory {
@Override
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 03/03: Add BZ reference
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit c0032f2147eaf952b7b9f6becca7f4bdef6e1551
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Nov 6 11:15:33 2020 +0000
Add BZ reference
---
webapps/docs/changelog.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 1e4779e..806c1e5 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -182,7 +182,7 @@
Improvements to Russian translations. Provided by Azat. (markt)
</add>
<fix>
- Update to bnd 5.3.0-SNAPSHOT to work around a
+ <bug>64870</bug>: Update to bnd 5.3.0-SNAPSHOT to work around a
<a href="https://bugs.openjdk.java.net/browse/JDK-8255854">JRE bug</a>.
(markt)
</fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 02/03: Add JPMS metadata for use of ServiceProvider API by
WebSocket
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 3f20e75607eb3d929fadb018f73dfa7fae46b76e
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/jakarta/websocket/ContainerProvider.java | 3 +++
java/jakarta/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/jakarta/websocket/ContainerProvider.java b/java/jakarta/websocket/ContainerProvider.java
index 33a8af2..fdc54f6 100644
--- a/java/jakarta/websocket/ContainerProvider.java
+++ b/java/jakarta/websocket/ContainerProvider.java
@@ -19,10 +19,13 @@ package jakarta.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/jakarta/websocket/server/ServerEndpointConfig.java b/java/jakarta/websocket/server/ServerEndpointConfig.java
index 4fb16d3..33a7112 100644
--- a/java/jakarta/websocket/server/ServerEndpointConfig.java
+++ b/java/jakarta/websocket/server/ServerEndpointConfig.java
@@ -29,6 +29,8 @@ import jakarta.websocket.EndpointConfig;
import jakarta.websocket.Extension;
import jakarta.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 ad990f1..c3b52a3 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 jakarta.websocket.ContainerProvider;
import jakarta.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 a64b830..50252f6 100644
--- a/java/org/apache/tomcat/websocket/server/DefaultServerEndpointConfigurator.java
+++ b/java/org/apache/tomcat/websocket/server/DefaultServerEndpointConfigurator.java
@@ -26,6 +26,7 @@ import jakarta.websocket.HandshakeResponse;
import jakarta.websocket.server.HandshakeRequest;
import jakarta.websocket.server.ServerEndpointConfig;
+@aQute.bnd.annotation.spi.ServiceProvider(value=ServerEndpointConfig.Configurator.class)
public class DefaultServerEndpointConfigurator
extends ServerEndpointConfig.Configurator {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org