Update of /cvsroot/springnet/Spring.Net/examples/Spring/Spring.Data.NHibernate.Northwind/test/Spring.Northwind.IntegrationTests In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv6991 Modified Files: App.config Dao.xml Spring.Northwind.IntegrationTests.csproj Log Message: SPRNET-919 - Update NHibernate example to use NHibernate 1.2.1 Index: Spring.Northwind.IntegrationTests.csproj =================================================================== RCS file: /cvsroot/springnet/Spring.Net/examples/Spring/Spring.Data.NHibernate.Northwind/test/Spring.Northwind.IntegrationTests/Spring.Northwind.IntegrationTests.csproj,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Spring.Northwind.IntegrationTests.csproj 29 Sep 2007 17:31:55 -0000 1.6 --- Spring.Northwind.IntegrationTests.csproj 4 Apr 2008 21:23:00 -0000 1.7 *************** *** 33,39 **** <HintPath>..\..\..\..\..\lib\Net\2.0\antlr.runtime.dll</HintPath> </Reference> ! <Reference Include="Castle.DynamicProxy, Version=1.1.5.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc"> <SpecificVersion>False</SpecificVersion> ! <HintPath>..\..\..\..\..\lib\NHibernate10\net\2.0\Castle.DynamicProxy.dll</HintPath> </Reference> <Reference Include="Common.Logging, Version=1.1.0.0, Culture=neutral, PublicKeyToken=af08829b84f0328e"> --- 33,39 ---- <HintPath>..\..\..\..\..\lib\Net\2.0\antlr.runtime.dll</HintPath> </Reference> ! <Reference Include="Castle.DynamicProxy, Version=1.1.5.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL"> <SpecificVersion>False</SpecificVersion> ! <HintPath>..\..\..\..\..\lib\NHibernate12\net\2.0\Castle.DynamicProxy.dll</HintPath> </Reference> <Reference Include="Common.Logging, Version=1.1.0.0, Culture=neutral, PublicKeyToken=af08829b84f0328e"> *************** *** 41,59 **** <HintPath>..\..\..\..\..\lib\Net\2.0\Common.Logging.dll</HintPath> </Reference> ! <Reference Include="Common.Logging.Log4Net129, Version=1.0.2.1, Culture=neutral, PublicKeyToken=af08829b84f0328e"> <SpecificVersion>False</SpecificVersion> ! <HintPath>..\..\..\..\..\lib\Net\2.0\Common.Logging.Log4Net129.dll</HintPath> </Reference> ! <Reference Include="Iesi.Collections, Version=1.0.0.1, Culture=neutral, PublicKeyToken=154fdcb44c4484fc"> <SpecificVersion>False</SpecificVersion> ! <HintPath>..\..\..\..\..\lib\NHibernate10\net\2.0\Iesi.Collections.dll</HintPath> </Reference> ! <Reference Include="log4net, Version=1.2.9.0, Culture=neutral, PublicKeyToken=b32731d11ce58905"> <SpecificVersion>False</SpecificVersion> ! <HintPath>..\..\..\..\..\lib\NHibernate10\net\2.0\log4net.dll</HintPath> </Reference> ! <Reference Include="NHibernate, Version=1.0.4.0, Culture=neutral, PublicKeyToken=154fdcb44c4484fc"> <SpecificVersion>False</SpecificVersion> ! <HintPath>..\..\..\..\..\lib\NHibernate10\net\2.0\NHibernate.dll</HintPath> </Reference> <Reference Include="nunit.framework, Version=2.2.8.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL"> --- 41,59 ---- <HintPath>..\..\..\..\..\lib\Net\2.0\Common.Logging.dll</HintPath> </Reference> ! <Reference Include="Common.Logging.Log4Net, Version=1.2.0.2, Culture=neutral, PublicKeyToken=af08829b84f0328e, processorArchitecture=MSIL"> <SpecificVersion>False</SpecificVersion> ! <HintPath>..\..\..\..\..\bin\net\2.0\debug\Common.Logging.Log4Net.dll</HintPath> </Reference> ! <Reference Include="Iesi.Collections, Version=1.0.0.3, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL"> <SpecificVersion>False</SpecificVersion> ! <HintPath>..\..\..\..\..\lib\NHibernate12\net\2.0\Iesi.Collections.dll</HintPath> </Reference> ! <Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL"> <SpecificVersion>False</SpecificVersion> ! <HintPath>..\..\..\..\..\lib\NHibernate12\net\2.0\log4net.dll</HintPath> </Reference> ! <Reference Include="NHibernate, Version=1.2.1.4000, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL"> <SpecificVersion>False</SpecificVersion> ! <HintPath>..\..\..\..\..\lib\NHibernate12\net\2.0\NHibernate.dll</HintPath> </Reference> <Reference Include="nunit.framework, Version=2.2.8.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL"> Index: Dao.xml =================================================================== RCS file: /cvsroot/springnet/Spring.Net/examples/Spring/Spring.Data.NHibernate.Northwind/test/Spring.Northwind.IntegrationTests/Dao.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Dao.xml 14 Sep 2007 20:11:57 -0000 1.1 --- Dao.xml 4 Apr 2008 21:23:00 -0000 1.2 *************** *** 15,21 **** <!-- Database and NHibernate Configuration --> <db:provider id="DbProvider" ! provider="SqlServer-1.1" ! connectionString="Integrated Security=false; Data Source=${db.datasource};Database=${db.database};User ID=${db.user};Password=${db.password};"/> ! <!-- <object id="DbProvider" type="Spring.Data.Support.SqlProvider, Spring.Data"> --- 15,20 ---- <!-- Database and NHibernate Configuration --> <db:provider id="DbProvider" ! provider="SqlServer-2.0" ! connectionString="Data Source=.\SQLExpress;Integrated Security=true;User Instance=true;AttachDBFilename=L:\projects\Spring.Net\examples\Spring\Spring.Data.NHibernate.Northwind\src\Spring.Northwind.Web\App_Data\Northwnd.mdf;Initial Catalog=Northwind;"/> <!-- <object id="DbProvider" type="Spring.Data.Support.SqlProvider, Spring.Data"> *************** *** 25,29 **** --> ! <object id="SessionFactory" type="Spring.Data.NHibernate.LocalSessionFactoryObject, Spring.Data.NHibernate"> <property name="DbProvider" ref="DbProvider"/> <property name="MappingAssemblies"> --- 24,28 ---- --> ! <object id="SessionFactory" type="Spring.Data.NHibernate.LocalSessionFactoryObject, Spring.Data.NHibernate12"> <property name="DbProvider" ref="DbProvider"/> <property name="MappingAssemblies"> *************** *** 51,55 **** <object id="HibernateTransactionManager" ! type="Spring.Data.NHibernate.HibernateTransactionManager, Spring.Data.NHibernate"> <property name="DbProvider" ref="DbProvider"/> --- 50,54 ---- <object id="HibernateTransactionManager" ! type="Spring.Data.NHibernate.HibernateTransactionManager, Spring.Data.NHibernate12"> <property name="DbProvider" ref="DbProvider"/> Index: App.config =================================================================== RCS file: /cvsroot/springnet/Spring.Net/examples/Spring/Spring.Data.NHibernate.Northwind/test/Spring.Northwind.IntegrationTests/App.config,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** App.config 14 Sep 2007 20:11:56 -0000 1.1 --- App.config 4 Apr 2008 21:23:00 -0000 1.2 *************** *** 35,39 **** <common> <logging> ! <factoryAdapter type="Common.Logging.Log4Net.Log4NetLoggerFactoryAdapter, Common.Logging.Log4Net129"> <!-- choices are INLINE, FILE, FILE-WATCH, EXTERNAL--> <!-- otherwise BasicConfigurer.Configure is used --> --- 35,39 ---- <common> <logging> ! <factoryAdapter type="Common.Logging.Log4Net.Log4NetLoggerFactoryAdapter, Common.Logging.Log4Net"> <!-- choices are INLINE, FILE, FILE-WATCH, EXTERNAL--> <!-- otherwise BasicConfigurer.Configure is used --> |
