diff --git a/org.springframework.beans/src/main/resources/org/springframework/beans/factory/xml/spring-beans-3.1.xsd b/org.springframework.beans/src/main/resources/org/springframework/beans/factory/xml/spring-beans-3.1.xsd index ec75e95e074..9e148d53025 100644 --- a/org.springframework.beans/src/main/resources/org/springframework/beans/factory/xml/spring-beans-3.1.xsd +++ b/org.springframework.beans/src/main/resources/org/springframework/beans/factory/xml/spring-beans-3.1.xsd @@ -94,8 +94,8 @@ ConfigurableEnvironment#setDefaultProfiles(String...) Properties (typically through -D system properties, environment variables, or servlet context init params): - spring.profile.active=p1,p2 - spring.profile.default=p1,p2 + spring.profiles.active=p1,p2 + spring.profiles.default=p1,p2 ]]> diff --git a/org.springframework.context/src/main/java/org/springframework/context/annotation/Profile.java b/org.springframework.context/src/main/java/org/springframework/context/annotation/Profile.java index ae4626f3508..929cd6b3f9e 100644 --- a/org.springframework.context/src/main/java/org/springframework/context/annotation/Profile.java +++ b/org.springframework.context/src/main/java/org/springframework/context/annotation/Profile.java @@ -30,7 +30,7 @@ import org.springframework.core.env.ConfigurableEnvironment; * *

A profile is a named logical grouping that may be activated programatically via * {@link ConfigurableEnvironment#setActiveProfiles} or declaratively through setting the - * {@link AbstractEnvironment#ACTIVE_PROFILES_PROPERTY_NAME spring.profile.active} property, + * {@link AbstractEnvironment#ACTIVE_PROFILES_PROPERTY_NAME spring.profiles.active} property, * usually through JVM system properties, as an environment variable, or for web applications * as a Servlet context parameter in {@code web.xml}. * diff --git a/org.springframework.core/src/main/java/org/springframework/core/env/AbstractEnvironment.java b/org.springframework.core/src/main/java/org/springframework/core/env/AbstractEnvironment.java index 9c893d68ef1..caf36d7f206 100644 --- a/org.springframework.core/src/main/java/org/springframework/core/env/AbstractEnvironment.java +++ b/org.springframework.core/src/main/java/org/springframework/core/env/AbstractEnvironment.java @@ -45,13 +45,13 @@ public abstract class AbstractEnvironment implements ConfigurableEnvironment { * Name of property to set to specify active profiles: {@value}. May be comma delimited. * @see ConfigurableEnvironment#setActiveProfiles */ - public static final String ACTIVE_PROFILES_PROPERTY_NAME = "spring.profile.active"; + public static final String ACTIVE_PROFILES_PROPERTY_NAME = "spring.profiles.active"; /** * Name of property to set to specify default profiles: {@value}. May be comma delimited. * @see ConfigurableEnvironment#setDefaultProfiles */ - public static final String DEFAULT_PROFILES_PROPERTY_NAME = "spring.profile.default"; + public static final String DEFAULT_PROFILES_PROPERTY_NAME = "spring.profiles.default"; protected final Log logger = LogFactory.getLog(getClass()); diff --git a/org.springframework.core/src/main/java/org/springframework/core/env/Environment.java b/org.springframework.core/src/main/java/org/springframework/core/env/Environment.java index 433aad68992..32cacfb2ed3 100644 --- a/org.springframework.core/src/main/java/org/springframework/core/env/Environment.java +++ b/org.springframework.core/src/main/java/org/springframework/core/env/Environment.java @@ -69,7 +69,7 @@ public interface Environment extends PropertyResolver { * Return the set of profiles explicitly made active for this environment. Profiles are used for * creating logical groupings of bean definitions to be registered conditionally, often based on * deployment environment. Profiles can be activated by setting {@linkplain - * AbstractEnvironment#ACTIVE_PROFILES_PROPERTY_NAME "spring.profile.active"} as a system property + * AbstractEnvironment#ACTIVE_PROFILES_PROPERTY_NAME "spring.profiles.active"} as a system property * or by calling {@link ConfigurableEnvironment#setActiveProfiles(String...)}. * *

If no profiles have explicitly been specified as active, then any 'default' profiles will implicitly