[Springnet-commits] Spring.Net/test/Spring/Spring.Data.Integration.Tests/Data DTCAppContext.xml, 1.6, 1.7 DTCAppContextNoInterfaces.xml, 1.3, 1.4 autoDeclarativeServices.xml, 1.5, 1.6 declarativeServices.xml, 1.4, 1.5 templateTests.xml, 1.3, 1.4

[Mark P. <mar...@us...>]

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

Modified Files:
	DTCAppContext.xml DTCAppContextNoInterfaces.xml 
	autoDeclarativeServices.xml declarativeServices.xml 
	templateTests.xml 
Log Message:
update integration tests to refer to classes in Spring.Data.Core

Index: DTCAppContextNoInterfaces.xml
===================================================================
RCS file: /cvsroot/springnet/Spring.Net/test/Spring/Spring.Data.Integration.Tests/Data/DTCAppContextNoInterfaces.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** DTCAppContextNoInterfaces.xml	7 Aug 2007 19:50:44 -0000	1.3
--- DTCAppContextNoInterfaces.xml	17 Sep 2007 19:18:50 -0000	1.4
***************
*** 17,21 ****
      <!--
      <object id="transactionManager" 
!             type="Spring.Data.AdoPlatformTransactionManager, Spring.Data">
        <property name="DbProvider" ref="DbProvider"/>
      </object>
--- 17,21 ----
      <!--
      <object id="transactionManager" 
!             type="Spring.Data.Core.AdoPlatformTransactionManager, Spring.Data">
        <property name="DbProvider" ref="DbProvider"/>
      </object>
***************
*** 23,36 ****
      
      <object id="transactionManager"
!             type="Spring.Data.TxScopeTransactionManager, Spring.Data">
      </object>
         
   
    <!-- AdoTemplate for DAO Implementation -->
!   <object id="adoTemplate" type="Spring.Data.AdoTemplate, Spring.Data">
      <property name="DbProvider" ref="DbProvider"/>
    </object>
  
!   <object id="adoTemplateForDebitDb" type="Spring.Data.AdoTemplate, Spring.Data">
      <property name="DbProvider" ref="DebitDbProvider"/>
    </object>
--- 23,36 ----
      
      <object id="transactionManager"
!             type="Spring.Data.Core.TxScopeTransactionManager, Spring.Data">
      </object>
         
   
    <!-- AdoTemplate for DAO Implementation -->
!   <object id="adoTemplate" type="Spring.Data.Core.AdoTemplate, Spring.Data">
      <property name="DbProvider" ref="DbProvider"/>
    </object>
  
!   <object id="adoTemplateForDebitDb" type="Spring.Data.Core.AdoTemplate, Spring.Data">
      <property name="DbProvider" ref="DebitDbProvider"/>
    </object>

Index: declarativeServices.xml
===================================================================
RCS file: /cvsroot/springnet/Spring.Net/test/Spring/Spring.Data.Integration.Tests/Data/declarativeServices.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** declarativeServices.xml	7 Aug 2007 19:50:44 -0000	1.4
--- declarativeServices.xml	17 Sep 2007 19:18:50 -0000	1.5
***************
*** 1,11 ****
  <?xml version="1.0" encoding="utf-8" ?> 
  <objects xmlns='http://www.springframework.net'
!          xmlns:d="http://www.springframework.net/database">
  
!   <d:provider id="DbProvider" 
!                 provider="SqlServer-1.1" 
!                 connectionString="Data Source=(local);Database=Spring;User ID=springqa;Password=springqa;Trusted_Connection=False"/>
  
!   <object id="adoTemplate" type="Spring.Data.AdoTemplate, Spring.Data">
          <property name="DbProvider" ref="DbProvider"/>                
      </object>
--- 1,11 ----
  <?xml version="1.0" encoding="utf-8" ?> 
  <objects xmlns='http://www.springframework.net'
!          xmlns:db="http://www.springframework.net/database">
  
!   <db:provider id="DbProvider"
!                provider="SqlServer-2.0"
!                connectionString="Data Source=MARKT60\SQL2005;Database=Spring;User ID=springqa;Password=springqa;Trusted_Connection=False"/>
  
!     <object id="adoTemplate" type="Spring.Data.Core.AdoTemplate, Spring.Data">
          <property name="DbProvider" ref="DbProvider"/>                
      </object>
***************
*** 17,21 ****
          
      <object id="adoTransactionManager" 
!             type="Spring.Data.AdoPlatformTransactionManager, Spring.Data">
              
          <property name="DbProvider" ref="DbProvider"/>
--- 17,21 ----
          
      <object id="adoTransactionManager" 
!             type="Spring.Data.Core.AdoPlatformTransactionManager, Spring.Data">
              
          <property name="DbProvider" ref="DbProvider"/>
***************
*** 23,27 ****
      
      <!-- Transactional Proxy for TestObjectManager using the ProxyFactoryObject -->
-     <!--
      <object id="testObjectManager" 
              type="Spring.Aop.Framework.ProxyFactoryObject, Spring.Aop">
--- 23,26 ----
***************
*** 36,44 ****
              
      </object>
!     -->
  
      <object id="autoProxyCreator"
        type="Spring.Aop.Framework.AutoProxy.DefaultAdvisorAutoProxyCreator, Spring.Aop">
      </object>
  
      <object id="transactionAdvisor"
--- 35,45 ----
              
      </object>
!     
  
+     <!--
      <object id="autoProxyCreator"
        type="Spring.Aop.Framework.AutoProxy.DefaultAdvisorAutoProxyCreator, Spring.Aop">
      </object>
+     -->
  
      <object id="transactionAdvisor"
***************
*** 62,65 ****
--- 63,67 ----
  
      <!-- The DAO object that performs multiple data access operations -->
+     <!-- testObjectManagerTarget if not using autoproxy -->
      <object id="testObjectManagerTarget" 
              type="Spring.Data.TestObjectManager, Spring.Data.Integration.Tests">

Index: templateTests.xml
===================================================================
RCS file: /cvsroot/springnet/Spring.Net/test/Spring/Spring.Data.Integration.Tests/Data/templateTests.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** templateTests.xml	7 Aug 2007 19:50:44 -0000	1.3
--- templateTests.xml	17 Sep 2007 19:18:50 -0000	1.4
***************
*** 16,20 ****
  
      <object id="adoTemplate" 
!             type="Spring.Data.AdoTemplate, Spring.Data">
              
          <property name="DbProvider" ref="DbProvider"/>                
--- 16,20 ----
  
      <object id="adoTemplate" 
!             type="Spring.Data.Core.AdoTemplate, Spring.Data">
              
          <property name="DbProvider" ref="DbProvider"/>                
***************
*** 29,33 ****
          
      <object id="adoTransactionManager" 
!             type="Spring.Data.AdoPlatformTransactionManager, Spring.Data">
              
          <property name="DbProvider" ref="DbProvider"/>
--- 29,33 ----
          
      <object id="adoTransactionManager" 
!             type="Spring.Data.Core.AdoPlatformTransactionManager, Spring.Data">
              
          <property name="DbProvider" ref="DbProvider"/>

Index: DTCAppContext.xml
===================================================================
RCS file: /cvsroot/springnet/Spring.Net/test/Spring/Spring.Data.Integration.Tests/Data/DTCAppContext.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** DTCAppContext.xml	7 Aug 2007 23:58:18 -0000	1.6
--- DTCAppContext.xml	17 Sep 2007 19:18:50 -0000	1.7
***************
*** 28,32 ****
    <!--
      <object id="transactionManager" 
!             type="Spring.Data.AdoPlatformTransactionManager, Spring.Data">
        <property name="DbProvider" ref="DbProvider"/>
      </object>
--- 28,32 ----
    <!--
      <object id="transactionManager" 
!             type="Spring.Data.Core.AdoPlatformTransactionManager, Spring.Data">
        <property name="DbProvider" ref="DbProvider"/>
      </object>
***************
*** 34,47 ****
  
    <object id="transactionManager"
!           type="Spring.Data.TxScopeTransactionManager, Spring.Data">
    </object>
  
  
    <!-- AdoTemplate for DAO Implementation -->
!   <object id="adoTemplate" type="Spring.Data.AdoTemplate, Spring.Data">
      <property name="DbProvider" ref="DbProvider"/>
    </object>
  
!   <object id="adoTemplateForDebitDb" type="Spring.Data.AdoTemplate, Spring.Data">
      <property name="DbProvider" ref="DebitDbProvider"/>
    </object>
--- 34,47 ----
  
    <object id="transactionManager"
!           type="Spring.Data.Core.TxScopeTransactionManager, Spring.Data">
    </object>
  
  
    <!-- AdoTemplate for DAO Implementation -->
!   <object id="adoTemplate" type="Spring.Data.Core.AdoTemplate, Spring.Data">
      <property name="DbProvider" ref="DbProvider"/>
    </object>
  
!   <object id="adoTemplateForDebitDb" type="Spring.Data.Core.AdoTemplate, Spring.Data">
      <property name="DbProvider" ref="DebitDbProvider"/>
    </object>

Index: autoDeclarativeServices.xml
===================================================================
RCS file: /cvsroot/springnet/Spring.Net/test/Spring/Spring.Data.Integration.Tests/Data/autoDeclarativeServices.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** autoDeclarativeServices.xml	7 Aug 2007 19:50:44 -0000	1.5
--- autoDeclarativeServices.xml	17 Sep 2007 19:18:50 -0000	1.6
***************
*** 14,23 ****
  -->
      <object id="adoTransactionManager" 
!             type="Spring.Data.AdoPlatformTransactionManager, Spring.Data">
              
          <property name="DbProvider" ref="DbProvider"/>
      </object>
          
!     <object id="adoTemplate" type="Spring.Data.AdoTemplate, Spring.Data">
          <property name="DbProvider" ref="DbProvider"/>                
      </object>
--- 14,23 ----
  -->
      <object id="adoTransactionManager" 
!             type="Spring.Data.Core.AdoPlatformTransactionManager, Spring.Data">
              
          <property name="DbProvider" ref="DbProvider"/>
      </object>
          
!     <object id="adoTemplate" type="Spring.Data.Core.AdoTemplate, Spring.Data">
          <property name="DbProvider" ref="DbProvider"/>                
      </object>