|
|
|
@ -1,5 +1,5 @@
|
|
|
|
|
/*
|
|
|
|
|
* Copyright 2012-2019 the original author or authors.
|
|
|
|
|
* Copyright 2012-2020 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.
|
|
|
|
@ -48,7 +48,6 @@ import org.springframework.context.ApplicationContext;
|
|
|
|
|
import org.springframework.context.ApplicationContextException;
|
|
|
|
|
import org.springframework.core.io.Resource;
|
|
|
|
|
import org.springframework.util.StringUtils;
|
|
|
|
|
import org.springframework.web.context.ContextLoader;
|
|
|
|
|
import org.springframework.web.context.ContextLoaderListener;
|
|
|
|
|
import org.springframework.web.context.ServletContextAware;
|
|
|
|
|
import org.springframework.web.context.WebApplicationContext;
|
|
|
|
@ -85,6 +84,7 @@ import org.springframework.web.context.support.WebApplicationContextUtils;
|
|
|
|
|
*
|
|
|
|
|
* @author Phillip Webb
|
|
|
|
|
* @author Dave Syer
|
|
|
|
|
* @author Scott Frederick
|
|
|
|
|
* @since 2.0.0
|
|
|
|
|
* @see AnnotationConfigServletWebServerApplicationContext
|
|
|
|
|
* @see XmlServletWebServerApplicationContext
|
|
|
|
@ -270,7 +270,6 @@ public class ServletWebServerApplicationContext extends GenericWebApplicationCon
|
|
|
|
|
}
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
Log logger = LogFactory.getLog(ContextLoader.class);
|
|
|
|
|
servletContext.log("Initializing Spring embedded WebApplicationContext");
|
|
|
|
|
try {
|
|
|
|
|
servletContext.setAttribute(WebApplicationContext.ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE, this);
|
|
|
|
|