root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Update documentation for WebJar support 

Prior to this commit, documentation for WebJar support referenced the
webjars-locator artifact; however, Spring now uses the
webjars-locator-core artifact.

This commit updates the documentation to reflect this.

Closes gh-22613
This commit is contained in:
Sam Brannen 2019-03-19 18:59:03 +01:00
parent 4651039b1f
commit ef11aa4583
4 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
spring-webflux/src/main/java/org/springframework/web/reactive/resource/WebJarsResourceResolver.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2018 the original author or authors.
* Copyright 2002-2019 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -36,8 +36,8 @@ import org.springframework.web.server.ServerWebExchange;
*
* <p>This also resolves resources for version agnostic HTTP requests {@code "GET /jquery/jquery.min.js"}.
*
* <p>This resolver requires the "org.webjars:webjars-locator" library on classpath,
* and is automatically registered if that library is present.
* <p>This resolver requires the {@code org.webjars:webjars-locator-core} library
* on the classpath and is automatically registered if that library is present.
*
* @author Rossen Stoyanchev
* @author Brian Clozel

6
spring-webmvc/src/main/java/org/springframework/web/servlet/resource/WebJarsResourceResolver.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2018 the original author or authors.
* Copyright 2002-2019 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -35,8 +35,8 @@ import org.springframework.lang.Nullable;
*
* <p>This also resolves resources for version agnostic HTTP requests {@code "GET /jquery/jquery.min.js"}.
*
* <p>This resolver requires the "org.webjars:webjars-locator" library on classpath,
* and is automatically registered if that library is present.
* <p>This resolver requires the {@code org.webjars:webjars-locator-core} library
* on the classpath and is automatically registered if that library is present.
*
* @author Brian Clozel
* @since 4.2

11
src/docs/asciidoc/web/webflux.adoc
View File

@ -3355,11 +3355,12 @@ Note that, when using both `EncodedResourceResolver` (for example, Gzip, Brotli
`VersionedResourceResolver`, they must be registered in that order, to ensure content-based
versions are always computed reliably based on the unencoded file.
http://www.webjars.org/documentation[WebJars] is also supported through `WebJarsResourceResolver`
and is automatically registered when `org.webjars:webjars-locator` is present on the
classpath. The resolver can re-write URLs to include the version of the jar and can also
match to incoming URLs without versions (for example, `/jquery/jquery.min.js` to
`/jquery/1.2.0/jquery.min.js`).
http://www.webjars.org/documentation[WebJars] are also supported through the
`WebJarsResourceResolver` which is automatically registered when the
`org.webjars:webjars-locator-core` library is present on the classpath. The resolver can
re-write URLs to include the version of the jar and can also match against incoming URLs
without versions -- for example, from `/jquery/jquery.min.js` to
`/jquery/1.2.0/jquery.min.js`.

9
src/docs/asciidoc/web/webmvc.adoc
View File

@ -4757,10 +4757,11 @@ Note that, when using both `EncodedResourceResolver` (for example, for serving g
brotli-encoded resources) and `VersionedResourceResolver`, you must register them in this order.
That ensures content-based versions are always computed reliably, based on the unencoded file.
http://www.webjars.org/documentation[WebJars] is also supported through `WebJarsResourceResolver`
and is automatically registered when `org.webjars:webjars-locator` is present on the
classpath. The resolver can re-write URLs to include the version of the jar and can also
match to incoming URLs without versions -- for example, `/jquery/jquery.min.js` to
http://www.webjars.org/documentation[WebJars] are also supported through the
`WebJarsResourceResolver` which is automatically registered when the
`org.webjars:webjars-locator-core` library is present on the classpath. The resolver can
re-write URLs to include the version of the jar and can also match against incoming URLs
without versions -- for example, from `/jquery/jquery.min.js` to
`/jquery/1.2.0/jquery.min.js`.