Thread: [Springnet-commits] Spring.Net/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwin

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/springnet/Spring.Net/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv6966/Spring.Northwind.Web

Modified Files:
	Dao.xml Web.config 
Log Message:
SPRNET-919 - Update NHibernate example to use NHibernate 1.2.1

Index: Web.config
===================================================================
RCS file: /cvsroot/springnet/Spring.Net/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web/Web.config,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Web.config	6 Mar 2008 18:47:43 -0000	1.8
--- Web.config	4 Apr 2008 21:22:53 -0000	1.9
***************
*** 9,82 ****
  -->
  <configuration>
!   <configSections>
!     <sectionGroup name="common">
!       <section name="logging" type="Common.Logging.ConfigurationSectionHandler, Common.Logging"/>
!     </sectionGroup>
!     <sectionGroup name="spring">
!       <section name="context" type="Spring.Context.Support.WebContextHandler, Spring.Web"/>
!       <section name="parsers" type="Spring.Context.Support.NamespaceParsersSectionHandler, Spring.Core"/>
!     </sectionGroup>
!     <section name="databaseSettings" type="System.Configuration.NameValueSectionHandler"/>
!   </configSections>
!   <common>
!     <logging>
!       <factoryAdapter type="Common.Logging.Log4Net.Log4NetLoggerFactoryAdapter, Common.Logging.Log4Net129">
!         <!-- choices are INLINE, FILE, FILE-WATCH, EXTERNAL-->
!         <!-- otherwise BasicConfigurer.Configure is used   -->
!         <!-- log4net configuration file is specified with key configFile-->
!         <arg key="configType" value="FILE-WATCH"/>
!         <arg key="configFile" value="~/Log4Net.xml"/>
!       </factoryAdapter>
!     </logging>
!   </common>
!   <spring>
!     <parsers>
!       <parser type="Spring.Data.Config.DatabaseNamespaceParser, Spring.Data"/>
!     </parsers>
!     <context>
!       <resource uri="~/Aspects.xml"/>
!       <resource uri="~/Dao.xml"/>
!       <resource uri="~/Services.xml"/>
!       <resource uri="~/Web.xml"/>
!     </context>
!   </spring>
!   <!-- These properties are referenced in Dao.xml -->
!   <databaseSettings>
!     <add key="db.datasource" value="(local)\SQLEXPRESS; Integrated Security=true; AttachDbFilename=|DataDirectory|northwnd.mdf; User Instance=true;"/>
!     <add key="db.user" value="springqa"/>
!     <add key="db.password" value="springqa"/>
!     <add key="db.database" value="Northwind"/>
!   </databaseSettings>
!   <appSettings>
!     <add key="Spring.Data.NHibernate.Support.OpenSessionInViewModule.SessionFactoryObjectName" value="NHibernateSessionFactory"/>
!   </appSettings>
!   <connectionStrings/>
!   <system.web>
!     <httpModules>
!       <add name="Spring" type="Spring.Context.Support.WebSupportModule, Spring.Web"/>
!       <add name="OpenSessionInView" type="Spring.Data.NHibernate.Support.OpenSessionInViewModule, Spring.Data.NHibernate"/>
!     </httpModules>
!     <httpHandlers>
!       <add verb="*" path="*.aspx" type="Spring.Web.Support.PageHandlerFactory, Spring.Web"/>
!       <add verb="*" path="*.asmx" type="Spring.Web.Services.WebServiceHandlerFactory, Spring.Web"/>
!       <add verb="*" path="ContextMonitor.ashx" type="Spring.Web.Support.ContextMonitor, Spring.Web"/>
!     </httpHandlers>
!     <compilation debug="true">
!       <assemblies>
!         <add assembly="System.Transactions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>
!         <add assembly="System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>
!         <add assembly="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>
!         <add assembly="System.Xml, Version=2.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>
!         <add assembly="System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A"/>
!         <add assembly="System.Configuration, Version=2.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A"/>
!         <add assembly="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A"/>
!         <add assembly="System.EnterpriseServices, Version=2.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A"/>
!       </assemblies>
!     </compilation>
!     <pages>
!       <controls>
!         <add tagPrefix="spring" namespace="Spring.Web.UI.Controls" assembly="Spring.Web" />
!       </controls>
!     </pages>
!   </system.web>
  </configuration>
--- 9,82 ----
  -->
  <configuration>
! 	<configSections>
! 		<sectionGroup name="common">
! 			<section name="logging" type="Common.Logging.ConfigurationSectionHandler, Common.Logging"/>
! 		</sectionGroup>
! 		<sectionGroup name="spring">
! 			<section name="context" type="Spring.Context.Support.WebContextHandler, Spring.Web"/>
! 			<section name="parsers" type="Spring.Context.Support.NamespaceParsersSectionHandler, Spring.Core"/>
! 		</sectionGroup>
! 		<section name="databaseSettings" type="System.Configuration.NameValueSectionHandler"/>
! 	</configSections>
! 	<common>
! 		<logging>
! 			<factoryAdapter type="Common.Logging.Log4Net.Log4NetLoggerFactoryAdapter, Common.Logging.Log4Net">
! 				<!-- choices are INLINE, FILE, FILE-WATCH, EXTERNAL-->
! 				<!-- otherwise BasicConfigurer.Configure is used   -->
! 				<!-- log4net configuration file is specified with key configFile-->
! 				<arg key="configType" value="FILE-WATCH"/>
! 				<arg key="configFile" value="~/Log4Net.xml"/>
! 			</factoryAdapter>
! 		</logging>
! 	</common>
! 	<spring>
! 		<parsers>
! 			<parser type="Spring.Data.Config.DatabaseNamespaceParser, Spring.Data"/>
! 		</parsers>
! 		<context>
! 			<resource uri="~/Aspects.xml"/>
! 			<resource uri="~/Dao.xml"/>
! 			<resource uri="~/Services.xml"/>
! 			<resource uri="~/Web.xml"/>
! 		</context>
! 	</spring>
! 	<!-- These properties are referenced in Dao.xml -->
! 	<databaseSettings>
! 		<add key="db.datasource" value=".\SQLEXPRESS; Integrated Security=true; AttachDbFilename=|DataDirectory|northwnd.mdf; User Instance=true;"/>
! 		<add key="db.user" value="springqa"/>
! 		<add key="db.password" value="springqa"/>
! 		<add key="db.database" value="Northwind"/>
! 	</databaseSettings>
! 	<appSettings>
! 		<add key="Spring.Data.NHibernate.Support.OpenSessionInViewModule.SessionFactoryObjectName" value="NHibernateSessionFactory"/>
! 	</appSettings>
! 	<connectionStrings/>
! 	<system.web>
! 		<httpModules>
! 			<add name="Spring" type="Spring.Context.Support.WebSupportModule, Spring.Web"/>
! 			<add name="OpenSessionInView" type="Spring.Data.NHibernate.Support.OpenSessionInViewModule, Spring.Data.NHibernate12"/>
! 		</httpModules>
! 		<httpHandlers>
! 			<add verb="*" path="*.aspx" type="Spring.Web.Support.PageHandlerFactory, Spring.Web"/>
! 			<add verb="*" path="*.asmx" type="Spring.Web.Services.WebServiceHandlerFactory, Spring.Web"/>
! 			<add verb="*" path="ContextMonitor.ashx" type="Spring.Web.Support.ContextMonitor, Spring.Web"/>
! 		</httpHandlers>
! 		<compilation debug="true">
! 			<assemblies>
! 				<add assembly="System.Transactions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>
! 				<add assembly="System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>
! 				<add assembly="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>
! 				<add assembly="System.Xml, Version=2.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>
! 				<add assembly="System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A"/>
! 				<add assembly="System.Configuration, Version=2.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A"/>
! 				<add assembly="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A"/>
! 				<add assembly="System.EnterpriseServices, Version=2.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A"/>
! 				<add assembly="System.Data.OracleClient, Version=2.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/></assemblies>
! 		</compilation>
! 		<pages>
! 			<controls>
! 				<add tagPrefix="spring" namespace="Spring.Web.UI.Controls" assembly="Spring.Web"/>
! 			</controls>
! 		</pages>
! 	</system.web>
  </configuration>

Index: Dao.xml
===================================================================
RCS file: /cvsroot/springnet/Spring.Net/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web/Dao.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Dao.xml	6 Mar 2008 18:47:43 -0000	1.4
--- Dao.xml	4 Apr 2008 21:22:53 -0000	1.5
***************
*** 15,22 ****
    <!-- 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="NHibernateSessionFactory" type="Spring.Data.NHibernate.LocalSessionFactoryObject, Spring.Data.NHibernate">
      <property name="DbProvider" ref="DbProvider"/>
      <property name="MappingAssemblies">
--- 15,22 ----
    <!-- Database and NHibernate Configuration -->
    <db:provider id="DbProvider"
!                    provider="SqlServer-2.0"
!                    connectionString="Data Source=.\SQLExpress;Integrated Security=true;User Instance=true;AttachDBFilename=|DataDirectory|\Northwnd.mdf;Initial Catalog=Northwind;"/>
  
!   <object id="NHibernateSessionFactory" type="Spring.Data.NHibernate.LocalSessionFactoryObject, Spring.Data.NHibernate12">
      <property name="DbProvider" ref="DbProvider"/>
      <property name="MappingAssemblies">
***************
*** 44,48 ****
  
    <object id="HibernateTransactionManager"
!         type="Spring.Data.NHibernate.HibernateTransactionManager, Spring.Data.NHibernate">
  
      <property name="DbProvider" ref="DbProvider"/>
--- 44,48 ----
  
    <object id="HibernateTransactionManager"
!         type="Spring.Data.NHibernate.HibernateTransactionManager, Spring.Data.NHibernate12">
  
      <property name="DbProvider" ref="DbProvider"/>

Thread: [Springnet-commits] Spring.Net/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwin

springnet-commits