Go to file
Chris Beams 23e58aa718 Preserve programmatically set context config locations
Prior to this fix, ContextLoader(Listener)'s would overwrite any
value set directly against a WebApplicationContext's #setConfigLocation
method. This is a likely scenario when using Spring 3.1's new
WebApplicationInitializer support.

Now a check is performed to ensure that the ContextLoader init-param
value is non-null before doing the overwriting.

Added tests to ensure that all expected precedence, overwriting and
defaulting of context config locations works as expected.

Issue: SPR-8510
2011-12-12 14:42:24 +00:00
build-spring-framework MethodValidationPostProcessor, MappingJacksonMessageConverter, etc 2011-12-11 22:10:11 +00:00
org.springframework.aop Polish .aop copy of SpringConfiguredBDP 2011-11-28 06:57:04 +00:00
org.springframework.asm Merge 3.1.0 development branch into trunk 2010-10-25 19:48:20 +00:00
org.springframework.aspects + add cache aspectj aspect 2011-12-08 13:20:01 +00:00
org.springframework.beans Allow parameters in FactoryBean-returning @Bean methods 2011-12-10 19:32:02 +00:00
org.springframework.context Support use of @Scheduled against JDK proxies 2011-12-11 13:00:30 +00:00
org.springframework.context.support Revert accidental changes in Eclipse/pom metadata 2011-12-09 13:08:37 +00:00
org.springframework.core Allow parameters in FactoryBean-returning @Bean methods 2011-12-10 19:32:02 +00:00
org.springframework.expression polishing 2011-11-28 18:38:26 +00:00
org.springframework.instrument Include license.txt and notice.txt in module JARs 2011-02-09 06:56:40 +00:00
org.springframework.instrument.tomcat Include license.txt and notice.txt in module JARs 2011-02-09 06:56:40 +00:00
org.springframework.integration-tests Support use of @Scheduled against JDK proxies 2011-12-11 13:00:30 +00:00
org.springframework.jdbc polishing 2011-12-11 23:07:07 +00:00
org.springframework.jms polishing Javadoc for marshalling message converters 2011-12-12 00:29:11 +00:00
org.springframework.orm fixed "hibernateManagedSession" mode to actually work against Hibernate 4.0 (SPR-8776) 2011-12-11 12:51:57 +00:00
org.springframework.oxm polishing 2011-12-11 22:07:12 +00:00
org.springframework.spring-library Merge 3.1.0 development branch into trunk 2010-10-25 19:48:20 +00:00
org.springframework.spring-parent Fix JUnit version in spring-parent pom 2011-11-16 18:23:58 +00:00
org.springframework.test used specific SLF4J versions for running the test suites of individual modules (fixing the Hibernate Validator 4.2 upgrade) 2011-12-09 17:53:29 +00:00
org.springframework.transaction @Transactional qualifiers match against transaction manager definitions in parent contexts as well (SPR-7679) 2011-12-11 13:26:36 +00:00
org.springframework.web Preserve programmatically set context config locations 2011-12-12 14:42:24 +00:00
org.springframework.web.portlet Portlet MVC annotation mapping allows for distributing action names across controllers (SPR-7685) 2011-12-05 21:20:27 +00:00
org.springframework.web.servlet Preserve programmatically set context config locations 2011-12-12 14:42:24 +00:00
org.springframework.web.struts [SPR-8222] Upgraded to JUnit 4.9. 2011-08-30 13:16:12 +00:00
spring-framework-reference Remove unnecessary mentions of aspectjrt/aspectjweaver 2011-12-08 13:46:47 +00:00
.gitignore Add ignorable log file to .gitignore 2011-06-05 21:01:37 +00:00
build.properties Reorganize and add comments to build.properties 2011-08-20 03:02:05 +00:00
build.versions used specific SLF4J versions for running the test suites of individual modules (fixing the Hibernate Validator 4.2 upgrade) 2011-12-09 17:53:29 +00:00
ci-build.properties adding properties file to simplify ant use in Bamboo CI build 2008-12-17 15:47:14 +00:00
eclipse-code-formatter.xml h2 embedded db support; updated formatting conventions not to auto-format javadoc; added hsqldb and h2 to jdbc maven pom as optional deps 2009-05-09 22:27:05 +00:00
spring-framework.ipr consistently use Unix line separator 2011-10-11 01:14:20 +00:00
spring-framework.psf Renamed org.springframework.instrument.classloading module to org.springframework.instrument.tomcat 2009-09-25 12:51:58 +00:00