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

Clarify docs on JNDI properties in Servlet environment 

See gh-28488
This commit is contained in:
Arend v. Reinersdorff 2022-05-19 21:23:38 +02:00 committed by Stephane Nicoll
parent a6596e2446
commit 67eb2bbf19
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-web/src/main/java/org/springframework/web/context/support/StandardServletEnvironment.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2021 the original author or authors.
* Copyright 2002-2022 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.
@ -95,6 +95,8 @@ public class StandardServletEnvironment extends StandardEnvironment implements C
* {@link StubPropertySource stubs} at this stage, and will be
* {@linkplain #initPropertySources(ServletContext, ServletConfig) fully initialized}
* once the actual {@link ServletContext} object becomes available.
* <p>Addition of {@value #JNDI_PROPERTY_SOURCE_NAME} can be disabled with
* {@link JndiLocatorDelegate#IGNORE_JNDI_PROPERTY_NAME}.
* @see StandardEnvironment#customizePropertySources
* @see org.springframework.core.env.AbstractEnvironment#customizePropertySources
* @see ServletConfigPropertySource

5
src/docs/asciidoc/core/core-beans.adoc
View File

@ -9982,9 +9982,8 @@ is configured with two PropertySource objects -- one representing the set of JVM
NOTE: These default property sources are present for `StandardEnvironment`, for use in standalone
applications. {api-spring-framework}/web/context/support/StandardServletEnvironment.html[`StandardServletEnvironment`]
is populated with additional default property sources including servlet config and servlet
context parameters. It can optionally enable a {api-spring-framework}/jndi/JndiPropertySource.html[`JndiPropertySource`].
See the javadoc for details.
is populated with additional default property sources: Servlet config, servlet context parameters and a
{api-spring-framework}/jndi/JndiPropertySource.html[`JndiPropertySource`].
Concretely, when you use the `StandardEnvironment`, the call to `env.containsProperty("my-property")`
returns true if a `my-property` system property or `my-property` environment variable is present at