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

fixed NamespaceParserRegistry.Reset()

Browse Source
This commit is contained in:
eeichinger
2009-05-23 13:22:39 +00:00
parent c466802526
commit 34fea21fdd
2 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/Spring/Spring.Core/Objects/Factory/Xml/NamespaceParserRegistry.cs
View File

@@ -78,13 +78,13 @@ namespace Spring.Objects.Factory.Xml
#region Fields
private readonly static IDictionary parsers;
private static IDictionary parsers;
private readonly static IDictionary wellknownNamespaceParserTypeNames;
#if !NET_2_0
private readonly static XmlSchemaCollection schemas;
private static XmlSchemaCollection schemas;
#else
private readonly static XmlSchemaSet schemas;
private static XmlSchemaSet schemas;
#endif
#endregion
@@ -94,13 +94,6 @@ namespace Spring.Objects.Factory.Xml
/// </summary>
static NamespaceParserRegistry()
{
parsers = new HybridDictionary();
#if !NET_2_0
schemas = new XmlSchemaCollection();
#else
schemas = new XmlSchemaSet();
schemas.XmlResolver = new XmlResourceUrlResolver();
#endif
wellknownNamespaceParserTypeNames = new CaseInsensitiveHashtable();
wellknownNamespaceParserTypeNames["http://www.springframework.net/tx"] = "Spring.Transaction.Config.TxNamespaceParser, Spring.Data";
wellknownNamespaceParserTypeNames["http://www.springframework.net/aop"] = "Spring.Aop.Config.AopNamespaceParser, Spring.Aop";
@@ -118,6 +111,14 @@ namespace Spring.Objects.Factory.Xml
/// <remarks>use for unit tests only</remarks>
public static void Reset()
{
parsers = new HybridDictionary();
#if !NET_2_0
schemas = new XmlSchemaCollection();
#else
schemas = new XmlSchemaSet();
schemas.XmlResolver = new XmlResourceUrlResolver();
#endif
//TODO - externalize default list of parsers.
RegisterParser(new ObjectsNamespaceParser());
// register custom config parsers

12
test/Spring/Spring.Core.Tests/Objects/Factory/Xml/NamespaceParserRegistryTests.cs
View File

@@ -57,6 +57,18 @@ namespace Spring.Objects.Factory.Xml
}
}
[SetUp]
public void SetUp()
{
NamespaceParserRegistry.Reset();
}
[TearDown]
public void TearDown()
{
NamespaceParserRegistry.Reset();
}
#if !NET_1_0
/// <summary>
/// This test doesn't work on .NET 1.0 because there are no XmlResolvers for schema loading...