[tomcat] branch master updated: Enable jrt protocol and allow module calls

[remm]

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

remm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/master by this push:
     new 8995466  Enable jrt protocol and allow module calls
8995466 is described below

commit 8995466c4ddec92d2263b4f2824561d7c1f4f69e
Author: remm <r...@apache.org>
AuthorDate: Thu Nov 28 11:34:31 2019 +0100

    Enable jrt protocol and allow module calls
    
    This doesn't break, so don't noop it.
---
 java/org/apache/tomcat/util/compat/GraalCompat.java | 13 -------------
 webapps/docs/graal.xml                              |  2 +-
 2 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/java/org/apache/tomcat/util/compat/GraalCompat.java 
b/java/org/apache/tomcat/util/compat/GraalCompat.java
index 4ae501d..9fb835a 100644
--- a/java/org/apache/tomcat/util/compat/GraalCompat.java
+++ b/java/org/apache/tomcat/util/compat/GraalCompat.java
@@ -17,8 +17,6 @@
 package org.apache.tomcat.util.compat;
 
 import java.io.IOException;
-import java.net.URL;
-import java.util.Deque;
 
 class GraalCompat extends Jre9Compat {
 
@@ -46,15 +44,4 @@ class GraalCompat extends Jre9Compat {
     public void disableCachingForJarUrlConnections() throws IOException {
     }
 
-    @Override
-    public void addBootModulePath(Deque<URL> classPathUrlsToProcess) {
-        // No support for modules in native images
-    }
-
-    @Override
-    public boolean isExported(Class<?> type) {
-        // No support for modules in native images so return true
-        return true;
-    }
-
 }
diff --git a/webapps/docs/graal.xml b/webapps/docs/graal.xml
index 6aea12c..0739428 100644
--- a/webapps/docs/graal.xml
+++ b/webapps/docs/graal.xml
@@ -135,7 +135,7 @@ ant -Dwebapp.name=somewebapp -f 
graal-webapp.ant.xml</source>
         --allow-incomplete-classpath --enable-https\
         
--initialize-at-build-time=org.eclipse.jdt,org.apache.el.parser.SimpleNode,javax.servlet.jsp.JspFactory,org.apache.jasper.servlet.JasperInitializer,org.apache.jasper.runtime.JspFactoryImpl\
         -H:+JNI -H:+ReportUnsupportedElementsAtRuntime\
-        -H:+ReportExceptionStackTraces -H:EnableURLProtocols=http,https,jar\
+        -H:+ReportExceptionStackTraces 
-H:EnableURLProtocols=http,https,jar,jrt\
         -H:ConfigurationFileDirectories=$TOMCAT_MAVEN/target/\
         -H:ReflectionConfigurationFiles=$TOMCAT_MAVEN/tomcat-reflection.json\
         -H:ResourceConfigurationFiles=$TOMCAT_MAVEN/tomcat-resource.json\


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