Merge remote-tracking branch 'upstream/master'

doc/reference/src/objects.xml

@@ -1568,7 +1568,7 @@ Public Class ExampleObject
         myObjectTwo = yetAnotherObject
         Me.i = i
     End Sub
-End Class</programlisting>Ghe constructor arguments specified in the object
+End Class</programlisting>The constructor arguments specified in the object
         definition will be used to pass in as arguments to the constructor of
         the <literal>ExampleObject</literal>.</para>
 

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.
 					]]>
           </xsd:documentation>
-          <xsd:appinfo>
-            <tool:annotation>
-              <tool:expected-type type="java.lang.Class" />
-              <tool:assignable-to
-								type="org.springframework.beans.factory.support.BeanNameGenerator" />
-            </tool:annotation>
-          </xsd:appinfo>
         </xsd:annotation>
       </xsd:attribute>
     </xsd:complexType>

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";

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]

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()));
         }
         

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]

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]

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]

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]

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"));
         }