diff --git a/doc/reference/src/objects.xml b/doc/reference/src/objects.xml index e258ceef..7739da55 100644 --- a/doc/reference/src/objects.xml +++ b/doc/reference/src/objects.xml @@ -1568,7 +1568,7 @@ Public Class ExampleObject myObjectTwo = yetAnotherObject Me.i = i End Sub -End ClassGhe constructor arguments specified in the object +End ClassThe constructor arguments specified in the object definition will be used to pass in as arguments to the constructor of the ExampleObject. diff --git a/lib/NHibernate33/net/3.5/Iesi.Collections.dll b/lib/NHibernate33/net/3.5/Iesi.Collections.dll index 0f8f69c4..7520b0e9 100644 Binary files a/lib/NHibernate33/net/3.5/Iesi.Collections.dll and b/lib/NHibernate33/net/3.5/Iesi.Collections.dll differ diff --git a/lib/NHibernate33/net/3.5/NHibernate.dll b/lib/NHibernate33/net/3.5/NHibernate.dll index 20f0b158..6a682222 100644 Binary files a/lib/NHibernate33/net/3.5/NHibernate.dll and b/lib/NHibernate33/net/3.5/NHibernate.dll differ diff --git a/lib/NHibernate33/net/4.0/Iesi.Collections.dll b/lib/NHibernate33/net/4.0/Iesi.Collections.dll index 0f8f69c4..7520b0e9 100644 Binary files a/lib/NHibernate33/net/4.0/Iesi.Collections.dll and b/lib/NHibernate33/net/4.0/Iesi.Collections.dll differ diff --git a/lib/NHibernate33/net/4.0/NHibernate.dll b/lib/NHibernate33/net/4.0/NHibernate.dll index 20f0b158..6a682222 100644 Binary files a/lib/NHibernate33/net/4.0/NHibernate.dll and b/lib/NHibernate33/net/4.0/NHibernate.dll differ diff --git a/src/Spring/Spring.Core/Context/Config/spring-context-2.0.xsd b/src/Spring/Spring.Core/Context/Config/spring-context-2.0.xsd index cd35a59a..1b9aab42 100644 --- a/src/Spring/Spring.Core/Context/Config/spring-context-2.0.xsd +++ b/src/Spring/Spring.Core/Context/Config/spring-context-2.0.xsd @@ -103,13 +103,6 @@ The fully-qualified class name of the BeanNameGenerator to be used for naming detected components. ]]> - - - - - - diff --git a/src/Spring/Spring.Core/Objects/Factory/Xml/NamespaceParserRegistry.cs b/src/Spring/Spring.Core/Objects/Factory/Xml/NamespaceParserRegistry.cs index 69ea7b14..bc199576 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Xml/NamespaceParserRegistry.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Xml/NamespaceParserRegistry.cs @@ -93,6 +93,7 @@ namespace Spring.Objects.Factory.Xml 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"; + wellknownNamespaceParserTypeNames["http://www.springframework.net/context"] = "Spring.Context.Config.ContextNamespaceParser, Spring.Core"; wellknownNamespaceParserTypeNames["http://www.springframework.net/db"] = "Spring.Data.Config.DatabaseNamespaceParser, Spring.Data"; wellknownNamespaceParserTypeNames["http://www.springframework.net/database"] = "Spring.Data.Config.DatabaseNamespaceParser, Spring.Data"; wellknownNamespaceParserTypeNames["http://www.springframework.net/remoting"] = "Spring.Remoting.Config.RemotingNamespaceParser, Spring.Services"; diff --git a/test/Spring/Spring.Core.Tests/Context/Attributes/ScanningConfigurationClassPostProcessorTests.cs b/test/Spring/Spring.Core.Tests/Context/Attributes/ScanningConfigurationClassPostProcessorTests.cs index 213d2089..4290deab 100644 --- a/test/Spring/Spring.Core.Tests/Context/Attributes/ScanningConfigurationClassPostProcessorTests.cs +++ b/test/Spring/Spring.Core.Tests/Context/Attributes/ScanningConfigurationClassPostProcessorTests.cs @@ -30,9 +30,7 @@ namespace Spring.Context.Attributes { protected override void CreateApplicationContext() { - NamespaceParserRegistry.RegisterParser(typeof(ContextNamespaceParser)); _ctx = new XmlApplicationContext(ReadOnlyXmlTestResource.GetFilePath("SimpleScanTest.xml", GetType())); - } [Test] diff --git a/test/Spring/Spring.Core.Tests/Context/Attributes/SimpleScanTests.cs b/test/Spring/Spring.Core.Tests/Context/Attributes/SimpleScanTests.cs index c034fe54..9f59cc94 100644 --- a/test/Spring/Spring.Core.Tests/Context/Attributes/SimpleScanTests.cs +++ b/test/Spring/Spring.Core.Tests/Context/Attributes/SimpleScanTests.cs @@ -38,7 +38,6 @@ namespace Spring.Context.Attributes [SetUp] public void Setup() { - NamespaceParserRegistry.RegisterParser(typeof(ContextNamespaceParser)); _applicationContext = new XmlApplicationContext(ReadOnlyXmlTestResource.GetFilePath("SimpleScanTest.xml", GetType())); } diff --git a/test/Spring/Spring.Core.Tests/Context/Config/AttributeConfigObjectDefinitionParserTests.cs b/test/Spring/Spring.Core.Tests/Context/Config/AttributeConfigObjectDefinitionParserTests.cs index d34631a4..cc9e2154 100644 --- a/test/Spring/Spring.Core.Tests/Context/Config/AttributeConfigObjectDefinitionParserTests.cs +++ b/test/Spring/Spring.Core.Tests/Context/Config/AttributeConfigObjectDefinitionParserTests.cs @@ -33,7 +33,6 @@ namespace Spring.Context.Config [SetUp] public void Setup() { - NamespaceParserRegistry.RegisterParser(typeof(ContextNamespaceParser)); } [Test] diff --git a/test/Spring/Spring.Core.Tests/Context/Config/ComponentScanObjectDefinitionParserAssemblyFilterTests.cs b/test/Spring/Spring.Core.Tests/Context/Config/ComponentScanObjectDefinitionParserAssemblyFilterTests.cs index 9e8a6c09..45d7e14f 100644 --- a/test/Spring/Spring.Core.Tests/Context/Config/ComponentScanObjectDefinitionParserAssemblyFilterTests.cs +++ b/test/Spring/Spring.Core.Tests/Context/Config/ComponentScanObjectDefinitionParserAssemblyFilterTests.cs @@ -12,7 +12,6 @@ namespace Spring.Context.Config [SetUp] public void Setup() { - NamespaceParserRegistry.RegisterParser(typeof(ContextNamespaceParser)); } [Test] diff --git a/test/Spring/Spring.Core.Tests/Context/Config/ComponentScanObjectDefinitionParserTests.cs b/test/Spring/Spring.Core.Tests/Context/Config/ComponentScanObjectDefinitionParserTests.cs index 3a175376..86ae53dd 100644 --- a/test/Spring/Spring.Core.Tests/Context/Config/ComponentScanObjectDefinitionParserTests.cs +++ b/test/Spring/Spring.Core.Tests/Context/Config/ComponentScanObjectDefinitionParserTests.cs @@ -38,7 +38,6 @@ namespace Spring.Context.Config [SetUp] public void Setup() { - NamespaceParserRegistry.RegisterParser(typeof(ContextNamespaceParser)); } [Test] diff --git a/test/Spring/Spring.Core.Tests/Context/Config/ComponentScanObjectDefinitionParserTypeFilterTests.cs b/test/Spring/Spring.Core.Tests/Context/Config/ComponentScanObjectDefinitionParserTypeFilterTests.cs index f02885bd..9aa26aa8 100644 --- a/test/Spring/Spring.Core.Tests/Context/Config/ComponentScanObjectDefinitionParserTypeFilterTests.cs +++ b/test/Spring/Spring.Core.Tests/Context/Config/ComponentScanObjectDefinitionParserTypeFilterTests.cs @@ -38,7 +38,6 @@ namespace Spring.Context.Config [SetUp] public void Setup() { - NamespaceParserRegistry.RegisterParser(typeof(ContextNamespaceParser)); } [Test] diff --git a/test/Spring/Spring.Core.Tests/Context/Config/ContextNamespaceParserTests.cs b/test/Spring/Spring.Core.Tests/Context/Config/ContextNamespaceParserTests.cs index 9a638046..2d55d81c 100644 --- a/test/Spring/Spring.Core.Tests/Context/Config/ContextNamespaceParserTests.cs +++ b/test/Spring/Spring.Core.Tests/Context/Config/ContextNamespaceParserTests.cs @@ -30,11 +30,10 @@ namespace Spring.Context.Config [SetUp] public void Setup() { - NamespaceParserRegistry.RegisterParser(typeof(ContextNamespaceParser)); } [Test] - public void Registered() + public void RegisteredAsWellKnownParser() { Assert.IsNotNull(NamespaceParserRegistry.GetParser("http://www.springframework.net/context")); }