From ae883e3c0cd0281f011e0f906d7100b442c4c9ed Mon Sep 17 00:00:00 2001
From: markpollack <mark.pollack@springsource.com>
Date: Thu, 30 Jul 2009 03:38:12 +0000
Subject: [PATCH] SPRNET-1081 - Add an ExceptionThrowingAction to
 Spring.Validation framework

---
 .../Spring/Objects/Factory/Xml/collectionMerging.xml   | 10 ++++++----
 ...tionMergingGen.xml => collectionMergingGeneric.xml} | 10 ++++++----
 .../Spring.Core.Tests/Spring.Core.Tests.2008.csproj    |  2 +-
 3 files changed, 13 insertions(+), 9 deletions(-)
 rename test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/{collectionMergingGen.xml => collectionMergingGeneric.xml} (72%)

diff --git a/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/collectionMerging.xml b/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/collectionMerging.xml
index 09cb6556..0334ac8e 100644
--- a/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/collectionMerging.xml
+++ b/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/collectionMerging.xml
@@ -2,9 +2,10 @@
 
 <objects xmlns="http://www.springframework.net">
 
+
   <object id="parentWithList" type="Spring.Objects.TestObject, Spring.Core.Tests">
-    <property name="SomeGenericStringList">
-      <list>
+    <property name="SomeList">
+      <list element-type="string">
         <value>Rob Harrop</value>
         <value>Rod Johnson</value>
       </list>
@@ -12,13 +13,14 @@
   </object>
 
   <object id="childWithList" parent="parentWithList">
-    <property name="SomeGenericStringList">
-      <list merge="true">
+    <property name="SomeList">
+      <list merge="true" element-type="string">
         <value>Juergen Hoeller</value>
       </list>
     </property>
   </object>
 
+
   <object id="childWithListOfRefs" parent="parentWithList">
     <property name="SomeList">
       <list merge="true">
diff --git a/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/collectionMergingGen.xml b/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/collectionMergingGeneric.xml
similarity index 72%
rename from test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/collectionMergingGen.xml
rename to test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/collectionMergingGeneric.xml
index d0b5941f..b838df6b 100644
--- a/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/collectionMergingGen.xml
+++ b/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/collectionMergingGeneric.xml
@@ -2,9 +2,11 @@
 
 <objects xmlns="http://www.springframework.net">
 
+
+
   <object id="parentWithList" type="Spring.Objects.TestObject, Spring.Core.Tests">
-    <property name="SomeList">
-      <list element-type="string">
+    <property name="SomeGenericStringList">
+      <list>
         <value>Rob Harrop</value>
         <value>Rod Johnson</value>
       </list>
@@ -12,8 +14,8 @@
   </object>
 
   <object id="childWithList" parent="parentWithList">
-    <property name="SomeList">
-      <list merge="true" element-type="string">
+    <property name="SomeGenericStringList">
+      <list merge="true">
         <value>Juergen Hoeller</value>
       </list>
     </property>
diff --git a/test/Spring/Spring.Core.Tests/Spring.Core.Tests.2008.csproj b/test/Spring/Spring.Core.Tests/Spring.Core.Tests.2008.csproj
index 725e52b8..7bcf789e 100644
--- a/test/Spring/Spring.Core.Tests/Spring.Core.Tests.2008.csproj
+++ b/test/Spring/Spring.Core.Tests/Spring.Core.Tests.2008.csproj
@@ -812,7 +812,7 @@
     <Content Include="Data\Spring\Objects\Factory\Xml\collections.xml" />
     <Content Include="Data\Spring\Objects\Factory\Xml\constructor-arg.xml" />
     <Content Include="Data\Spring\Objects\Factory\Xml\array-autowire.xml" />
-    <Content Include="Data\Spring\Objects\Factory\Xml\collectionMergingGen.xml" />
+    <Content Include="Data\Spring\Objects\Factory\Xml\collectionMergingGeneric.xml" />
     <Content Include="Data\Spring\Objects\Factory\Xml\collectionMerging.xml" />
     <Content Include="Data\Spring\Objects\Factory\Xml\objectNameGeneration.xml" />
     <Content Include="Data\Spring\Objects\Factory\Xml\simple-constructor-arg.xml" />