From f71ab26b98aa14ddab9cb98e5823eecde67f15fe Mon Sep 17 00:00:00 2001
From: sbohlen <sbohlen@gmail.com>
Date: Mon, 30 May 2011 12:24:59 +0000
Subject: [PATCH] fixing broken build (Mvc3 xml test files collide w/ Mvc2 xml
 test files)

---
 .../Spring.Web.Mvc3.Tests/Spring.Web.Mvc3.Tests.2010.csproj   | 4 ++--
 .../Spring.Web.Mvc3.Tests/SpringMvcDependencyResolverTests.cs | 4 ++--
 .../{namedContextObjects.xml => namedContextObjectsMvc3.xml}  | 0
 .../Spring.Web.Mvc3.Tests/{objects.xml => objectsMvc3.xml}    | 0
 4 files changed, 4 insertions(+), 4 deletions(-)
 rename test/Spring/Spring.Web.Mvc3.Tests/{namedContextObjects.xml => namedContextObjectsMvc3.xml} (100%)
 rename test/Spring/Spring.Web.Mvc3.Tests/{objects.xml => objectsMvc3.xml} (100%)

diff --git a/test/Spring/Spring.Web.Mvc3.Tests/Spring.Web.Mvc3.Tests.2010.csproj b/test/Spring/Spring.Web.Mvc3.Tests/Spring.Web.Mvc3.Tests.2010.csproj
index f515a699..3a79de1d 100644
--- a/test/Spring/Spring.Web.Mvc3.Tests/Spring.Web.Mvc3.Tests.2010.csproj
+++ b/test/Spring/Spring.Web.Mvc3.Tests/Spring.Web.Mvc3.Tests.2010.csproj
@@ -71,12 +71,12 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="objects.xml">
+    <EmbeddedResource Include="objectsMvc3.xml">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="namedContextObjects.xml">
+    <EmbeddedResource Include="namedContextObjectsMvc3.xml">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </EmbeddedResource>
   </ItemGroup>
diff --git a/test/Spring/Spring.Web.Mvc3.Tests/SpringMvcDependencyResolverTests.cs b/test/Spring/Spring.Web.Mvc3.Tests/SpringMvcDependencyResolverTests.cs
index f26ef3f6..59aa5959 100644
--- a/test/Spring/Spring.Web.Mvc3.Tests/SpringMvcDependencyResolverTests.cs
+++ b/test/Spring/Spring.Web.Mvc3.Tests/SpringMvcDependencyResolverTests.cs
@@ -42,8 +42,8 @@ namespace Spring.Web.Mvc.Tests
         public void _TestSetup()
         {
             ContextRegistry.Clear();
-            _context = new MvcApplicationContext("file://objects.xml");
-            _mvcNamedContext = new MvcApplicationContext("named", false, "file://namedContextObjects.xml");
+            _context = new MvcApplicationContext("file://objectsMvc3.xml");
+            _mvcNamedContext = new MvcApplicationContext("named", false, "file://namedContextObjectsMvc3.xml");
 
             ContextRegistry.RegisterContext(_context);
             ContextRegistry.RegisterContext(_mvcNamedContext);
diff --git a/test/Spring/Spring.Web.Mvc3.Tests/namedContextObjects.xml b/test/Spring/Spring.Web.Mvc3.Tests/namedContextObjectsMvc3.xml
similarity index 100%
rename from test/Spring/Spring.Web.Mvc3.Tests/namedContextObjects.xml
rename to test/Spring/Spring.Web.Mvc3.Tests/namedContextObjectsMvc3.xml
diff --git a/test/Spring/Spring.Web.Mvc3.Tests/objects.xml b/test/Spring/Spring.Web.Mvc3.Tests/objectsMvc3.xml
similarity index 100%
rename from test/Spring/Spring.Web.Mvc3.Tests/objects.xml
rename to test/Spring/Spring.Web.Mvc3.Tests/objectsMvc3.xml