Spring/spring-data-commons
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DATACMNS-391 - Ensure compatibility with Spring Framework 4.0.

Browse Source 
Some tests required an explicit dependency to servlet-api-3.x.
The GenericApplicationContext doesn't refresh automatically in Spring 4.x we thus we have to call refresh manually. Added a specific version of populators.xml for Spring 4.x since the jaxb2-marshaller element definition no longer renamed the contextPath attribute to context-path in 4.x.

Original pull request: #52.
This commit is contained in:
Thomas Darimont
2013-10-31 12:18:54 +01:00
committed by Oliver Gierke
parent 3a7acf29d7
commit c34983b22b
7 changed files with 59 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/test/resources/org/springframework/data/repository/config/populators-spring-4.0.xml Normal file
View File

@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:repository="http://www.springframework.org/schema/data/repository"
xmlns:oxm="http://www.springframework.org/schema/oxm"
xsi:schemaLocation="http://www.springframework.org/schema/oxm http://www.springframework.org/schema/oxm/spring-oxm.xsd
http://www.springframework.org/schema/data/repository http://www.springframework.org/schema/data/repository/spring-repository.xsd
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
<repository:jackson-populator id="jackson-populator"
locations="classpath:org/springframework/data/repository/init/data.json" />
<repository:jackson2-populator id="jackson2-populator"
locations="classpath:org/springframework/data/repository/init/data.json" />
<repository:unmarshaller-populator
id="xml-populator" locations="classpath:org/springframework/data/repository/init/data.xml"
unmarshaller-ref="unmarshaller" />
<oxm:jaxb2-marshaller id="unmarshaller" context-path="org.springframework.data.repository.config" />
</beans>