Change pom to run test with -javaagent command line option

Author: Noodle05

SPR-9215/pom.xml

@@ -1,6 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.issues</groupId>
 	<artifactId>SPR-9215</artifactId>
@@ -10,6 +9,7 @@
 		<maven.compiler.source>1.6</maven.compiler.source>
 		<maven.compiler.target>1.6</maven.compiler.target>
 		<project.build.sourceEncoding>UTF8</project.build.sourceEncoding>
+		<spring.version>3.1.0.RELEASE</spring.version>
 	</properties>
 	<dependencies>
 		<dependency>
@@ -38,23 +38,29 @@
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-aspects</artifactId>
-			<version>3.1.0.RELEASE</version>
+			<version>${spring.version}</version>
 			<scope>runtime</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-context</artifactId>
-			<version>3.1.0.RELEASE</version>
+			<version>${spring.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
-			<artifactId>spring-tx</artifactId>
-			<version>3.1.0.RELEASE</version>
+			<artifactId>spring-instrument</artifactId>
+			<version>${spring.version}</version>
+			<scope>runtime</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-orm</artifactId>
-			<version>3.1.0.RELEASE</version>
+			<version>${spring.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-tx</artifactId>
+			<version>${spring.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>log4j</groupId>
@@ -89,6 +95,10 @@
 				<artifactId>maven-surefire-plugin</artifactId>
 				<version>2.7.2</version>
 				<configuration>
+					<forkMode>once</forkMode>
+					<argLine>
+						-javaagent:${settings.localRepository}/org/springframework/spring-instrument/${spring.version}/spring-instrument-${spring.version}.jar
+					</argLine>
 					<includes>
 						<include>**/*Tests.java</include>
 					</includes>

SPR-9215/src/test/java/org/springframework/issues/XmlConfigTests.java

@@ -18,7 +18,7 @@ public class XmlConfigTests {
 	@Test
 	public void xmlConfigurationTest() {
 		GenericXmlApplicationContext ctx = new GenericXmlApplicationContext();
-		ctx.load("classpath:org/springframework/issues/ReproTests-context.xml");
+		ctx.load("classpath:/org/springframework/issues/ReproTests-context.xml");
 		ctx.refresh();
 		try {
 			TestService ts = ctx.getBean(TestService.class);

SPR-9215/src/test/resources/config.properties

@@ -1,4 +1,4 @@
 jdbc.driverClass=org.hsqldb.jdbc.JDBCDriver
-jdbc.url=jdbc:hsqldb:mem
+jdbc.url=jdbc:hsqldb:mem:test
 jdbc.user=SA
 jdbc.password=