sprnet-504

sprnet-1005

Author: eeichinger

src/Spring/Spring.Core/Context/Support/AbstractApplicationContext.cs

@@ -547,7 +547,7 @@ private void RefreshObjectPostProcessorChecker(IConfigurableListableObjectFactor
         /// </summary>
         private void InitEventRegistry()
         {
-            if (ContainsObject(EventRegistryObjectName))
+            if (ContainsLocalObject(EventRegistryObjectName))
             {
                 object candidateRegistry = GetObject(EventRegistryObjectName);
                 if (candidateRegistry is IEventRegistry)
@@ -631,7 +631,7 @@ AbstractApplicationContext parent
         /// </remarks>
         private void InitMessageSource()
         {
-            if (ContainsObject(MessageSourceObjectName))
+            if (ContainsLocalObject(MessageSourceObjectName))
             {
                 object candidateSource = GetObject(MessageSourceObjectName);
                 if (candidateSource is IMessageSource)
@@ -685,6 +685,7 @@ IMessageSource parentMessageSource
             {
                 _messageSource = new DelegatingMessageSource(
                     GetInternalParentMessageSource());
+                ObjectFactory.RegisterSingleton(MessageSourceObjectName, _messageSource);
 
                 #region Instrumentation
 
@@ -700,6 +701,7 @@ IMessageSource parentMessageSource
             else
             {
                 _messageSource = new StaticMessageSource();
+                ObjectFactory.RegisterSingleton(MessageSourceObjectName, _messageSource);
 
                 #region Instrumentation
 

src/Spring/Spring.Core/Objects/Factory/Config/ObjectReferenceFactoryObject.cs

@@ -50,7 +50,24 @@ public sealed class ObjectReferenceFactoryObject
 		private string _targetObjectName;
 		private IObjectFactory _objectFactory;
 
-		/// <summary>
+        /// <summary>
+        /// Initialize a new default instance
+        /// </summary>
+	    public ObjectReferenceFactoryObject()
+	    {
+	    }
+        /// <summary>
+        /// Initialize this instance with the predefined <paramref name="targetObjectName"/> and <paramref name="objectFactory"/>.
+        /// </summary>
+        /// <param name="targetObjectName"></param>
+        /// <param name="objectFactory"></param>
+	    public ObjectReferenceFactoryObject(string targetObjectName, IObjectFactory objectFactory)
+	    {
+	        this.TargetObjectName = targetObjectName;
+	        this.ObjectFactory = objectFactory;
+	    }
+
+	    /// <summary>
 		/// The name of the target object.
 		/// </summary>
 		/// <remarks>

src/Spring/Spring.Core/Objects/Factory/IListableObjectFactory.cs

@@ -132,7 +132,11 @@ public interface IListableObjectFactory : IObjectFactory
 		/// <see cref="Spring.Objects.Factory.IFactoryObject"/>s will be instantiated).
 		/// </p>
 		/// <p>
-		/// Does not consider any hierarchy this factory may participate in.
+		/// Does not consider any hierarchy this factory may participate in.
+        /// Use <see cref="ObjectFactoryUtils.ObjectNamesForTypeIncludingAncestors(Spring.Objects.Factory.IListableObjectFactory,System.Type,bool,bool)"/>
+        /// to include beans in ancestor factories too.
+        /// &lt;p&gt;Note: Does &lt;i&gt;not&lt;/i&gt; ignore singleton objects that have been registered
+        /// by other means than bean definitions.
 		/// </p>
 		/// </remarks>
 		/// <param name="type">

src/Spring/Spring.Core/Objects/Factory/Support/AbstractAutowireCapableObjectFactory.cs

@@ -339,7 +339,7 @@ protected void ApplyPropertyValues(string name, RootObjectDefinition definition,
             {
                 return;
             }
-            ObjectDefinitionValueResolver valueResolver = new ObjectDefinitionValueResolver(this, name, definition);
+            ObjectDefinitionValueResolver valueResolver = CreateValueResolver(name, definition);
 
             MutablePropertyValues deepCopy = new MutablePropertyValues(properties);
             PropertyValue[] copiedProperties = deepCopy.PropertyValues;
@@ -365,6 +365,14 @@ protected void ApplyPropertyValues(string name, RootObjectDefinition definition,
             }
         }
 
+        /// <summary>
+        /// Create the value resolver strategy to use for resolving raw property values
+        /// </summary>
+        protected virtual ObjectDefinitionValueResolver CreateValueResolver(string name, IObjectDefinition definition)
+        {
+            return new ObjectDefinitionValueResolver(this, name, definition);
+        }
+
         /// <summary>
         /// Return an array of object-type property names that are unsatisfied.
         /// </summary>