From 7318d07d48cfcceffa5f0956b1aff9d2d31d4d5f Mon Sep 17 00:00:00 2001
From: Steve Bohlen <sbohlen@gmail.com>
Date: Tue, 10 Jul 2012 10:03:51 -0400
Subject: [PATCH] reverting breaking change in visibility to
 ConfigurationLocations and ConfigurationSources in
 AbstractXmlApplicationContext and derived types

---
 .../Context/Support/AbstractXmlApplicationContext.cs          | 4 ++--
 .../Spring.Core/Context/Support/XmlApplicationContext.cs      | 4 ++--
 .../Spring.Web.Mvc/Context/Support/MvcApplicationContext.cs   | 4 ++--
 .../Spring.Web.Mvc3/Context/Support/MvcApplicationContext.cs  | 4 ++--
 .../Spring.Web.Mvc4/Context/Support/MvcApplicationContext.cs  | 4 ++--
 .../Spring.Web/Context/Support/WebApplicationContext.cs       | 4 ++--
 .../Transaction/Config/TxNamespaceParserTests.cs              | 4 ++--
 7 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/Spring/Spring.Core/Context/Support/AbstractXmlApplicationContext.cs b/src/Spring/Spring.Core/Context/Support/AbstractXmlApplicationContext.cs
index 6c4ea477..4c5ce413 100644
--- a/src/Spring/Spring.Core/Context/Support/AbstractXmlApplicationContext.cs
+++ b/src/Spring/Spring.Core/Context/Support/AbstractXmlApplicationContext.cs
@@ -97,7 +97,7 @@ namespace Spring.Context.Support
         /// <returns>
         /// An array of resource locations, or <see langword="null"/> if none.
         /// </returns>
-        public abstract string[] ConfigurationLocations { get; }
+        protected abstract string[] ConfigurationLocations { get; }
 
 
         /// <summary>
@@ -114,7 +114,7 @@ namespace Spring.Context.Support
         /// <returns>
         /// An array of <see cref="Spring.Core.IO.IResource"/>s, or <see langword="null"/> if none.
         /// </returns>
-        public abstract IResource[] ConfigurationResources { get; }
+        protected abstract IResource[] ConfigurationResources { get; }
 
 
         /// <summary>
diff --git a/src/Spring/Spring.Core/Context/Support/XmlApplicationContext.cs b/src/Spring/Spring.Core/Context/Support/XmlApplicationContext.cs
index a5550e65..4c2c78f7 100644
--- a/src/Spring/Spring.Core/Context/Support/XmlApplicationContext.cs
+++ b/src/Spring/Spring.Core/Context/Support/XmlApplicationContext.cs
@@ -266,7 +266,7 @@ namespace Spring.Context.Support
         /// An array of resource locations, or <see langword="null"/> if none.
         /// </returns>
         /// <seealso cref="Spring.Context.Support.AbstractXmlApplicationContext.ConfigurationLocations"/>
-        public override string[] ConfigurationLocations
+        protected override string[] ConfigurationLocations
         {
             get { return _configurationLocations; }
         }
@@ -278,7 +278,7 @@ namespace Spring.Context.Support
         /// An array of <see cref="Spring.Core.IO.IResource"/>s, or <see langword="null"/> if none.
         /// </returns>
         /// <seealso cref="Spring.Context.Support.AbstractXmlApplicationContext.ConfigurationLocations"/>
-        public override IResource[] ConfigurationResources
+        protected override IResource[] ConfigurationResources
         {
             get { return _configurationResources; }
         }
diff --git a/src/Spring/Spring.Web.Mvc/Context/Support/MvcApplicationContext.cs b/src/Spring/Spring.Web.Mvc/Context/Support/MvcApplicationContext.cs
index da2af790..9484fdbd 100644
--- a/src/Spring/Spring.Web.Mvc/Context/Support/MvcApplicationContext.cs
+++ b/src/Spring/Spring.Web.Mvc/Context/Support/MvcApplicationContext.cs
@@ -119,7 +119,7 @@ namespace Spring.Context.Support
         /// <returns>
         /// An array of resource locations, or <see langword="null"/> if none.
         /// </returns>
-        public override string[] ConfigurationLocations
+        protected override string[] ConfigurationLocations
         {
             get { return _configurationLocations; }
         }
@@ -139,7 +139,7 @@ namespace Spring.Context.Support
         /// <returns>
         /// An array of <see cref="Spring.Core.IO.IResource"/>s, or <see langword="null"/> if none.
         /// </returns>
-        public override IResource[] ConfigurationResources
+        protected override IResource[] ConfigurationResources
         {
             get { return _configurationResources; }
         }
diff --git a/src/Spring/Spring.Web.Mvc3/Context/Support/MvcApplicationContext.cs b/src/Spring/Spring.Web.Mvc3/Context/Support/MvcApplicationContext.cs
index 9ba1d173..bfb6cf4b 100644
--- a/src/Spring/Spring.Web.Mvc3/Context/Support/MvcApplicationContext.cs
+++ b/src/Spring/Spring.Web.Mvc3/Context/Support/MvcApplicationContext.cs
@@ -119,7 +119,7 @@ namespace Spring.Context.Support
         /// <returns>
         /// An array of resource locations, or <see langword="null"/> if none.
         /// </returns>
-        public override string[] ConfigurationLocations
+        protected override string[] ConfigurationLocations
         {
             get { return _configurationLocations; }
         }
@@ -139,7 +139,7 @@ namespace Spring.Context.Support
         /// <returns>
         /// An array of <see cref="Spring.Core.IO.IResource"/>s, or <see langword="null"/> if none.
         /// </returns>
-        public override IResource[] ConfigurationResources
+        protected override IResource[] ConfigurationResources
         {
             get { return _configurationResources; }
         }
diff --git a/src/Spring/Spring.Web.Mvc4/Context/Support/MvcApplicationContext.cs b/src/Spring/Spring.Web.Mvc4/Context/Support/MvcApplicationContext.cs
index 9de54d7b..2543c481 100644
--- a/src/Spring/Spring.Web.Mvc4/Context/Support/MvcApplicationContext.cs
+++ b/src/Spring/Spring.Web.Mvc4/Context/Support/MvcApplicationContext.cs
@@ -119,7 +119,7 @@ namespace Spring.Context.Support
         /// <returns>
         /// An array of resource locations, or <see langword="null"/> if none.
         /// </returns>
-        public override string[] ConfigurationLocations
+        protected override string[] ConfigurationLocations
         {
             get { return _configurationLocations; }
         }
@@ -139,7 +139,7 @@ namespace Spring.Context.Support
         /// <returns>
         /// An array of <see cref="Spring.Core.IO.IResource"/>s, or <see langword="null"/> if none.
         /// </returns>
-        public override IResource[] ConfigurationResources
+        protected override IResource[] ConfigurationResources
         {
             get { return _configurationResources; }
         }
diff --git a/src/Spring/Spring.Web/Context/Support/WebApplicationContext.cs b/src/Spring/Spring.Web/Context/Support/WebApplicationContext.cs
index 13b963ed..b95e059a 100644
--- a/src/Spring/Spring.Web/Context/Support/WebApplicationContext.cs
+++ b/src/Spring/Spring.Web/Context/Support/WebApplicationContext.cs
@@ -378,7 +378,7 @@ namespace Spring.Context.Support
         /// An array of resource locations, or <see langword="null"/> if none.
         /// </returns>
         /// <seealso cref="Spring.Context.Support.AbstractXmlApplicationContext.ConfigurationLocations"/>
-        public override string[] ConfigurationLocations
+        protected override string[] ConfigurationLocations
         {
             get { return _configurationLocations; }
         }
@@ -390,7 +390,7 @@ namespace Spring.Context.Support
         /// An array of <see cref="Spring.Core.IO.IResource"/>s, or <see langword="null"/> if none.
         /// </returns>
         /// <seealso cref="Spring.Context.Support.AbstractXmlApplicationContext.ConfigurationLocations"/>
-        public override IResource[] ConfigurationResources
+        protected override IResource[] ConfigurationResources
         {
             get { return _configurationResources; }
         }
diff --git a/test/Spring/Spring.Data.Tests/Transaction/Config/TxNamespaceParserTests.cs b/test/Spring/Spring.Data.Tests/Transaction/Config/TxNamespaceParserTests.cs
index ab14d605..48d65ffa 100644
--- a/test/Spring/Spring.Data.Tests/Transaction/Config/TxNamespaceParserTests.cs
+++ b/test/Spring/Spring.Data.Tests/Transaction/Config/TxNamespaceParserTests.cs
@@ -57,12 +57,12 @@ namespace Spring.Transaction.Config
                 objectDefinitionReader.LoadObjectDefinitions(configurationResources);
             }
 
-            public override string[] ConfigurationLocations
+            protected override string[] ConfigurationLocations
             {
                 get { return null; }
             }
 
-            public override IResource[] ConfigurationResources
+            protected override IResource[] ConfigurationResources
             {
                 get { return null; }
             }