This method is idempotent with respect to the fact it may be called any number + * of times but will perform replacement of stub property sources with their + * corresponding actual property sources once and only once. + * @param propertySources the {@link PropertySources} to initialize (must not be {@code null}) + * @param servletContext the current {@link ServletContext} (ignored if {@code null} + * or if the {@link StandardServletEnvironment#SERVLET_CONTEXT_PROPERTY_SOURCE_NAME + * servlet context property source} has already been initialized) + * @param servletConfig the current {@link ServletConfig} (ignored if {@code null} + * or if the {@link StandardServletEnvironment#SERVLET_CONFIG_PROPERTY_SOURCE_NAME + * servlet config property source} has already been initialized) * @see org.springframework.core.env.PropertySource.StubPropertySource - * @see org.springframework.web.context.support.WebApplicationContextUtils#initServletPropertySources(MutablePropertySources, ServletContext) * @see org.springframework.core.env.ConfigurableEnvironment#getPropertySources() */ public static void initServletPropertySources( diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletApplicationContextUtils.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletApplicationContextUtils.java index ef1bebd211..b486de6492 100644 --- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletApplicationContextUtils.java +++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletApplicationContextUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 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. @@ -188,11 +188,25 @@ public abstract class PortletApplicationContextUtils { } /** - * Replace {@code Servlet}- and {@code Portlet}-based stub property sources - * with actual instances populated with the given context and config objects. + * Replace {@code Servlet}- and {@code Portlet}-based {@link StubPropertySource stub + * property sources} with actual instances populated with the given {@code servletContext}, + * {@code portletContext} and {@code portletConfig} objects. + *
This method is idempotent with respect to the fact it may be called any number + * of times but will perform replacement of stub property sources with their + * corresponding actual property sources once and only once. + * @param propertySources the {@link PropertySources} to initialize (must not be {@code null}) + * @param servletContext the current {@link ServletContext} (ignored if {@code null} + * or if the {@link StandardServletEnvironment#SERVLET_CONTEXT_PROPERTY_SOURCE_NAME + * servlet context property source} has already been initialized) + * @param portletContext the current {@link PortletContext} (ignored if {@code null} + * or if the {@link StandardPortletEnvironment#PORTLET_CONTEXT_PROPERTY_SOURCE_NAME + * portlet context property source} has already been initialized) + * @param portletConfig the current {@link PortletConfig} (ignored if {@code null} + * or if the {@link StandardPortletEnvironment#PORTLET_CONFIG_PROPERTY_SOURCE_NAME + * portlet config property source} has already been initialized) * @see org.springframework.core.env.PropertySource.StubPropertySource - * @see org.springframework.core.env.ConfigurableEnvironment#getPropertySources() * @see org.springframework.web.context.support.WebApplicationContextUtils#initServletPropertySources(MutablePropertySources, ServletContext) + * @see org.springframework.core.env.ConfigurableEnvironment#getPropertySources() */ public static void initPortletPropertySources(MutablePropertySources propertySources, ServletContext servletContext, PortletContext portletContext, PortletConfig portletConfig) { diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/FrameworkServlet.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/FrameworkServlet.java index a3b2f461eb..5005efb8eb 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/FrameworkServlet.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/FrameworkServlet.java @@ -634,6 +634,12 @@ public abstract class FrameworkServlet extends HttpServletBean { wac.setNamespace(getNamespace()); wac.addApplicationListener(new SourceFilteringListener(wac, new ContextRefreshListener())); + // the wac environment's #initPropertySources will be called in any case when + // the context is refreshed; do it eagerly here to ensure servlet property sources + // are in place for use in any post-processing or initialization that occurs + // below prior to #refresh + wac.getEnvironment().initPropertySources(getServletContext(), getServletConfig()); + postProcessWebApplicationContext(wac); applyInitializers(wac);