diff --git a/doc/reference/src/objects.xml b/doc/reference/src/objects.xml
index 6f8618a6..3fd88644 100644
--- a/doc/reference/src/objects.xml
+++ b/doc/reference/src/objects.xml
@@ -204,7 +204,7 @@
</objects>The following example shows the data access
objects (daos.xml) configuration file:
- <objects xmlns="http://www.springframework.net">
+ <objects xmlns="http://www.springframework.net">
<object id="AccountDao" type="Petstore.Dao.HibernateAccountDao, PetStore">
<!-- additional collaborators and configuration for this object go here -->
@@ -695,7 +695,7 @@ IList userList = service.GetUserNames();
all three names refer to the same object you add to the MyApp
configuration metadata the following aliases definitions:
- <alias name="SubsystemA-DbProvider" alias="SubsystemB-DbProvider"/>
+ <alias name="SubsystemA-DbProvider" alias="SubsystemB-DbProvider"/>
<alias name="SubsystemA-DbProvider" alias="MyApp-DbProvider"/>
Now each component and the main app can refer to the
@@ -1552,7 +1552,7 @@ public class ExampleObject
<object id="anotherExampleObject" type="Examples.AnotherObject, ExamplesLibrary"/>
<object id="yetAnotherObject" type="Examples.YetAnotherObject, ExamplesLibrary"/>
- [Visual Basic.NET]
+ [Visual Basic.NET]
Public Class ExampleObject
Private myObjectOne As AnotherObject
@@ -1807,7 +1807,7 @@ public class MixedIocObject
name as the parent object.<!-- in the parent context -->
<object id="AccountService" type="MyApp.SimpleAccountService, MyApp">
<!-- insert dependencies as required as here -->
-</object><!-- in the child (descendant) context -->
+</object><!-- in the child (descendant) context -->
<object id="AccountService" <-- notice that the name of this object is the same as the name of the 'parent' object
type="Spring.Aop.Framework.ProxyFactoryObject, Spring.Aop">
<property name="target">
@@ -2058,24 +2058,24 @@ public class MixedIocObject
The following example demonstrates collection merging:
- <object id="parent" abstract="true" type="Example.ComplexObject, Examples">
- <property name="AdminEmails">
- <name-values>
- <add key="administrator" value="administrator@example.com"/>
- <add key="support" value="support@example.com"/>
- </name-values>
- </property>
- </object>
+ <object id="parent" abstract="true" type="Example.ComplexObject, Examples">
+ <property name="AdminEmails">
+ <name-values>
+ <add key="administrator" value="administrator@example.com"/>
+ <add key="support" value="support@example.com"/>
+ </name-values>
+ </property>
+</object>
- <object id="child" parent="parent" >
- <property name="AdminEmails">
- <!-- the merge is specified on the *child* collection definition -->
- <name-values merge="true">
- <add key="sales" value="sales@example.com"/>
- <add key="support" value="support@example.co.uk"/>
- </name-values>
- </property>
- </object>
+<object id="child" parent="parent" >
+ <property name="AdminEmails">
+ <!-- the merge is specified on the *child* collection definition -->
+ <name-values merge="true">
+ <add key="sales" value="sales@example.com"/>
+ <add key="support" value="support@example.co.uk"/>
+ </name-values>
+ </property>
+</object>
Notice the use of the merge=true attribute on
the <name-values/> element of the
@@ -2085,11 +2085,11 @@ public class MixedIocObject
AdminEmails Properties collection that contains the
result of the merging of the child's AdminEmails
collection with the parent's AdminEmails
- collection.
+ collection:
- administrator=administrator@example.com
-sales=sales@example.com
-support=support@example.co.uk
+ administrator=administrator@example.com // from parent
+sales=sales@example.com // from child
+support=support@example.co.uk // overriden by child
The child Properties collection's value set inherits all
property elements from the parent
@@ -3920,17 +3920,21 @@ public sealed class Font : MarshalByRefObject, ICloneable, ISerializable, IDispo
specify the name of the method that has a void no-argument signature.
For example, the following definition:
- <object id="exampleInitObject" type="Examples.ExampleObject" init-method="init"/>
-[C#]
-public class ExampleObject
-{
- public void Init()
+ <object id="exampleInitObject" type="Examples.ExampleObject" init-method="init"/>
+
+ [C#]
+public class ExampleObject
+{
+ public void Init()
{
- // do some initialization work
- }
-}...is exactly the same as... <object id="exampleInitObject" type="Examples.AnotherExampleObject"/>
-[C#]
+ // do some initialization work
+ }
+}
+
+ ...is exactly the same as...
+
+ <object id="exampleInitObject" type="Examples.AnotherExampleObject"/>[C#]
public class AnotherExampleObject : IInitializingObject
{
public void AfterPropertiesSet()
@@ -3968,16 +3972,9 @@ public class AnotherExampleObject : IInitializingObject
method that has a void no-argument signature. For example, the
following definition:
- <object id="exampleInitObject" type="Examples.ExampleObject" destroy-method="cleanup"/>
-[C#]
-public class ExampleObject
-{
- public void cleanup()
- {
- // do some destruction work (such as closing any open connection (s))
- }
-} is exactly the same as: <object id="exampleInitObject" type="Examples.AnotherExampleObject"/>
-[C#]
+ <object id="exampleInitObject" type="Examples.AnotherExampleObject" />
+
+ [C#]
public class AnotherExampleObject : IDisposable
{
public void Dispose()
@@ -3996,10 +3993,9 @@ public class AnotherExampleObject : IDisposable
interface, the class is provided with a reference to that
IApplicationContext.
- public interface IApplicationContextAware {
- IApplicationContext ApplicationContext {
- set;
- }
+ public interface IApplicationContextAware
+{
+ IApplicationContext ApplicationContext { set; }
}
Thus objects can manipulate programmatically the
@@ -4026,10 +4022,9 @@ public class AnotherExampleObject : IDisposable
the class is provided with a reference to the name defined in its
associated object definition.
- public interface IObjectNameAware {
- string ObjectName {
- set;
- }
+ public interface IObjectNameAware
+{
+ string ObjectName { set; }
}
The callback is invoked after population of normal object
@@ -4835,11 +4830,9 @@ cfg.PostProcessObjectFactory(factory);
In an ASP.NET environment you must specify the full, four-part
name of the assembly when using a
NameValueFileSectionHandler
- <section name="hibernateConfiguration"
- type="System.Configuration.NameValueFileSectionHandler, System,
- Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"/>
-
+ language="myxml"><section name="hibernateConfiguration"
+ type="System.Configuration.NameValueFileSectionHandler, System,
+ Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"/>
@@ -4937,8 +4930,8 @@ cfg.PostProcessObjectFactory(factory);
</configuration> Then the value of 1000 will be used to
overlay the value of 2000 set in the Spring.NET configuration file
shown below <objects xmlns="http://www.springframework.net"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.springframework.net http://www.springframework.net/xsd/spring-objects.xsd" >
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.springframework.net http://www.springframework.net/xsd/spring-objects.xsd" >
<object name="productDao" type="PropPlayApp.SimpleProductDao, PropPlayApp " >
<property name="maxResults" value="2000"/>