diff --git a/org.springframework.integration-tests/integration-tests.iml b/org.springframework.integration-tests/integration-tests.iml
index 8d70b8ea85f..e281e21b1e9 100644
--- a/org.springframework.integration-tests/integration-tests.iml
+++ b/org.springframework.integration-tests/integration-tests.iml
@@ -1,437 +1,437 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/org.springframework.test/src/test/java/org/springframework/test/util/ReflectionTestUtilsTests.java b/org.springframework.test/src/test/java/org/springframework/test/util/ReflectionTestUtilsTests.java
index 02c41e7d80d..41b98ce8df7 100644
--- a/org.springframework.test/src/test/java/org/springframework/test/util/ReflectionTestUtilsTests.java
+++ b/org.springframework.test/src/test/java/org/springframework/test/util/ReflectionTestUtilsTests.java
@@ -191,66 +191,4 @@ public class ReflectionTestUtilsTests extends TestCase {
}.runTest();
}
- @Test
- public void invokeMethodWithAutoboxingAndUnboxing() {
- // IntelliJ IDEA 11 won't accept int assignment here
- Integer difference = invokeMethod(component, "subtract", 5, 2);
- assertEquals("subtract(5, 2)", 3, difference.intValue());
- }
-
- @Ignore("[SPR-8644] findMethod() does not currently support var-args")
- @Test
- public void invokeMethodWithPrimitiveVarArgs() {
- // IntelliJ IDEA 11 won't accept int assignment here
- Integer sum = invokeMethod(component, "add", 1, 2, 3, 4);
- assertEquals("add(1,2,3,4)", 10, sum.intValue());
- }
-
- @Test
- public void invokeMethodWithPrimitiveVarArgsAsSingleArgument() {
- // IntelliJ IDEA 11 won't accept int assignment here
- Integer sum = invokeMethod(component, "add", new int[] { 1, 2, 3, 4 });
- assertEquals("add(1,2,3,4)", 10, sum.intValue());
- }
-
- @Test
- public void invokeMethodsSimulatingLifecycleEvents() {
- assertNull("number", component.getNumber());
- assertNull("text", component.getText());
-
- // Simulate autowiring a configuration method
- invokeMethod(component, "configure", new Integer(42), "enigma");
- assertEquals("number should have been configured", new Integer(42), component.getNumber());
- assertEquals("text should have been configured", "enigma", component.getText());
-
- // Simulate @PostConstruct life-cycle event
- invokeMethod(component, "init");
- // assertions in init() should succeed
-
- // Simulate @PreDestroy life-cycle event
- invokeMethod(component, "destroy");
- assertNull("number", component.getNumber());
- assertNull("text", component.getText());
- }
-
- @Test(expected = IllegalStateException.class)
- public void invokeMethodWithIncompatibleArgumentTypes() {
- invokeMethod(component, "subtract", "foo", 2.0);
- }
-
- @Test(expected = IllegalStateException.class)
- public void invokeInitMethodBeforeAutowiring() {
- invokeMethod(component, "init");
- }
-
- @Test(expected = IllegalStateException.class)
- public void invokeMethodWithTooFewArguments() {
- invokeMethod(component, "configure", new Integer(42));
- }
-
- @Test(expected = IllegalStateException.class)
- public void invokeMethodWithTooManyArguments() {
- invokeMethod(component, "configure", new Integer(42), "enigma", "baz", "quux");
- }
-
}
diff --git a/org.springframework.web/web.iml b/org.springframework.web/web.iml
index 19f1919a14b..608cda7e84d 100644
--- a/org.springframework.web/web.iml
+++ b/org.springframework.web/web.iml
@@ -210,11 +210,11 @@
-
+
-
+