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

Merge branch '2.1.x' 

Closes gh-18022
This commit is contained in:
Phillip Webb 2019-08-30 14:53:21 -07:00
parent 1283bc05d7 dbccb705a8
commit ddbc1e5b0a
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
View File

@ -7254,7 +7254,8 @@ Resources can be specified by using the usual Spring conventions, as shown in th
[[boot-features-web-application-conditions]]
==== Web Application Conditions
The `@ConditionalOnWebApplication` and `@ConditionalOnNotWebApplication` annotations let configuration be included depending on whether the application is a "`web application`".
A web application is any application that uses a Spring `WebApplicationContext`, defines a `session` scope, or has a `StandardServletEnvironment`.
A servlet based web application is any application that uses a Spring `WebApplicationContext`, defines a `session` scope, or has a `StandardServletEnvironment`.
A reactive web application is any application that uses a `ReactiveWebApplicationContext`, defines a `session` scope, or has a `ConfigurableReactiveWebEnvironment`.