This is an automated email from the ASF dual-hosted git repository.
markt pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
from 87294850f5 Merge branch 'main' of
https://gitbox.apache.org/repos/asf/tomcat
new 6e83c093f2 Revert "Refactcor custom URL handler to use ServiceLoader"
new 2d90b7a9f5 Revert incorrect BZ 66491 fix
new 0dda748db2 Follow up to reverting custom URL handler for war
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:
bin/catalina.bat | 3 +
bin/catalina.sh | 3 +
build.xml | 5 +-
.../catalina/loader/WebappClassLoaderBase.java | 4 +
.../apache/catalina/webresources/StandardRoot.java | 11 +-
.../TomcatURLStreamHandlerFactory.java | 164 +++++++++++++++++++++
.../services/java.net.spi.URLStreamHandlerProvider | 16 --
.../services/java.net.spi.URLStreamHandlerProvider | 16 --
res/bnd/catalina.jar.tmp.bnd | 2 -
res/bnd/tomcat-embed-core.jar.tmp.bnd | 2 -
.../services/java.net.spi.URLStreamHandlerProvider | 17 ---
.../TestClasspathUrlStreamHandler.java | 6 +
.../webresources/TestJarWarResourceSet.java | 7 +
.../TestTomcatURLStreamHandlerFactory.java | 35 +++--
.../catalina/webresources/war/TestHandler.java | 9 ++
.../webresources/war/TestWarURLConnection.java | 9 ++
.../apache/tomcat/util/buf/TesterUriUtilBase.java | 3 +
.../tomcat/util/file/TestConfigFileLoader.java | 2 +
.../util/scan/TestAbstractInputStreamJar.java | 8 +
webapps/docs/changelog.xml | 6 +-
20 files changed, 247 insertions(+), 81 deletions(-)
create mode 100644
java/org/apache/catalina/webresources/TomcatURLStreamHandlerFactory.java
delete mode 100644
res/META-INF/catalina.jar/services/java.net.spi.URLStreamHandlerProvider
delete mode 100644
res/META-INF/tomcat-embed-core.jar/services/java.net.spi.URLStreamHandlerProvider
delete mode 100644 test/META-INF/services/java.net.spi.URLStreamHandlerProvider
rename
java/org/apache/catalina/webresources/TomcatURLStreamHandlerProvider.java =>
test/org/apache/catalina/webresources/TestTomcatURLStreamHandlerFactory.java
(56%)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
