Merge branch '1.5.x'

Author: wilkinsona

spring-boot/src/main/java/org/springframework/boot/web/servlet/support/ServletContextApplicationListener.java

@@ -39,6 +39,7 @@
 import org.springframework.web.WebApplicationInitializer;
 import org.springframework.web.context.ContextLoaderListener;
 import org.springframework.web.context.WebApplicationContext;
+import org.springframework.web.context.support.StandardServletEnvironment;
 
 /**
  * An opinionated {@link WebApplicationInitializer} to run a {@link SpringApplication}
@@ -103,6 +104,9 @@ public void contextInitialized(ServletContextEvent event) {
 	protected WebApplicationContext createRootApplicationContext(
 			ServletContext servletContext) {
 		SpringApplicationBuilder builder = createSpringApplicationBuilder();
+		StandardServletEnvironment environment = new StandardServletEnvironment();
+		environment.initPropertySources(servletContext, null);
+		builder.environment(environment);
 		builder.main(getClass());
 		ApplicationContext parent = getExistingRootWebApplicationContext(servletContext);
 		if (parent != null) {
@@ -113,7 +117,6 @@ protected WebApplicationContext createRootApplicationContext(
 		}
 		builder.initializers(
 				new ServletContextApplicationContextInitializer(servletContext));
-		builder.listeners(new ServletContextApplicationListener(servletContext));
 		builder.contextClass(AnnotationConfigServletWebServerApplicationContext.class);
 		builder = configure(builder);
 		SpringApplication application = builder.build();

spring-boot/src/main/java/org/springframework/boot/web/servlet/support/SpringBootServletInitializer.java

@@ -16,7 +16,11 @@
 
 package org.springframework.boot.web.servlet.support;
 
+import java.util.Arrays;
+import java.util.Collections;
+
 import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
 
 import org.junit.Rule;
 import org.junit.Test;
@@ -25,17 +29,23 @@
 import org.springframework.beans.DirectFieldAccessor;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.boot.context.event.ApplicationEnvironmentPreparedEvent;
 import org.springframework.boot.web.embedded.undertow.UndertowServletWebServerFactory;
 import org.springframework.boot.web.server.WebServer;
 import org.springframework.boot.web.servlet.server.ServletWebServerFactory;
+import org.springframework.context.ApplicationListener;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.support.AbstractApplicationContext;
+import org.springframework.core.env.PropertySource;
 import org.springframework.mock.web.MockServletContext;
 import org.springframework.web.context.WebApplicationContext;
+import org.springframework.web.context.support.StandardServletEnvironment;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.BDDMockito.given;
+import static org.mockito.Mockito.mock;
 
 /**
  * Tests for {@link SpringBootServletInitializer}.
@@ -120,10 +130,36 @@ public void executableWarThatUsesServletInitializerDoesNotHaveErrorPageFilterCon
 	}
 
 	@Test
-	public void servletContextApplicationListenerIsAdded() {
-		new WithConfiguredSource().createRootApplicationContext(this.servletContext);
-		assertThat(this.application.getListeners())
-				.hasAtLeastOneElementOfType(ServletContextApplicationListener.class);
+	public void servletContextPropertySourceIsAvailablePriorToRefresh()
+			throws ServletException {
+		ServletContext servletContext = mock(ServletContext.class);
+		given(servletContext.getInitParameterNames()).willReturn(
+				Collections.enumeration(Arrays.asList("spring.profiles.active")));
+		given(servletContext.getInitParameter("spring.profiles.active"))
+				.willReturn("from-servlet-context");
+		given(servletContext.getAttributeNames())
+				.willReturn(Collections.enumeration(Collections.<String>emptyList()));
+		try (ConfigurableApplicationContext context = (ConfigurableApplicationContext) new PropertySourceVerifyingSpringBootServletInitializer()
+				.createRootApplicationContext(servletContext)) {
+			assertThat(context.getEnvironment().getActiveProfiles())
+					.containsExactly("from-servlet-context");
+		}
+	}
+
+	private static class PropertySourceVerifyingSpringBootServletInitializer
+			extends SpringBootServletInitializer {
+
+		@Override
+		protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) {
+			return builder.sources(TestApp.class)
+					.listeners(new PropertySourceVerifyingApplicationListener());
+		}
+
+	}
+
+	@Configuration
+	static class TestApp {
+
 	}
 
 	private class MockSpringBootServletInitializer extends SpringBootServletInitializer {
@@ -206,4 +242,17 @@ public SpringApplication build() {
 
 	}
 
+	private static final class PropertySourceVerifyingApplicationListener
+			implements ApplicationListener<ApplicationEnvironmentPreparedEvent> {
+
+		@Override
+		public void onApplicationEvent(ApplicationEnvironmentPreparedEvent event) {
+			PropertySource<?> propertySource = event.getEnvironment().getPropertySources()
+					.get(StandardServletEnvironment.SERVLET_CONTEXT_PROPERTY_SOURCE_NAME);
+			assertThat(propertySource.getProperty("spring.profiles.active"))
+					.isEqualTo("from-servlet-context");
+		}
+
+	}
+
 }