This is an automated email from the ASF dual-hosted git repository.
lihan pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new 0e17fee857 Update tomcat-embed-core native metadata
0e17fee857 is described below
commit 0e17fee8571e580ae2fc973ac08e2abf3dc13c9d
Author: lihan <[email protected]>
AuthorDate: Tue Nov 8 21:31:10 2022 +0800
Update tomcat-embed-core native metadata
- Some JNI has been removed(314568fa).
- AbstractHttp11JsseProtocol has been removed(2b4be933).
- Added AbstractNetworkChannelEndpoint(1c21f344).
---
.../ObjectReflectionPropertyInspector.java | 2 +-
.../tomcat-embed-core/native-image/tomcat-jni.json | 22 ----------------------
.../native-image/tomcat-reflection.json | 2 +-
3 files changed, 2 insertions(+), 24 deletions(-)
diff --git
a/java/org/apache/tomcat/util/xreflection/ObjectReflectionPropertyInspector.java
b/java/org/apache/tomcat/util/xreflection/ObjectReflectionPropertyInspector.java
index c816a794d8..752d0405a9 100644
---
a/java/org/apache/tomcat/util/xreflection/ObjectReflectionPropertyInspector.java
+++
b/java/org/apache/tomcat/util/xreflection/ObjectReflectionPropertyInspector.java
@@ -86,7 +86,6 @@ public final class ObjectReflectionPropertyInspector {
Class.forName("org.apache.coyote.ajp.AbstractAjpProtocol"),
Class.forName("org.apache.coyote.ajp.AjpNio2Protocol"),
Class.forName("org.apache.coyote.ajp.AjpNioProtocol"),
-
Class.forName("org.apache.coyote.http11.AbstractHttp11JsseProtocol"),
Class.forName("org.apache.coyote.http11.AbstractHttp11Protocol"),
Class.forName("org.apache.coyote.http11.Http11Nio2Protocol"),
Class.forName("org.apache.coyote.http11.Http11NioProtocol"),
@@ -98,6 +97,7 @@ public final class ObjectReflectionPropertyInspector {
Class.forName("org.apache.tomcat.util.modeler.OperationInfo"),
Class.forName("org.apache.tomcat.util.modeler.ParameterInfo"),
Class.forName("org.apache.tomcat.util.net.AbstractEndpoint"),
+
Class.forName("org.apache.tomcat.util.net.AbstractNetworkChannelEndpoint"),
Class.forName("org.apache.tomcat.util.net.Nio2Endpoint"),
Class.forName("org.apache.tomcat.util.net.NioEndpoint"),
Class.forName("org.apache.tomcat.util.net.SocketProperties")
diff --git a/res/graal/tomcat-embed-core/native-image/tomcat-jni.json
b/res/graal/tomcat-embed-core/native-image/tomcat-jni.json
index d53270c05b..4479fb8230 100644
--- a/res/graal/tomcat-embed-core/native-image/tomcat-jni.json
+++ b/res/graal/tomcat-embed-core/native-image/tomcat-jni.json
@@ -1,34 +1,12 @@
[
- { "name":"org.apache.tomcat.jni.Address", "allDeclaredConstructors" :
true,"allPublicConstructors" : true,"allDeclaredMethods" :
true,"allPublicMethods" : true,"allDeclaredClasses" : true,"allPublicClasses" :
true,"allPublicFields" : true,"allDeclaredFields" : true},
{ "name":"org.apache.tomcat.jni.Buffer", "allDeclaredConstructors" :
true,"allPublicConstructors" : true,"allDeclaredMethods" :
true,"allPublicMethods" : true,"allDeclaredClasses" : true,"allPublicClasses" :
true,"allPublicFields" : true,"allDeclaredFields" : true},
- { "name":"org.apache.tomcat.jni.Directory", "allDeclaredConstructors" :
true,"allPublicConstructors" : true,"allDeclaredMethods" :
true,"allPublicMethods" : true,"allDeclaredClasses" : true,"allPublicClasses" :
true,"allPublicFields" : true,"allDeclaredFields" : true},
- { "name":"org.apache.tomcat.jni.Error", "allDeclaredConstructors" :
true,"allPublicConstructors" : true,"allDeclaredMethods" :
true,"allPublicMethods" : true,"allDeclaredClasses" : true,"allPublicClasses" :
true,"allPublicFields" : true,"allDeclaredFields" : true},
- { "name":"org.apache.tomcat.jni.File", "allDeclaredConstructors" :
true,"allPublicConstructors" : true,"allDeclaredMethods" :
true,"allPublicMethods" : true,"allDeclaredClasses" : true,"allPublicClasses" :
true,"allPublicFields" : true,"allDeclaredFields" : true},
{ "name":"org.apache.tomcat.jni.FileInfo", "allDeclaredConstructors" :
true,"allPublicConstructors" : true,"allDeclaredMethods" :
true,"allPublicMethods" : true,"allDeclaredClasses" : true,"allPublicClasses" :
true,"allPublicFields" : true,"allDeclaredFields" : true},
- { "name":"org.apache.tomcat.jni.Global", "allDeclaredConstructors" :
true,"allPublicConstructors" : true,"allDeclaredMethods" :
true,"allPublicMethods" : true,"allDeclaredClasses" : true,"allPublicClasses" :
true,"allPublicFields" : true,"allDeclaredFields" : true},
{ "name":"org.apache.tomcat.jni.Library", "allDeclaredConstructors" :
true,"allPublicConstructors" : true,"allDeclaredMethods" :
true,"allPublicMethods" : true,"allDeclaredClasses" : true,"allPublicClasses" :
true,"allPublicFields" : true,"allDeclaredFields" : true},
- { "name":"org.apache.tomcat.jni.Local", "allDeclaredConstructors" :
true,"allPublicConstructors" : true,"allDeclaredMethods" :
true,"allPublicMethods" : true,"allDeclaredClasses" : true,"allPublicClasses" :
true,"allPublicFields" : true,"allDeclaredFields" : true},
- { "name":"org.apache.tomcat.jni.Lock", "allDeclaredConstructors" :
true,"allPublicConstructors" : true,"allDeclaredMethods" :
true,"allPublicMethods" : true,"allDeclaredClasses" : true,"allPublicClasses" :
true,"allPublicFields" : true,"allDeclaredFields" : true},
- { "name":"org.apache.tomcat.jni.Mmap", "allDeclaredConstructors" :
true,"allPublicConstructors" : true,"allDeclaredMethods" :
true,"allPublicMethods" : true,"allDeclaredClasses" : true,"allPublicClasses" :
true,"allPublicFields" : true,"allDeclaredFields" : true},
- { "name":"org.apache.tomcat.jni.Multicast", "allDeclaredConstructors" :
true,"allPublicConstructors" : true,"allDeclaredMethods" :
true,"allPublicMethods" : true,"allDeclaredClasses" : true,"allPublicClasses" :
true,"allPublicFields" : true,"allDeclaredFields" : true},
- { "name":"org.apache.tomcat.jni.OS", "allDeclaredConstructors" :
true,"allPublicConstructors" : true,"allDeclaredMethods" :
true,"allPublicMethods" : true,"allDeclaredClasses" : true,"allPublicClasses" :
true,"allPublicFields" : true,"allDeclaredFields" : true},
- { "name":"org.apache.tomcat.jni.Poll", "allDeclaredConstructors" :
true,"allPublicConstructors" : true,"allDeclaredMethods" :
true,"allPublicMethods" : true,"allDeclaredClasses" : true,"allPublicClasses" :
true,"allPublicFields" : true,"allDeclaredFields" : true},
{ "name":"org.apache.tomcat.jni.Pool", "allDeclaredConstructors" :
true,"allPublicConstructors" : true,"allDeclaredMethods" :
true,"allPublicMethods" : true,"allDeclaredClasses" : true,"allPublicClasses" :
true,"allPublicFields" : true,"allDeclaredFields" : true},
- { "name":"org.apache.tomcat.jni.Proc", "allDeclaredConstructors" :
true,"allPublicConstructors" : true,"allDeclaredMethods" :
true,"allPublicMethods" : true,"allDeclaredClasses" : true,"allPublicClasses" :
true,"allPublicFields" : true,"allDeclaredFields" : true},
- { "name":"org.apache.tomcat.jni.Procattr", "allDeclaredConstructors" :
true,"allPublicConstructors" : true,"allDeclaredMethods" :
true,"allPublicMethods" : true,"allDeclaredClasses" : true,"allPublicClasses" :
true,"allPublicFields" : true,"allDeclaredFields" : true},
- { "name":"org.apache.tomcat.jni.Registry", "allDeclaredConstructors" :
true,"allPublicConstructors" : true,"allDeclaredMethods" :
true,"allPublicMethods" : true,"allDeclaredClasses" : true,"allPublicClasses" :
true,"allPublicFields" : true,"allDeclaredFields" : true},
- { "name":"org.apache.tomcat.jni.Shm", "allDeclaredConstructors" :
true,"allPublicConstructors" : true,"allDeclaredMethods" :
true,"allPublicMethods" : true,"allDeclaredClasses" : true,"allPublicClasses" :
true,"allPublicFields" : true,"allDeclaredFields" : true},
{ "name":"org.apache.tomcat.jni.Sockaddr", "allDeclaredConstructors" :
true,"allPublicConstructors" : true,"allDeclaredMethods" :
true,"allPublicMethods" : true,"allDeclaredClasses" : true,"allPublicClasses" :
true,"allPublicFields" : true,"allDeclaredFields" : true},
- { "name":"org.apache.tomcat.jni.Socket", "allDeclaredConstructors" :
true,"allPublicConstructors" : true,"allDeclaredMethods" :
true,"allPublicMethods" : true,"allDeclaredClasses" : true,"allPublicClasses" :
true,"allPublicFields" : true,"allDeclaredFields" : true},
{ "name":"org.apache.tomcat.jni.SSL", "allDeclaredConstructors" :
true,"allPublicConstructors" : true,"allDeclaredMethods" :
true,"allPublicMethods" : true,"allDeclaredClasses" : true,"allPublicClasses" :
true,"allPublicFields" : true,"allDeclaredFields" : true},
{ "name":"org.apache.tomcat.jni.SSLConf", "allDeclaredConstructors" :
true,"allPublicConstructors" : true,"allDeclaredMethods" :
true,"allPublicMethods" : true,"allDeclaredClasses" : true,"allPublicClasses" :
true,"allPublicFields" : true,"allDeclaredFields" : true},
{ "name":"org.apache.tomcat.jni.SSLContext", "allDeclaredConstructors" :
true,"allPublicConstructors" : true,"allDeclaredMethods" :
true,"allPublicMethods" : true,"allDeclaredClasses" : true,"allPublicClasses" :
true,"allPublicFields" : true,"allDeclaredFields" : true},
- { "name":"org.apache.tomcat.jni.SSLSocket", "allDeclaredConstructors" :
true,"allPublicConstructors" : true,"allDeclaredMethods" :
true,"allPublicMethods" : true,"allDeclaredClasses" : true,"allPublicClasses" :
true,"allPublicFields" : true,"allDeclaredFields" : true},
- { "name":"org.apache.tomcat.jni.Status", "allDeclaredConstructors" :
true,"allPublicConstructors" : true,"allDeclaredMethods" :
true,"allPublicMethods" : true,"allDeclaredClasses" : true,"allPublicClasses" :
true,"allPublicFields" : true,"allDeclaredFields" : true},
- { "name":"org.apache.tomcat.jni.Stdlib", "allDeclaredConstructors" :
true,"allPublicConstructors" : true,"allDeclaredMethods" :
true,"allPublicMethods" : true,"allDeclaredClasses" : true,"allPublicClasses" :
true,"allPublicFields" : true,"allDeclaredFields" : true},
- { "name":"org.apache.tomcat.jni.Thread", "allDeclaredConstructors" :
true,"allPublicConstructors" : true,"allDeclaredMethods" :
true,"allPublicMethods" : true,"allDeclaredClasses" : true,"allPublicClasses" :
true,"allPublicFields" : true,"allDeclaredFields" : true},
- { "name":"org.apache.tomcat.jni.Time", "allDeclaredConstructors" :
true,"allPublicConstructors" : true,"allDeclaredMethods" :
true,"allPublicMethods" : true,"allDeclaredClasses" : true,"allPublicClasses" :
true,"allPublicFields" : true,"allDeclaredFields" : true},
- { "name":"org.apache.tomcat.jni.User", "allDeclaredConstructors" :
true,"allPublicConstructors" : true,"allDeclaredMethods" :
true,"allPublicMethods" : true,"allDeclaredClasses" : true,"allPublicClasses" :
true,"allPublicFields" : true,"allDeclaredFields" : true},
{ "name":"java.lang.String", "allDeclaredConstructors" :
true,"allPublicConstructors" : true,"allDeclaredMethods" :
true,"allPublicMethods" : true,"allDeclaredClasses" : true,"allPublicClasses" :
true,"allPublicFields" : true,"allDeclaredFields" : true}
]
diff --git a/res/graal/tomcat-embed-core/native-image/tomcat-reflection.json
b/res/graal/tomcat-embed-core/native-image/tomcat-reflection.json
index 31f01ed8f3..da938c7f89 100644
--- a/res/graal/tomcat-embed-core/native-image/tomcat-reflection.json
+++ b/res/graal/tomcat-embed-core/native-image/tomcat-reflection.json
@@ -55,7 +55,7 @@
{ "name":"org.apache.naming.factory.ResourceFactory", "methods" : [{"name":
"<init>","parameterTypes":[]}] },
{ "name":"org.apache.naming.factory.TransactionFactory", "methods" : [{"name":
"<init>","parameterTypes":[]}] },
{ "name":"org.apache.tomcat.util.net.AbstractEndpoint",
"allDeclaredConstructors" : true, "allPublicConstructors" : true,
"allDeclaredMethods" : true, "allPublicMethods" : true},
-{ "name":"org.apache.tomcat.util.net.AbstractJsseEndpoint",
"allDeclaredConstructors" : true, "allPublicConstructors" : true,
"allDeclaredMethods" : true, "allPublicMethods" : true},
+{ "name":"org.apache.tomcat.util.net.AbstractNetworkChannelEndpoint",
"allDeclaredConstructors" : true, "allPublicConstructors" : true,
"allDeclaredMethods" : true, "allPublicMethods" : true},
{ "name":"org.apache.tomcat.util.net.NioEndpoint", "allDeclaredConstructors" :
true, "allPublicConstructors" : true, "allDeclaredMethods" : true,
"allPublicMethods" : true},
{ "name":"org.apache.tomcat.util.buf.StringCache", "allPublicMethods":true },
{ "name":"org.apache.tomcat.util.net.openssl.OpenSSLImplementation",
"allDeclaredConstructors" : true, "allPublicConstructors" : true,
"allDeclaredMethods" : true, "allPublicMethods" : true},
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
