Update of /cvsroot/springnet/Spring.Net/src/Spring/Spring.Core/Objects/Factory/Support
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv2337
Modified Files:
AbstractObjectFactory.cs DefaultListableObjectFactory.cs
Log Message:
PropertyOverrideConfigurer on abstract object definition does not work [SPRNET-733]
Index: AbstractObjectFactory.cs
===================================================================
RCS file: /cvsroot/springnet/Spring.Net/src/Spring/Spring.Core/Objects/Factory/Support/AbstractObjectFactory.cs,v
retrieving revision 1.71
retrieving revision 1.72
diff -C2 -d -r1.71 -r1.72
*** AbstractObjectFactory.cs 7 Sep 2007 01:52:25 -0000 1.71
--- AbstractObjectFactory.cs 10 Oct 2007 19:17:07 -0000 1.72
***************
*** 561,565 ****
}
! RootObjectDefinition rootDefinition = MergeObjectDefinitions(name, parentDefinition, childDefinition);
return rootDefinition;
}
--- 561,566 ----
}
! RootObjectDefinition rootDefinition = CreateRootObjectDefinition(parentDefinition);
! rootDefinition.OverrideFrom(childDefinition);
return rootDefinition;
}
***************
*** 570,574 ****
}
}
!
/// <summary>
/// Merges the object definitions.
--- 571,575 ----
}
}
! /*
/// <summary>
/// Merges the object definitions.
***************
*** 585,589 ****
return rootDefinition;
}
!
/// <summary>
/// Creates the root object definition.
--- 586,590 ----
return rootDefinition;
}
! */
/// <summary>
/// Creates the root object definition.
***************
*** 635,639 ****
public abstract IObjectDefinition GetObjectDefinition(string name, bool includeAncestors);
-
/// <summary>
/// Gets the type for the given FactoryObject.
--- 636,639 ----
***************
*** 686,690 ****
return null;
}
-
}
--- 686,689 ----
***************
*** 918,922 ****
}
-
/// <summary>
/// Resolves the type of the object for the specified object definition resolving
--- 917,920 ----
***************
*** 1047,1051 ****
}
-
/// <summary>
/// Determines whether the object with the given name matches the specified type.
--- 1045,1048 ----
***************
*** 1370,1374 ****
}
-
#endregion
--- 1367,1370 ----
***************
*** 1421,1425 ****
#region IObjectFactory Members
-
/// <summary>
/// Is this object a singleton?
--- 1417,1420 ----
***************
*** 1478,1482 ****
}
-
/// <summary>
/// Determines whether the specified object name is prototype. That is, will GetObject
--- 1473,1476 ----
***************
*** 1527,1530 ****
--- 1521,1525 ----
}
}
+
/// <summary>
/// Does this object factory contain an object with the given name?
***************
*** 1819,1823 ****
}
-
/// <summary>
/// Determines whether the specified object name is currently in creation..
--- 1814,1817 ----
***************
*** 1850,1854 ****
}
-
/// <summary>
/// Add a new <see cref="Spring.Objects.Factory.Config.IObjectPostProcessor"/>
--- 1844,1847 ----
***************
*** 1875,1879 ****
hasDestructionAwareBeanPostProcessors = true;
}
-
}
--- 1868,1871 ----
Index: DefaultListableObjectFactory.cs
===================================================================
RCS file: /cvsroot/springnet/Spring.Net/src/Spring/Spring.Core/Objects/Factory/Support/DefaultListableObjectFactory.cs,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** DefaultListableObjectFactory.cs 27 Aug 2007 15:18:34 -0000 1.41
--- DefaultListableObjectFactory.cs 10 Oct 2007 19:17:07 -0000 1.42
***************
*** 263,267 ****
return (rod.HasObjectType && checkedType.IsAssignableFrom(rod.ObjectType));
}
!
/// <summary>
/// Merges the object definitions.
--- 263,267 ----
return (rod.HasObjectType && checkedType.IsAssignableFrom(rod.ObjectType));
}
! /*
/// <summary>
/// Merges the object definitions.
***************
*** 278,282 ****
return rootDefinition;
}
!
#endregion
--- 278,282 ----
return rootDefinition;
}
! */
#endregion
|
