[Springnet-commits] Spring.Net/test/Spring/Spring.Core.Tests Spring.Core.Tests.dll-1.1.config, 1.4, 1.5 Spring.Core.Tests.dll.config, 1.20, 1.21

[Bruno B. <bb...@us...>]

Update of /cvsroot/springnet/Spring.Net/test/Spring/Spring.Core.Tests
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv9189

Modified Files:
	Spring.Core.Tests.dll-1.1.config Spring.Core.Tests.dll.config 
Log Message:
Fixed Hierarchical  context loading. SPRNET-891

Index: Spring.Core.Tests.dll-1.1.config
===================================================================
RCS file: /cvsroot/springnet/Spring.Net/test/Spring/Spring.Core.Tests/Spring.Core.Tests.dll-1.1.config,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Spring.Core.Tests.dll-1.1.config	8 Aug 2007 03:13:30 -0000	1.4
--- Spring.Core.Tests.dll-1.1.config	13 Mar 2008 20:07:54 -0000	1.5
***************
*** 46,49 ****
--- 46,52 ----
          <section name='objects' type='Spring.Context.Support.DefaultSectionHandler, Spring.Core' />
        </sectionGroup>
+       <sectionGroup name="grandchild">
+         <section name='objects' type='Spring.Context.Support.DefaultSectionHandler, Spring.Core' />
+       </sectionGroup>
      </sectionGroup>
    </configSections>
***************
*** 102,109 ****
  			type='Spring.Context.Support.XmlApplicationContext, Spring.Core'
  			name='Parent'>
!       <resource uri='config://spring/objects'/>
        <!-- child context -->
        <context name='Child'>
!         <resource uri='config://spring/child/objects'/>
        </context>
      </context>
--- 105,116 ----
  			type='Spring.Context.Support.XmlApplicationContext, Spring.Core'
  			name='Parent'>
!       <resource uri='config://spring2/objects'/>
        <!-- child context -->
        <context name='Child'>
!         <resource uri='config://spring2/child/objects'/>
!         <!-- grandchild context -->
!         <context name='Grandchild'>
!           <resource uri='config://spring2/grandchild/objects'/>
!         </context>
        </context>
      </context>
***************
*** 116,128 ****
      </objects>
  
- 
      <!-- child context's objects -->
      <child>
        <objects xmlns='http://www.springframework.net'>
!         <object id='Child' type='Spring.Objects.TestObject,Spring.Core.Tests'>
            <property name='name' value='Child'/>
          </object>
        </objects>
      </child>
    </spring2>
  
--- 123,143 ----
      </objects>
  
      <!-- child context's objects -->
      <child>
        <objects xmlns='http://www.springframework.net'>
!         <object id='Child' type='Spring.Objects.TestObject, Spring.Core.Tests'>
            <property name='name' value='Child'/>
          </object>
        </objects>
      </child>
+ 
+     <!-- grandchild context's objects -->
+     <grandchild>
+       <objects xmlns='http://www.springframework.net'>
+         <object id='Grandchild' type='Spring.Objects.TestObject, Spring.Core.Tests'>
+           <property name='name' value='Grandchild'/>
+         </object>
+       </objects>
+     </grandchild>
    </spring2>
  

Index: Spring.Core.Tests.dll.config
===================================================================
RCS file: /cvsroot/springnet/Spring.Net/test/Spring/Spring.Core.Tests/Spring.Core.Tests.dll.config,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** Spring.Core.Tests.dll.config	8 Aug 2007 01:54:03 -0000	1.20
--- Spring.Core.Tests.dll.config	13 Mar 2008 20:07:54 -0000	1.21
***************
*** 46,49 ****
--- 46,52 ----
          <section name='objects' type='Spring.Context.Support.DefaultSectionHandler, Spring.Core' />
        </sectionGroup>
+       <sectionGroup name="grandchild">
+         <section name='objects' type='Spring.Context.Support.DefaultSectionHandler, Spring.Core' />
+       </sectionGroup>
      </sectionGroup>
    </configSections>
***************
*** 83,88 ****
          <to:name>John</to:name>
        </to:testobject>
-       
- 
      </objects>
  
--- 86,89 ----
***************
*** 104,111 ****
  			type='Spring.Context.Support.XmlApplicationContext, Spring.Core'
  			name='Parent'>
!       <resource uri='config://spring/objects'/>
        <!-- child context -->
        <context name='Child'>
!         <resource uri='config://spring/child/objects'/>
        </context>
      </context>
--- 105,116 ----
  			type='Spring.Context.Support.XmlApplicationContext, Spring.Core'
  			name='Parent'>
!       <resource uri='config://spring2/objects'/>
        <!-- child context -->
        <context name='Child'>
!         <resource uri='config://spring2/child/objects'/>
!         <!-- grandchild context -->
!         <context name='Grandchild'>
!           <resource uri='config://spring2/grandchild/objects'/>
!         </context>
        </context>
      </context>
***************
*** 118,130 ****
      </objects>
  
- 
      <!-- child context's objects -->
      <child>
        <objects xmlns='http://www.springframework.net'>
!         <object id='Child' type='Spring.Objects.TestObject,Spring.Core.Tests'>
            <property name='name' value='Child'/>
          </object>
        </objects>
      </child>
    </spring2>
  
--- 123,143 ----
      </objects>
  
      <!-- child context's objects -->
      <child>
        <objects xmlns='http://www.springframework.net'>
!         <object id='Child' type='Spring.Objects.TestObject, Spring.Core.Tests'>
            <property name='name' value='Child'/>
          </object>
        </objects>
      </child>
+ 
+     <!-- grandchild context's objects -->
+     <grandchild>
+       <objects xmlns='http://www.springframework.net'>
+         <object id='Grandchild' type='Spring.Objects.TestObject, Spring.Core.Tests'>
+           <property name='name' value='Grandchild'/>
+         </object>
+       </objects>
+     </grandchild>
    </spring2>