Spring/spring-net
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

reverting breaking change in visibility to ConfigurationLocations and ConfigurationSources in AbstractXmlApplicationContext and derived types

Browse Source
This commit is contained in:
Steve Bohlen
2012-07-10 10:03:51 -04:00
parent 851574de92
commit 7318d07d48
7 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Spring/Spring.Core/Context/Support/AbstractXmlApplicationContext.cs
View File

@@ -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>

4
src/Spring/Spring.Core/Context/Support/XmlApplicationContext.cs
View File

@@ -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; }
}

4
src/Spring/Spring.Web.Mvc/Context/Support/MvcApplicationContext.cs
View File

@@ -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; }
}

4
src/Spring/Spring.Web.Mvc3/Context/Support/MvcApplicationContext.cs
View File

@@ -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; }
}

4
src/Spring/Spring.Web.Mvc4/Context/Support/MvcApplicationContext.cs
View File

@@ -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; }
}

4
src/Spring/Spring.Web/Context/Support/WebApplicationContext.cs
View File

@@ -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; }
}

4
test/Spring/Spring.Data.Tests/Transaction/Config/TxNamespaceParserTests.cs
View File

@@ -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; }
}