Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move JNDI_PROPERTY_SOURCE_ENABLED_FLAG constant

Browse Source 
Move JNDI_PROPERTY_SOURCE_ENABLED_FLAG from JndiPropertySource to
StandardServletEnvironment, as this is the only context in which the
constant makes sense.
This commit is contained in:
Chris Beams
2011-07-02 21:26:38 +00:00
parent ea6d363c1e
commit ce0a0ff3d4
3 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
org.springframework.web/src/main/java/org/springframework/web/context/support/StandardServletEnvironment.java
View File

@@ -55,6 +55,13 @@ public class StandardServletEnvironment extends StandardEnvironment {
/** Servlet config init parameters property source name: {@value} */
public static final String SERVLET_CONFIG_PROPERTY_SOURCE_NAME = "servletConfigInitParams";
/**
* Name of property used to determine if a {@link JndiPropertySource}
* should be registered by default: {@value}
*/
public static final String JNDI_PROPERTY_SOURCE_ENABLED_FLAG = "jndiPropertySourceEnabled";
/**
* Customize the set of property sources with those contributed by superclasses as
* well as those appropriate for standard servlet-based environments:
@@ -90,7 +97,7 @@ public class StandardServletEnvironment extends StandardEnvironment {
propertySources.addLast(new StubPropertySource(SERVLET_CONTEXT_PROPERTY_SOURCE_NAME));
super.customizePropertySources(propertySources);
if (this.getProperty(JndiPropertySource.JNDI_PROPERTY_SOURCE_ENABLED_FLAG, boolean.class, false)) {
if (this.getProperty(JNDI_PROPERTY_SOURCE_ENABLED_FLAG, boolean.class, false)) {
propertySources.addAfter(SERVLET_CONTEXT_PROPERTY_SOURCE_NAME, new JndiPropertySource());
}
}