Skip to content

Commit d8c153a

Browse files
committed
Remove support for Resin Servlet container
This commit removes all references to the Resin Servlet container, as it is not supported as of Spring Framework 6.0 because we require a JakartaEE baseline. Closes gh-33772
1 parent 1ba7731 commit d8c153a

File tree

5 files changed

+7
-17
lines changed

5 files changed

+7
-17
lines changed

framework-docs/modules/ROOT/pages/data-access/orm/jpa.adoc

+1-2
Original file line numberDiff line numberDiff line change
@@ -142,8 +142,7 @@ Alternatively, specify a custom `persistenceXmlLocation` on your
142142
META-INF/my-persistence.xml) and include only a descriptor with that name in your
143143
application jar files. Because the Jakarta EE server looks only for default
144144
`META-INF/persistence.xml` files, it ignores such custom persistence units and, hence,
145-
avoids conflicts with a Spring-driven JPA setup upfront. (This applies to Resin 3.1, for
146-
example.)
145+
avoids conflicts with a Spring-driven JPA setup upfront.
147146

148147
.When is load-time weaving required?
149148
****

framework-docs/modules/ROOT/pages/web/webmvc/mvc-config/default-servlet-handler.adoc

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ The caveat to overriding the `/` Servlet mapping is that the `RequestDispatcher`
2121
default Servlet must be retrieved by name rather than by path. The
2222
`DefaultServletHttpRequestHandler` tries to auto-detect the default Servlet for
2323
the container at startup time, using a list of known names for most of the major Servlet
24-
containers (including Tomcat, Jetty, GlassFish, JBoss, Resin, WebLogic, and WebSphere).
24+
containers (including Tomcat, Jetty, GlassFish, JBoss, WebLogic, and WebSphere).
2525
If the default Servlet has been custom-configured with a different name, or if a
2626
different Servlet container is being used where the default Servlet name is unknown,
2727
then you must explicitly provide the default Servlet's name, as the following example shows:

spring-context/src/main/java/org/springframework/instrument/classloading/ReflectiveLoadTimeWeaver.java

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2018 the original author or authors.
2+
* Copyright 2002-2024 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -53,9 +53,6 @@
5353
* web application). There is no direct API dependency between this LoadTimeWeaver
5454
* adapter and the underlying ClassLoader, just a 'loose' method contract.
5555
*
56-
* <p>This is the LoadTimeWeaver to use, for example, with the Resin application server
57-
* version 3.1+.
58-
*
5956
* @author Costin Leau
6057
* @author Juergen Hoeller
6158
* @since 2.0

spring-web/src/main/java/org/springframework/web/util/WebAppRootListener.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2016 the original author or authors.
2+
* Copyright 2002-2024 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -35,7 +35,7 @@
3535
*
3636
* <p><b>WARNING</b>: Some containers, for example, Tomcat, do NOT keep system properties separate
3737
* per web app. You have to use unique "webAppRootKey" context-params per web app
38-
* then, to avoid clashes. Other containers like Resin do isolate each web app's
38+
* then, to avoid clashes. Other containers do isolate each web app's
3939
* system properties: Here you can use the default key (i.e. no "webAppRootKey"
4040
* context-param at all) without worrying.
4141
*

spring-webmvc/src/main/java/org/springframework/web/servlet/resource/DefaultServletHttpRequestHandler.java

+2-8
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2023 the original author or authors.
2+
* Copyright 2002-2024 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -44,7 +44,7 @@
4444
* name specified through the {@link #setDefaultServletName "defaultServletName" property}.
4545
* In most cases, the {@code defaultServletName} does not need to be set explicitly, as the
4646
* handler checks at initialization time for the presence of the default Servlet of well-known
47-
* containers such as Tomcat, Jetty, Resin, WebLogic and WebSphere. However, when running in a
47+
* containers such as Tomcat, Jetty, WebLogic and WebSphere. However, when running in a
4848
* container where the default Servlet's name is not known, or where it has been customized
4949
* via server configuration, the {@code defaultServletName} will need to be set explicitly.
5050
*
@@ -60,9 +60,6 @@ public class DefaultServletHttpRequestHandler implements HttpRequestHandler, Ser
6060
/** Default Servlet name used by Google App Engine. */
6161
private static final String GAE_DEFAULT_SERVLET_NAME = "_ah_default";
6262

63-
/** Default Servlet name used by Resin. */
64-
private static final String RESIN_DEFAULT_SERVLET_NAME = "resin-file";
65-
6663
/** Default Servlet name used by WebLogic. */
6764
private static final String WEBLOGIC_DEFAULT_SERVLET_NAME = "FileServlet";
6865

@@ -99,9 +96,6 @@ public void setServletContext(ServletContext servletContext) {
9996
else if (this.servletContext.getNamedDispatcher(GAE_DEFAULT_SERVLET_NAME) != null) {
10097
this.defaultServletName = GAE_DEFAULT_SERVLET_NAME;
10198
}
102-
else if (this.servletContext.getNamedDispatcher(RESIN_DEFAULT_SERVLET_NAME) != null) {
103-
this.defaultServletName = RESIN_DEFAULT_SERVLET_NAME;
104-
}
10599
else if (this.servletContext.getNamedDispatcher(WEBLOGIC_DEFAULT_SERVLET_NAME) != null) {
106100
this.defaultServletName = WEBLOGIC_DEFAULT_SERVLET_NAME;
107101
}

0 commit comments

Comments
 (0)