Skip to content

Commit 2b3445d

Browse files
committed
Drop Portlet MVC support
This commit also removes the corresponding deprecated Servlet MVC variant and updates DispatcherServlet.properties to point to RequestMappingHandlerMapping/Adapter by default. Issue: SPR-14129
1 parent ae0b7c2 commit 2b3445d

File tree

235 files changed

+94
-39747
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

235 files changed

+94
-39747
lines changed

spring-context/src/main/java/org/springframework/context/support/AbstractRefreshableConfigApplicationContext.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2014 the original author or authors.
2+
* Copyright 2002-2016 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.
@@ -27,8 +27,7 @@
2727
* of specified config locations. Serves as base class for XML-based application
2828
* context implementations such as {@link ClassPathXmlApplicationContext} and
2929
* {@link FileSystemXmlApplicationContext}, as well as
30-
* {@link org.springframework.web.context.support.XmlWebApplicationContext} and
31-
* {@link org.springframework.web.portlet.context.XmlPortletApplicationContext}.
30+
* {@link org.springframework.web.context.support.XmlWebApplicationContext}.
3231
*
3332
* @author Juergen Hoeller
3433
* @since 2.5.2

spring-context/src/main/java/org/springframework/ui/ModelMap.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2013 the original author or authors.
2+
* Copyright 2002-2016 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.
@@ -27,16 +27,14 @@
2727
* Implementation of {@link java.util.Map} for use when building model data for use
2828
* with UI tools. Supports chained calls and generation of model attribute names.
2929
*
30-
* <p>This class serves as generic model holder for both Servlet and Portlet MVC,
31-
* but is not tied to either of those. Check out the {@link Model} interface for
32-
* a Java-5-based interface variant that serves the same purpose.
30+
* <p>This class serves as generic model holder for Servlet MVC but is not tied to it.
31+
* Check out the {@link Model} interface for an interface variant.
3332
*
3433
* @author Rob Harrop
3534
* @author Juergen Hoeller
3635
* @since 2.0
3736
* @see Conventions#getVariableName
3837
* @see org.springframework.web.servlet.ModelAndView
39-
* @see org.springframework.web.portlet.ModelAndView
4038
*/
4139
@SuppressWarnings("serial")
4240
public class ModelMap extends LinkedHashMap<String, Object> {

spring-context/src/main/java/org/springframework/validation/DataBinder.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2015 the original author or authors.
2+
* Copyright 2002-2016 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.
@@ -92,8 +92,7 @@
9292
*
9393
* <p>This generic data binder can be used in any kind of environment.
9494
* It is typically used by Spring web MVC controllers, via the web-specific
95-
* subclasses {@link org.springframework.web.bind.ServletRequestDataBinder}
96-
* and {@link org.springframework.web.portlet.bind.PortletRequestDataBinder}.
95+
* subclass {@link org.springframework.web.bind.ServletRequestDataBinder}.
9796
*
9897
* @author Rod Johnson
9998
* @author Juergen Hoeller

spring-core/src/main/java/org/springframework/core/io/ContextResource.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,14 @@
1818

1919
/**
2020
* Extended interface for a resource that is loaded from an enclosing
21-
* 'context', e.g. from a {@link javax.servlet.ServletContext} or a
22-
* {@link javax.portlet.PortletContext} but also from plain classpath paths
23-
* or relative file system paths (specified without an explicit prefix,
24-
* hence applying relative to the local {@link ResourceLoader}'s context).
21+
* 'context', e.g. from a {@link javax.servlet.ServletContext} but also
22+
* from plain classpath paths or relative file system paths (specified
23+
* without an explicit prefix, hence applying relative to the local
24+
* {@link ResourceLoader}'s context).
2525
*
2626
* @author Juergen Hoeller
2727
* @since 2.5
2828
* @see org.springframework.web.context.support.ServletContextResource
29-
* @see org.springframework.web.portlet.context.PortletContextResource
3029
*/
3130
public interface ContextResource extends Resource {
3231

spring-test/src/main/java/org/springframework/mock/web/portlet/MockActionRequest.java

Lines changed: 0 additions & 86 deletions
This file was deleted.

spring-test/src/main/java/org/springframework/mock/web/portlet/MockActionResponse.java

Lines changed: 0 additions & 129 deletions
This file was deleted.

0 commit comments

Comments
 (0)