Merge pull request #48 from sslavic/SPR-5984

rstoyanchev · rstoyanchev · commit 9c8332a6c4e9 · 2012-03-02T10:55:03.000-08:00
diff --git a/spring-web/src/main/java/org/springframework/web/multipart/MultipartResolver.java b/spring-web/src/main/java/org/springframework/web/multipart/MultipartResolver.java
@@ -24,10 +24,10 @@
  * Implementations are typically usable both within an application context
  * and standalone.
  *
- * <p>There is only one concrete implementation included in Spring,
- * as of Spring 2.5:
+ * <p>There are two concrete implementations included in Spring, as of Spring 3.1:
  * <ul>
  * <li>{@link org.springframework.web.multipart.commons.CommonsMultipartResolver} for Jakarta Commons FileUpload
+ * <li>{@link org.springframework.web.multipart.support.StandardServletMultipartResolver} for Servlet 3.0 Part API
  * </ul>
  *
  * <p>There is no default resolver implementation used for Spring

Original file line number	Diff line number	Diff line change
`@@ -24,10 +24,10 @@`
`24`	`24`	`* Implementations are typically usable both within an application context`
`25`	`25`	`* and standalone.`
`26`	`26`	`*`
`27`		`- * <p>There is only one concrete implementation included in Spring,`
`28`		`- * as of Spring 2.5:`
	`27`	`+ * <p>There are two concrete implementations included in Spring, as of Spring 3.1:`
`29`	`28`	`* <ul>`
`30`	`29`	`* <li>{@link org.springframework.web.multipart.commons.CommonsMultipartResolver} for Jakarta Commons FileUpload`
	`30`	`+ * <li>{@link org.springframework.web.multipart.support.StandardServletMultipartResolver} for Servlet 3.0 Part API`
`31`	`31`	`* </ul>`
`32`	`32`	`*`
`33`	`33`	`* <p>There is no default resolver implementation used for Spring`