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

Use dot notation rather than camel case for profile props (SPR-7508) 

Before this change, the following properties could be used to manipulate
Spring profile behavior:

    -DspringProfiles=p1,p2
    -DdefaultSpringProfile=pD

These properties have been renamed to follow usual Java conventions for
property naming:

    -Dspring.profile.active=p1,p2
    -Dspring.profile.default=pD
This commit is contained in:
Chris Beams 2010-12-05 20:14:26 +00:00
parent 5062dc31af
commit e0c5ced695
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
org.springframework.beans/src/main/resources/org/springframework/beans/factory/xml/spring-beans-3.1.xsd
View File

@ -87,7 +87,9 @@
* profile="default" means that beans will be registered unless other profile(s) are active
* profile="xyz,default" means that beans will be registered if 'xyz' is active or if no profile is active
* ConfigurableEnvironment.setDefaultProfileName(String) customizes the name of the default profile
* 'defaultSpringProfile' property customizes the name of the default profile (usually for use as a
* 'spring.profile.default' property customizes the name of the default profile (usually for use as a
* ConfigurableEnvironment.setActiveProfiles(String...) sets which profiles are active
* 'spring.profile.active' sets which profiles are active (typically as a -D system property)
servlet context/init param)
]]></xsd:documentation>
</xsd:annotation>

4
org.springframework.context/src/main/java/org/springframework/context/annotation/Profile.java
View File

@ -30,9 +30,9 @@ import java.lang.annotation.Target;
* @Profile("default") means that beans will be registered unless other profile(s) are active
* @Profile({"xyz,default"}) means that beans will be registered if 'xyz' is active or if no profile is active
* ConfigurableEnvironment.setDefaultProfileName(String) customizes the name of the default profile
* 'defaultSpringProfile' property customizes the name of the default profile (usually for use as a servlet context/init param)
* 'spring.profile.default' property customizes the name of the default profile (usually for use as a servlet context/init param)
* ConfigurableEnvironment.setActiveProfiles(String...) sets which profiles are active
* 'springProfiles' sets which profiles are active (typically as a -D system property)
* 'spring.profile.active' sets which profiles are active (typically as a -D system property)
*
* @author Chris Beams
* @since 3.1

10
org.springframework.core/src/main/java/org/springframework/core/env/AbstractEnvironment.java vendored
View File

@ -50,9 +50,9 @@ import org.springframework.util.PropertyPlaceholderHelper.PlaceholderResolver;
*/
public abstract class AbstractEnvironment implements ConfigurableEnvironment {
public static final String ACTIVE_PROFILES_PROPERTY_NAME = "springProfiles";
public static final String ACTIVE_PROFILES_PROPERTY_NAME = "spring.profile.active";
public static final String DEFAULT_PROFILE_PROPERTY_NAME = "defaultSpringProfile";
public static final String DEFAULT_PROFILE_PROPERTY_NAME = "spring.profile.default";
/**
* Default name of the default profile. Override with
@ -293,9 +293,9 @@ public abstract class AbstractEnvironment implements ConfigurableEnvironment {
}
public String getDefaultProfile() {
String defaultSpringProfileProperty = getProperty(DEFAULT_PROFILE_PROPERTY_NAME);
if (defaultSpringProfileProperty != null) {
return defaultSpringProfileProperty;
String defaultProfileProperty = getProperty(DEFAULT_PROFILE_PROPERTY_NAME);
if (defaultProfileProperty != null) {
return defaultProfileProperty;
}
return defaultProfile;
}