Update of /cvsroot/springnet/Spring.Net/test/Spring/Spring.Data.NHibernate.Integration.Tests/Data/NHibernate In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv6679/test/Spring/Spring.Data.NHibernate.Integration.Tests/Data/NHibernate Modified Files: TemplateTests.cs TestObject.cs TestObject.hbm.xml templateTests.xml Log Message: SPRNET-866 - Support .NET 1.1 for NHibernate 1.2 SPRNET-809 - Update to NHibernate 1.2.1 Index: TestObject.cs =================================================================== RCS file: /cvsroot/springnet/Spring.Net/test/Spring/Spring.Data.NHibernate.Integration.Tests/Data/NHibernate/TestObject.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** TestObject.cs 31 May 2007 20:25:14 -0000 1.1 --- TestObject.cs 4 Feb 2008 22:42:50 -0000 1.2 *************** *** 49,53 **** #region Properties ! public int Age { get { return age; } --- 49,53 ---- #region Properties ! public virtual int Age { get { return age; } *************** *** 55,59 **** } ! public string Name { get { return name; } --- 55,59 ---- } ! public virtual string Name { get { return name; } *************** *** 61,65 **** } ! public int ObjectNumber { get { return objectNumber; } --- 61,65 ---- } ! public virtual int ObjectNumber { get { return objectNumber; } Index: TemplateTests.cs =================================================================== RCS file: /cvsroot/springnet/Spring.Net/test/Spring/Spring.Data.NHibernate.Integration.Tests/Data/NHibernate/TemplateTests.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** TemplateTests.cs 31 May 2007 20:25:14 -0000 1.1 --- TemplateTests.cs 4 Feb 2008 22:42:50 -0000 1.2 *************** *** 29,33 **** --- 29,35 ---- using Spring.Context.Support; using Spring.Data.Common; + using Spring.Data.Config; using Spring.Data.Support; + using Spring.Objects.Factory.Xml; using Spring.Transaction; using Spring.Transaction.Support; *************** *** 77,80 **** --- 79,83 ---- public void SetUp() { + //NamespaceParserRegistry.RegisterParser(typeof(DatabaseNamespaceParser)); BasicConfigurator.Configure(); ctx = Index: templateTests.xml =================================================================== RCS file: /cvsroot/springnet/Spring.Net/test/Spring/Spring.Data.NHibernate.Integration.Tests/Data/NHibernate/templateTests.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** templateTests.xml 29 Jan 2008 20:27:41 -0000 1.4 --- templateTests.xml 4 Feb 2008 22:42:50 -0000 1.5 *************** *** 1,20 **** <?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-1.1" connectionString="Data Source=(local);Database=Spring;User ID=springqa;Password=springqa;Trusted_Connection=False"/> <db:provider id="DbProvider" provider="OracleODP-2.0" connectionString="Data Source=AGORA; User Id=agora_user; Password=welcome_bad"/> --> ! <db:provider id="DbProvider" provider="System.Data.SqlClient" connectionString="Data Source=MARKT60\SQL2005;Initial Catalog=Spring;User ID=springqa; Password=springqa"/> ! <object id="SessionFactory" type="Spring.Data.NHibernate.LocalSessionFactoryObject, Spring.Data.NHibernate"> <!-- TODO Provide dedicated NHibernate Schema --> <property name="DbProvider" ref="DbProvider"/> --- 1,25 ---- <?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-1.1" + connectionString="Data Source=MARKT60\SQL2005;Initial Catalog=Spring;User ID=springqa; Password=springqa"/> + <!-- connectionString="Data Source=(local);Database=Spring;User ID=springqa;Password=springqa;Trusted_Connection=False"/> + --> + <!-- <db:provider id="DbProvider" provider="OracleODP-2.0" connectionString="Data Source=AGORA; User Id=agora_user; Password=welcome_bad"/> --> ! <!-- <db:provider id="DbProvider" provider="System.Data.SqlClient" connectionString="Data Source=MARKT60\SQL2005;Initial Catalog=Spring;User ID=springqa; Password=springqa"/> + --> ! <object id="SessionFactory" type="Spring.Data.NHibernate.LocalSessionFactoryObject, Spring.Data.NHibernate12"> <!-- TODO Provide dedicated NHibernate Schema --> <property name="DbProvider" ref="DbProvider"/> *************** *** 63,67 **** <object id="hibernateTransactionManager" ! type="Spring.Data.NHibernate.HibernateTransactionManager, Spring.Data.NHibernate"> <property name="DbProvider" ref="DbProvider"/> --- 68,72 ---- <object id="hibernateTransactionManager" ! type="Spring.Data.NHibernate.HibernateTransactionManager, Spring.Data.NHibernate12"> <property name="DbProvider" ref="DbProvider"/> Index: TestObject.hbm.xml =================================================================== RCS file: /cvsroot/springnet/Spring.Net/test/Spring/Spring.Data.NHibernate.Integration.Tests/Data/NHibernate/TestObject.hbm.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** TestObject.hbm.xml 31 May 2007 20:25:14 -0000 1.1 --- TestObject.hbm.xml 4 Feb 2008 22:42:50 -0000 1.2 *************** *** 1,4 **** <?xml version="1.0" encoding="utf-8" ?> ! <hibernate-mapping xmlns="urn:nhibernate-mapping-2.0"> <class name="Spring.Data.NHibernate.TestObject, Spring.Data.NHibernate.Integration.Tests" table="TestObjects"> <id name="ObjectNumber" column="TestObjectNo" type="Int32"> --- 1,4 ---- <?xml version="1.0" encoding="utf-8" ?> ! <hibernate-mapping xmlns="urn:nhibernate-mapping-2.2"> <class name="Spring.Data.NHibernate.TestObject, Spring.Data.NHibernate.Integration.Tests" table="TestObjects"> <id name="ObjectNumber" column="TestObjectNo" type="Int32"> |
