diff --git a/Spring.build b/Spring.build
index 0ba84923..99abf91e 100644
--- a/Spring.build
+++ b/Spring.build
@@ -312,6 +312,7 @@
     <property name="nh.lib.dir" value="${spring.basedir}/lib/NHibernate10/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}"/>
     <property name="nh12.lib.dir" value="${spring.basedir}/lib/NHibernate12/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}"/>
     <property name="nh20.lib.dir" value="${spring.basedir}/lib/NHibernate20/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}"/>
+    <property name="nh21.lib.dir" value="${spring.basedir}/lib/NHibernate21/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}"/>
     <call target="copylibs"/>
 
     <!-- build assemblies -->
@@ -323,6 +324,7 @@
     <nant buildfile="src/Spring/Spring.Data.NHibernate/Spring.Data.NHibernate.build" target="build" if="${build-data and (nant.settings.currentframework == 'net-1.1' or nant.settings.currentframework == 'net-2.0' or nant.settings.currentframework == 'mono-2.0') and not net-3.0}"/>
     <nant buildfile="src/Spring/Spring.Data.NHibernate12/Spring.Data.NHibernate12.build" target="build" if="${build-data and (nant.settings.currentframework == 'net-1.1' or nant.settings.currentframework == 'net-2.0' or nant.settings.currentframework == 'mono-2.0') and not net-3.0}"/>
     <nant buildfile="src/Spring/Spring.Data.NHibernate20/Spring.Data.NHibernate20.build" target="build" if="${build-data and (nant.settings.currentframework == 'net-2.0' or nant.settings.currentframework == 'mono-2.0') and not net-3.0}"/>
+    <nant buildfile="src/Spring/Spring.Data.NHibernate21/Spring.Data.NHibernate21.build" target="build" if="${build-data and (nant.settings.currentframework == 'net-2.0' or nant.settings.currentframework == 'mono-2.0') and not net-3.0}"/>
     <nant buildfile="src/Spring/Spring.Services/Spring.Services.build" target="build" if="${build-services}"/>
     <nant buildfile="src/Spring/Spring.Testing.NUnit/Spring.Testing.NUnit.build" target="build" if="${build-testing and not net-3.0}"/>
     <nant buildfile="src/Spring/Spring.Messaging.Nms/Spring.Messaging.Nms.build" target="build" if="${build-nms and not net-3.0}"/>
@@ -345,6 +347,10 @@
                  if="${build-data and nant.settings.currentframework == 'net-2.0' and not net-3.0}"/>
     <nant buildfile="test/Spring/Spring.Data.NHibernate20.Integration.Tests/Spring.Data.NHibernate20.Integration.Tests.build" target="test" 
                  if="${build-data and nant.settings.currentframework == 'net-2.0' and not net-3.0}"/>
+    <nant buildfile="test/Spring/Spring.Data.NHibernate21.Tests/Spring.Data.NHibernate21.Tests.build" target="test"
+                 if="${build-data and nant.settings.currentframework == 'net-2.0' and not net-3.0}"/>
+    <nant buildfile="test/Spring/Spring.Data.NHibernate21.Integration.Tests/Spring.Data.NHibernate21.Integration.Tests.build" target="test"
+                 if="${build-data and nant.settings.currentframework == 'net-2.0' and not net-3.0}"/>
     <nant buildfile="test/Spring/Spring.Services.Tests/Spring.Services.Tests.build" target="test" if="${build-services}"/>
     <nant buildfile="test/Spring/Spring.Web.Tests/Spring.Web.Tests.build" target="test" if="${build-web and not net-3.0}"/>
     <nant buildfile="test/Spring/Spring.Testing.NUnit.Tests/Spring.Testing.NUnit.Tests.build" target="test" if="${not net-3.0}"/>
@@ -573,7 +579,9 @@
 	<delete dir="src/Spring/Spring.Data.NHibernate12/bin" failonerror="false"/>
 	<delete dir="src/Spring/Spring.Data.NHibernate20/obj" failonerror="false"/>
 	<delete dir="src/Spring/Spring.Data.NHibernate20/bin" failonerror="false"/>
-	<delete dir="src/Spring/Spring.Services/obj" failonerror="false"/>
+  <delete dir="src/Spring/Spring.Data.NHibernate21/obj" failonerror="false"/>
+  <delete dir="src/Spring/Spring.Data.NHibernate21/bin" failonerror="false"/>
+  <delete dir="src/Spring/Spring.Services/obj" failonerror="false"/>
 	<delete dir="src/Spring/Spring.Services/bin" failonerror="false"/>
 	<delete dir="src/Spring/Spring.Messaging.Nms/obj" failonerror="false"/>
 	<delete dir="src/Spring/Spring.Messaging.Nms/bin" failonerror="false"/>
@@ -604,7 +612,11 @@
 	<delete dir="test/Spring/Spring.Data.NHibernate20.Tests/bin" failonerror="false"/>
 	<delete dir="test/Spring/Spring.Data.NHibernate20.Integration.Tests/obj" failonerror="false"/>
 	<delete dir="test/Spring/Spring.Data.NHibernate20.Integration.Tests/bin" failonerror="false"/>
-	<delete dir="test/Spring/Spring.Services.Tests/obj" failonerror="false"/>
+  <delete dir="test/Spring/Spring.Data.NHibernate21.Tests/obj" failonerror="false"/>
+  <delete dir="test/Spring/Spring.Data.NHibernate21.Tests/bin" failonerror="false"/>
+  <delete dir="test/Spring/Spring.Data.NHibernate21.Integration.Tests/obj" failonerror="false"/>
+  <delete dir="test/Spring/Spring.Data.NHibernate21.Integration.Tests/bin" failonerror="false"/>
+  <delete dir="test/Spring/Spring.Services.Tests/obj" failonerror="false"/>
 	<delete dir="test/Spring/Spring.Services.Tests/bin" failonerror="false"/>
 	<delete dir="test/Spring/Spring.Messaging.Nms.Tests/obj" failonerror="false"/>
 	<delete dir="test/Spring/Spring.Messaging.Nms.Tests/bin" failonerror="false"/>
diff --git a/build-support/solutions/Spring.Net.NHibernate21.2005.sln b/build-support/solutions/Spring.Net.NHibernate21.2005.sln
new file mode 100644
index 00000000..cf44e7d2
--- /dev/null
+++ b/build-support/solutions/Spring.Net.NHibernate21.2005.sln
@@ -0,0 +1,167 @@
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual Studio 2005
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Core.2005", "..\..\src\Spring\Spring.Core\Spring.Core.2005.csproj", "{710961A3-0DF4-49E4-A26E-F5B9C044AC84}"
+	ProjectSection(WebsiteProperties) = preProject
+		Debug.AspNetCompiler.Debug = "True"
+		Release.AspNetCompiler.Debug = "False"
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Aop.2005", "..\..\src\Spring\Spring.Aop\Spring.Aop.2005.csproj", "{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}"
+	ProjectSection(WebsiteProperties) = preProject
+		Debug.AspNetCompiler.Debug = "True"
+		Release.AspNetCompiler.Debug = "False"
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{F04753EF-7A1B-4837-AB63-8C0821E8155D}"
+	ProjectSection(WebsiteProperties) = preProject
+		Debug.AspNetCompiler.Debug = "True"
+		Release.AspNetCompiler.Debug = "False"
+	EndProjectSection
+	ProjectSection(SolutionItems) = preProject
+		Spring.build = Spring.build
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Data.2005", "..\..\src\Spring\Spring.Data\Spring.Data.2005.csproj", "{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}"
+	ProjectSection(WebsiteProperties) = preProject
+		Debug.AspNetCompiler.Debug = "True"
+		Release.AspNetCompiler.Debug = "False"
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Data.NHibernate21.Integration.Tests.2005", "..\..\test\Spring\Spring.Data.NHibernate21.Integration.Tests\Spring.Data.NHibernate21.Integration.Tests.2005.csproj", "{4A07E150-ED90-407C-8CAD-4760444DDFD9}"
+	ProjectSection(WebsiteProperties) = preProject
+		Debug.AspNetCompiler.Debug = "True"
+		Release.AspNetCompiler.Debug = "False"
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Data.NHibernate21.Tests.2005", "..\..\test\Spring\Spring.Data.NHibernate21.Tests\Spring.Data.NHibernate21.Tests.2005.csproj", "{94E4E1B4-D424-4EB9-BF34-2EE8CC3D7048}"
+	ProjectSection(WebsiteProperties) = preProject
+		Debug.AspNetCompiler.Debug = "True"
+		Release.AspNetCompiler.Debug = "False"
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Data.NHibernate21.2005", "..\..\src\Spring\Spring.Data.NHibernate21\Spring.Data.NHibernate21.2005.csproj", "{71368632-B8B7-4A6A-8C65-8DA848120C82}"
+	ProjectSection(WebsiteProperties) = preProject
+		Debug.AspNetCompiler.Debug = "True"
+		Release.AspNetCompiler.Debug = "False"
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Data.Tests.2005", "..\..\test\Spring\Spring.Data.Tests\Spring.Data.Tests.2005.csproj", "{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}"
+	ProjectSection(WebsiteProperties) = preProject
+		Debug.AspNetCompiler.Debug = "True"
+		Release.AspNetCompiler.Debug = "False"
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Core.Tests.2005", "..\..\test\Spring\Spring.Core.Tests\Spring.Core.Tests.2005.csproj", "{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}"
+	ProjectSection(WebsiteProperties) = preProject
+		Debug.AspNetCompiler.Debug = "True"
+		Release.AspNetCompiler.Debug = "False"
+	EndProjectSection
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|.NET = Debug|.NET
+		Debug|Any CPU = Debug|Any CPU
+		Debug|Mixed Platforms = Debug|Mixed Platforms
+		Release|.NET = Release|.NET
+		Release|Any CPU = Release|Any CPU
+		Release|Mixed Platforms = Release|Mixed Platforms
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Debug|.NET.Build.0 = Debug|Any CPU
+		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Release|.NET.ActiveCfg = Release|Any CPU
+		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Release|.NET.Build.0 = Release|Any CPU
+		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Release|Any CPU.Build.0 = Release|Any CPU
+		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Debug|.NET.Build.0 = Debug|Any CPU
+		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Release|.NET.ActiveCfg = Release|Any CPU
+		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Release|.NET.Build.0 = Release|Any CPU
+		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Debug|.NET.Build.0 = Debug|Any CPU
+		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Release|.NET.ActiveCfg = Release|Any CPU
+		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Release|.NET.Build.0 = Release|Any CPU
+		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{4A07E150-ED90-407C-8CAD-4760444DDFD9}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{4A07E150-ED90-407C-8CAD-4760444DDFD9}.Debug|.NET.Build.0 = Debug|Any CPU
+		{4A07E150-ED90-407C-8CAD-4760444DDFD9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4A07E150-ED90-407C-8CAD-4760444DDFD9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4A07E150-ED90-407C-8CAD-4760444DDFD9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{4A07E150-ED90-407C-8CAD-4760444DDFD9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{4A07E150-ED90-407C-8CAD-4760444DDFD9}.Release|.NET.ActiveCfg = Release|Any CPU
+		{4A07E150-ED90-407C-8CAD-4760444DDFD9}.Release|.NET.Build.0 = Release|Any CPU
+		{4A07E150-ED90-407C-8CAD-4760444DDFD9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4A07E150-ED90-407C-8CAD-4760444DDFD9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4A07E150-ED90-407C-8CAD-4760444DDFD9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{4A07E150-ED90-407C-8CAD-4760444DDFD9}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{94E4E1B4-D424-4EB9-BF34-2EE8CC3D7048}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{94E4E1B4-D424-4EB9-BF34-2EE8CC3D7048}.Debug|.NET.Build.0 = Debug|Any CPU
+		{94E4E1B4-D424-4EB9-BF34-2EE8CC3D7048}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{94E4E1B4-D424-4EB9-BF34-2EE8CC3D7048}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{94E4E1B4-D424-4EB9-BF34-2EE8CC3D7048}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{94E4E1B4-D424-4EB9-BF34-2EE8CC3D7048}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{94E4E1B4-D424-4EB9-BF34-2EE8CC3D7048}.Release|.NET.ActiveCfg = Release|Any CPU
+		{94E4E1B4-D424-4EB9-BF34-2EE8CC3D7048}.Release|.NET.Build.0 = Release|Any CPU
+		{94E4E1B4-D424-4EB9-BF34-2EE8CC3D7048}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{94E4E1B4-D424-4EB9-BF34-2EE8CC3D7048}.Release|Any CPU.Build.0 = Release|Any CPU
+		{94E4E1B4-D424-4EB9-BF34-2EE8CC3D7048}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{94E4E1B4-D424-4EB9-BF34-2EE8CC3D7048}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{71368632-B8B7-4A6A-8C65-8DA848120C82}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{71368632-B8B7-4A6A-8C65-8DA848120C82}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{71368632-B8B7-4A6A-8C65-8DA848120C82}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{71368632-B8B7-4A6A-8C65-8DA848120C82}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{71368632-B8B7-4A6A-8C65-8DA848120C82}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{71368632-B8B7-4A6A-8C65-8DA848120C82}.Release|.NET.ActiveCfg = Release|Any CPU
+		{71368632-B8B7-4A6A-8C65-8DA848120C82}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{71368632-B8B7-4A6A-8C65-8DA848120C82}.Release|Any CPU.Build.0 = Release|Any CPU
+		{71368632-B8B7-4A6A-8C65-8DA848120C82}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{71368632-B8B7-4A6A-8C65-8DA848120C82}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}.Release|.NET.ActiveCfg = Release|Any CPU
+		{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Release|.NET.ActiveCfg = Release|Any CPU
+		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Release|Any CPU.Build.0 = Release|Any CPU
+		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		NAntAddinLastFileName = Spring.build
+	EndGlobalSection
+EndGlobal
diff --git a/build-support/solutions/Spring.Net.NHibernate21.2008.sln b/build-support/solutions/Spring.Net.NHibernate21.2008.sln
new file mode 100644
index 00000000..deed3a99
--- /dev/null
+++ b/build-support/solutions/Spring.Net.NHibernate21.2008.sln
@@ -0,0 +1,131 @@
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{F04753EF-7A1B-4837-AB63-8C0821E8155D}"
+	ProjectSection(SolutionItems) = preProject
+		Spring.build = Spring.build
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Core.2008", "..\..\src\Spring\Spring.Core\Spring.Core.2008.csproj", "{710961A3-0DF4-49E4-A26E-F5B9C044AC84}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Aop.2008", "..\..\src\Spring\Spring.Aop\Spring.Aop.2008.csproj", "{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Data.2008", "..\..\src\Spring\Spring.Data\Spring.Data.2008.csproj", "{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Data.NHibernate21.Integration.Tests.2008", "..\..\test\Spring\Spring.Data.NHibernate21.Integration.Tests\Spring.Data.NHibernate21.Integration.Tests.2008.csproj", "{4A07E150-ED90-407C-8CAD-4760444DDFD9}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Data.NHibernate21.Tests.2008", "..\..\test\Spring\Spring.Data.NHibernate21.Tests\Spring.Data.NHibernate21.Tests.2008.csproj", "{94E4E1B4-D424-4EB9-BF34-2EE8CC3D7048}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Data.NHibernate21.2008", "..\..\src\Spring\Spring.Data.NHibernate21\Spring.Data.NHibernate21.2008.csproj", "{71368632-B8B7-4A6A-8C65-8DA848120C82}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Data.Tests.2008", "..\..\test\Spring\Spring.Data.Tests\Spring.Data.Tests.2008.csproj", "{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Core.Tests.2008", "..\..\test\Spring\Spring.Core.Tests\Spring.Core.Tests.2008.csproj", "{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|.NET = Debug|.NET
+		Debug|Any CPU = Debug|Any CPU
+		Debug|Mixed Platforms = Debug|Mixed Platforms
+		Release|.NET = Release|.NET
+		Release|Any CPU = Release|Any CPU
+		Release|Mixed Platforms = Release|Mixed Platforms
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Debug|.NET.Build.0 = Debug|Any CPU
+		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Release|.NET.ActiveCfg = Release|Any CPU
+		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Release|.NET.Build.0 = Release|Any CPU
+		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Release|Any CPU.Build.0 = Release|Any CPU
+		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Debug|.NET.Build.0 = Debug|Any CPU
+		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Release|.NET.ActiveCfg = Release|Any CPU
+		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Release|.NET.Build.0 = Release|Any CPU
+		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Debug|.NET.Build.0 = Debug|Any CPU
+		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Release|.NET.ActiveCfg = Release|Any CPU
+		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Release|.NET.Build.0 = Release|Any CPU
+		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{4A07E150-ED90-407C-8CAD-4760444DDFD9}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{4A07E150-ED90-407C-8CAD-4760444DDFD9}.Debug|.NET.Build.0 = Debug|Any CPU
+		{4A07E150-ED90-407C-8CAD-4760444DDFD9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4A07E150-ED90-407C-8CAD-4760444DDFD9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4A07E150-ED90-407C-8CAD-4760444DDFD9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{4A07E150-ED90-407C-8CAD-4760444DDFD9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{4A07E150-ED90-407C-8CAD-4760444DDFD9}.Release|.NET.ActiveCfg = Release|Any CPU
+		{4A07E150-ED90-407C-8CAD-4760444DDFD9}.Release|.NET.Build.0 = Release|Any CPU
+		{4A07E150-ED90-407C-8CAD-4760444DDFD9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4A07E150-ED90-407C-8CAD-4760444DDFD9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4A07E150-ED90-407C-8CAD-4760444DDFD9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{4A07E150-ED90-407C-8CAD-4760444DDFD9}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{94E4E1B4-D424-4EB9-BF34-2EE8CC3D7048}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{94E4E1B4-D424-4EB9-BF34-2EE8CC3D7048}.Debug|.NET.Build.0 = Debug|Any CPU
+		{94E4E1B4-D424-4EB9-BF34-2EE8CC3D7048}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{94E4E1B4-D424-4EB9-BF34-2EE8CC3D7048}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{94E4E1B4-D424-4EB9-BF34-2EE8CC3D7048}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{94E4E1B4-D424-4EB9-BF34-2EE8CC3D7048}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{94E4E1B4-D424-4EB9-BF34-2EE8CC3D7048}.Release|.NET.ActiveCfg = Release|Any CPU
+		{94E4E1B4-D424-4EB9-BF34-2EE8CC3D7048}.Release|.NET.Build.0 = Release|Any CPU
+		{94E4E1B4-D424-4EB9-BF34-2EE8CC3D7048}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{94E4E1B4-D424-4EB9-BF34-2EE8CC3D7048}.Release|Any CPU.Build.0 = Release|Any CPU
+		{94E4E1B4-D424-4EB9-BF34-2EE8CC3D7048}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{94E4E1B4-D424-4EB9-BF34-2EE8CC3D7048}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{71368632-B8B7-4A6A-8C65-8DA848120C82}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{71368632-B8B7-4A6A-8C65-8DA848120C82}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{71368632-B8B7-4A6A-8C65-8DA848120C82}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{71368632-B8B7-4A6A-8C65-8DA848120C82}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{71368632-B8B7-4A6A-8C65-8DA848120C82}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{71368632-B8B7-4A6A-8C65-8DA848120C82}.Release|.NET.ActiveCfg = Release|Any CPU
+		{71368632-B8B7-4A6A-8C65-8DA848120C82}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{71368632-B8B7-4A6A-8C65-8DA848120C82}.Release|Any CPU.Build.0 = Release|Any CPU
+		{71368632-B8B7-4A6A-8C65-8DA848120C82}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{71368632-B8B7-4A6A-8C65-8DA848120C82}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}.Release|.NET.ActiveCfg = Release|Any CPU
+		{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Release|.NET.ActiveCfg = Release|Any CPU
+		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Release|Any CPU.Build.0 = Release|Any CPU
+		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		NAntAddinLastFileName = Spring.build
+	EndGlobalSection
+EndGlobal
diff --git a/lib/NHibernate21/net/2.0/Castle.Core.dll b/lib/NHibernate21/net/2.0/Castle.Core.dll
new file mode 100644
index 00000000..2464e661
Binary files /dev/null and b/lib/NHibernate21/net/2.0/Castle.Core.dll differ
diff --git a/lib/NHibernate21/net/2.0/Castle.DynamicProxy.license.txt b/lib/NHibernate21/net/2.0/Castle.DynamicProxy.license.txt
new file mode 100644
index 00000000..b7530910
--- /dev/null
+++ b/lib/NHibernate21/net/2.0/Castle.DynamicProxy.license.txt
@@ -0,0 +1,13 @@
+Copyright 2004-2005 Castle Project - http://www.castleproject.org/
+ 
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+ 
+     http://www.apache.org/licenses/LICENSE-2.0
+ 
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
diff --git a/lib/NHibernate21/net/2.0/Castle.DynamicProxy2.dll b/lib/NHibernate21/net/2.0/Castle.DynamicProxy2.dll
new file mode 100644
index 00000000..83e192e9
Binary files /dev/null and b/lib/NHibernate21/net/2.0/Castle.DynamicProxy2.dll differ
diff --git a/lib/NHibernate21/net/2.0/Iesi.Collections.dll b/lib/NHibernate21/net/2.0/Iesi.Collections.dll
new file mode 100644
index 00000000..0a745d44
Binary files /dev/null and b/lib/NHibernate21/net/2.0/Iesi.Collections.dll differ
diff --git a/lib/NHibernate21/net/2.0/Iesi.Collections.license.txt b/lib/NHibernate21/net/2.0/Iesi.Collections.license.txt
new file mode 100644
index 00000000..66c4a8dc
--- /dev/null
+++ b/lib/NHibernate21/net/2.0/Iesi.Collections.license.txt
@@ -0,0 +1,9 @@
+Copyright © 2002-2004 by Aidant Systems, Inc., and by Jason Smith.
+
+Copied from http://www.codeproject.com/csharp/sets.asp#xx703510xx that was posted by JasonSmith 12:13 2 Jan '04
+
+Feel free to use this code any way you want to. As a favor to me, you can leave the copyright in there. You never know when someone might recognize your name! 
+
+If you do use the code in a commercial product, I would appreciate hearing about it. This message serves as legal notice that I won't be suing you for royalties!  The code is in the public domain.
+
+On the other hand, I don't provide support. The code is actually simple enough that it shouldn't need it. 
diff --git a/lib/NHibernate21/net/2.0/LinFu.DynamicProxy.dll b/lib/NHibernate21/net/2.0/LinFu.DynamicProxy.dll
new file mode 100644
index 00000000..cbd6c78f
Binary files /dev/null and b/lib/NHibernate21/net/2.0/LinFu.DynamicProxy.dll differ
diff --git a/lib/NHibernate21/net/2.0/NHibernate.ByteCode.Castle.dll b/lib/NHibernate21/net/2.0/NHibernate.ByteCode.Castle.dll
new file mode 100644
index 00000000..139f2aff
Binary files /dev/null and b/lib/NHibernate21/net/2.0/NHibernate.ByteCode.Castle.dll differ
diff --git a/lib/NHibernate21/net/2.0/NHibernate.dll b/lib/NHibernate21/net/2.0/NHibernate.dll
new file mode 100644
index 00000000..2ec1ad27
Binary files /dev/null and b/lib/NHibernate21/net/2.0/NHibernate.dll differ
diff --git a/lib/NHibernate21/net/2.0/NHibernate.license.txt b/lib/NHibernate21/net/2.0/NHibernate.license.txt
new file mode 100644
index 00000000..8a88d148
--- /dev/null
+++ b/lib/NHibernate21/net/2.0/NHibernate.license.txt
@@ -0,0 +1,460 @@
+                  GNU LESSER GENERAL PUBLIC LICENSE
+                     Version 2.1, February 1999
+
+       Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+       59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+     Everyone is permitted to copy and distribute verbatim copies
+       of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+  When we speak of free software, we are referring to freedom of use,
+not price.  Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+  To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+  We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
+
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard.  To achieve this, non-free programs must be
+allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+                  GNU LESSER GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+  
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+  6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
+
+    c) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+                            NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
diff --git a/lib/NHibernate21/net/2.0/log4net.dll b/lib/NHibernate21/net/2.0/log4net.dll
new file mode 100644
index 00000000..ffc57e11
Binary files /dev/null and b/lib/NHibernate21/net/2.0/log4net.dll differ
diff --git a/lib/NHibernate21/net/2.0/log4net.license.txt b/lib/NHibernate21/net/2.0/log4net.license.txt
new file mode 100644
index 00000000..29f81d81
--- /dev/null
+++ b/lib/NHibernate21/net/2.0/log4net.license.txt
@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/src/Spring/Spring.Data.NHibernate/Data/NHibernate/LocalSessionFactoryObject.cs b/src/Spring/Spring.Data.NHibernate/Data/NHibernate/LocalSessionFactoryObject.cs
index 9ff73e32..e3e2152c 100644
--- a/src/Spring/Spring.Data.NHibernate/Data/NHibernate/LocalSessionFactoryObject.cs
+++ b/src/Spring/Spring.Data.NHibernate/Data/NHibernate/LocalSessionFactoryObject.cs
@@ -26,6 +26,10 @@ using Common.Logging;
 using NHibernate;
 using NHibernate.Cfg;
 using NHibernate.Connection;
+#if NH21
+using NHibernate.Engine;
+#endif
+
 using Spring.Core.IO;
 using Spring.Data.Common;
 using Spring.Objects.Factory;
@@ -345,8 +349,17 @@ namespace Spring.Data.NHibernate
         /// </remarks>
         protected virtual ISessionFactory NewSessionFactory(Configuration config) 
         {
-            ISessionFactory sf = config.BuildSessionFactory();
-            DbProviderWrapper dbProviderWrapper = sf.ConnectionProvider as DbProviderWrapper;
+            ISessionFactory sf = config.BuildSessionFactory();
+            DbProviderWrapper dbProviderWrapper = null;
+#if NH21
+            ISessionFactoryImplementor sfImplementor = sf as ISessionFactoryImplementor;
+            if (sfImplementor != null)
+            {
+                dbProviderWrapper = sfImplementor.ConnectionProvider as DbProviderWrapper;
+            }
+#else
+            dbProviderWrapper = sf.ConnectionProvider as DbProviderWrapper;
+#endif
             if (dbProviderWrapper != null)
             {
                 dbProviderWrapper.DbProvider = dbProvider;
diff --git a/src/Spring/Spring.Data.NHibernate20/Data/NHibernate/LocalSessionFactoryObject.cs b/src/Spring/Spring.Data.NHibernate20/Data/NHibernate/LocalSessionFactoryObject.cs
index 96ee7bce..c579b478 100644
--- a/src/Spring/Spring.Data.NHibernate20/Data/NHibernate/LocalSessionFactoryObject.cs
+++ b/src/Spring/Spring.Data.NHibernate20/Data/NHibernate/LocalSessionFactoryObject.cs
@@ -355,10 +355,13 @@ namespace Spring.Data.NHibernate
             if (ExposeTransactionAwareSessionFactory)
             {
                 // Set ICurrentSessionContext implementation,
-                // providng the Spring-managed ISession s current Session.
+                // providing the Spring-managed ISession s current Session.
                 // Can be overridden by a custom value for the corresponding Hibernate property
-                config.SetProperty(Environment.CurrentSessionContextClass,
-                                   "Spring.Data.NHibernate.SpringSessionContext, Spring.Data.NHibernate20");
+#if NH_2_1
+                config.SetProperty(Environment.CurrentSessionContextClass, "Spring.Data.NHibernate.SpringSessionContext, Spring.Data.NHibernate21");
+#else
+                config.SetProperty(Environment.CurrentSessionContextClass, "Spring.Data.NHibernate.SpringSessionContext, Spring.Data.NHibernate20");
+#endif
             }
 
             if (this.filterDefinitions != null)
@@ -418,6 +421,15 @@ namespace Spring.Data.NHibernate
                 }
             }
 
+#if NH_2_1
+            // Tell Hibernate to eagerly compile the mappings that we registered,
+            // for availability of the mapping information in further processing.
+            PostProcessMappings(config);
+            config.BuildMappings();
+#endif
+
+            // TODO: entityCacheStrategies and collectionCacheStrategies 
+
             if (this.eventListeners != null) 
             {
 				// Register specified NHibernate event listeners.
@@ -499,6 +511,22 @@ namespace Spring.Data.NHibernate
             return new Configuration();
         }
 
+#if NH_2_1
+        /// <summary>
+        /// To be implemented by subclasses that want to to register further mappings
+	    /// on the Configuration object after this FactoryObject registered its specified
+	    /// mappings.
+        /// </summary>
+        /// <remarks>
+	    /// Invoked <i>before</i> the <code>BuildMappings</code> call,
+	    /// so that it can still extend and modify the mapping information.
+        /// </remarks>
+        /// <param name="config">the current Configuration object</param>
+        protected virtual void PostProcessMappings(Configuration config)
+        {
+	    }
+#endif
+
         /// <summary>
         /// To be implemented by subclasses that want to to perform custom
         /// post-processing of the Configuration object after this FactoryObject
@@ -686,10 +714,16 @@ namespace Spring.Data.NHibernate
         protected virtual ISessionFactory NewSessionFactory(Configuration config)
         {
             ISessionFactory sf = config.BuildSessionFactory();
-            DbProviderWrapper dbProviderWrapper = sf.ConnectionProvider as DbProviderWrapper;
-            if (dbProviderWrapper != null)
+            ISessionFactoryImplementor sfImplementor =  sf as ISessionFactoryImplementor;
+            
+            if (sfImplementor != null)
             {
-                dbProviderWrapper.DbProvider = dbProvider;
+                DbProviderWrapper dbProviderWrapper = sfImplementor.ConnectionProvider as DbProviderWrapper;
+
+                if (dbProviderWrapper != null)
+                {
+                    dbProviderWrapper.DbProvider = dbProvider;
+                }
             }
             return sf;
         }
diff --git a/src/Spring/Spring.Data.NHibernate20/Spring.Data.NHibernate20.build b/src/Spring/Spring.Data.NHibernate20/Spring.Data.NHibernate20.build
index 48429170..d83be7b8 100644
--- a/src/Spring/Spring.Data.NHibernate20/Spring.Data.NHibernate20.build
+++ b/src/Spring/Spring.Data.NHibernate20/Spring.Data.NHibernate20.build
@@ -11,7 +11,7 @@
 		<echo message="${nh20.lib.dir}" />
 
 		<!-- build Spring.Data.NHibernate20 -->
-		<csc target="library" define="${current.build.defines.csc}"
+		<csc target="library" define="${current.build.defines.csc},NH_2_0"
                      warnaserror="true"
 		     debug="${current.build.debug}"
                      output="${current.bin.dir}/${project::get-name()}.dll"
diff --git a/src/Spring/Spring.Data.NHibernate21/AssemblyInfo.cs b/src/Spring/Spring.Data.NHibernate21/AssemblyInfo.cs
new file mode 100644
index 00000000..f144223f
--- /dev/null
+++ b/src/Spring/Spring.Data.NHibernate21/AssemblyInfo.cs
@@ -0,0 +1,5 @@
+using System;
+using System.Reflection;
+
+[assembly: AssemblyTitle("Spring.Net NHibernate 2.1 support")]
+[assembly: AssemblyDescription("Interfaces and classes that provide NHibernate 2.1 support in Spring.Net")]
\ No newline at end of file
diff --git a/src/Spring/Spring.Data.NHibernate21/Data/NHibernate/Generic/dontdelete.txt b/src/Spring/Spring.Data.NHibernate21/Data/NHibernate/Generic/dontdelete.txt
new file mode 100644
index 00000000..b4472e3f
--- /dev/null
+++ b/src/Spring/Spring.Data.NHibernate21/Data/NHibernate/Generic/dontdelete.txt
@@ -0,0 +1 @@
+sources are linked here from Spring.Data.NHibernate
\ No newline at end of file
diff --git a/src/Spring/Spring.Data.NHibernate21/Data/NHibernate/Support/dontdelete.txt b/src/Spring/Spring.Data.NHibernate21/Data/NHibernate/Support/dontdelete.txt
new file mode 100644
index 00000000..b4472e3f
--- /dev/null
+++ b/src/Spring/Spring.Data.NHibernate21/Data/NHibernate/Support/dontdelete.txt
@@ -0,0 +1 @@
+sources are linked here from Spring.Data.NHibernate
\ No newline at end of file
diff --git a/src/Spring/Spring.Data.NHibernate21/Spring.Data.NHibernate21.2005.csproj b/src/Spring/Spring.Data.NHibernate21/Spring.Data.NHibernate21.2005.csproj
new file mode 100644
index 00000000..747da37c
--- /dev/null
+++ b/src/Spring/Spring.Data.NHibernate21/Spring.Data.NHibernate21.2005.csproj
@@ -0,0 +1,171 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{71368632-B8B7-4A6A-8C65-8DA848120C82}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Spring</RootNamespace>
+    <AssemblyName>Spring.Data.NHibernate21</AssemblyName>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>..\..\..\build\VS.Net.2005\Spring.Data.NHibernate21\Debug\</OutputPath>
+    <DefineConstants>TRACE;DEBUG;NET_2_0,NH_2_0,NH_2_1</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <DocumentationFile>Spring.Data.NHibernate21.xml</DocumentationFile>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>..\..\..\build\VS.Net.2005\Spring.Data.NHibernate21\Release\</OutputPath>
+    <DefineConstants>TRACE;NET_2_0,NH_2_0,NH_2_1</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Common.Logging, Version=1.0.2.0, Culture=neutral, PublicKeyToken=af08829b84f0328e">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\Net\2.0\Common.Logging.dll</HintPath>
+    </Reference>
+    <Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\NHibernate21\net\2.0\log4net.dll</HintPath>
+    </Reference>
+    <Reference Include="NHibernate, Version=2.0.0.1001, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\NHibernate21\net\2.0\NHibernate.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Web" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\CommonAssemblyInfo.cs">
+      <Link>CommonAssemblyInfo.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate12\Data\NHibernate\Generic\FindHibernateDelegate.cs">
+      <Link>Data\NHibernate\Generic\FindHibernateDelegate.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate12\Data\NHibernate\Generic\HibernateDaoSupport.cs">
+      <Link>Data\NHibernate\Generic\HibernateDaoSupport.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate12\Data\NHibernate\Generic\HibernateDelegate.cs">
+      <Link>Data\NHibernate\Generic\HibernateDelegate.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate12\Data\NHibernate\Generic\HibernateTemplate.cs">
+      <Link>Data\NHibernate\Generic\HibernateTemplate.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate12\Data\NHibernate\Generic\IFindHibernateCallback.cs">
+      <Link>Data\NHibernate\Generic\IFindHibernateCallback.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate12\Data\NHibernate\Generic\IHibernateCallback.cs">
+      <Link>Data\NHibernate\Generic\IHibernateCallback.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate12\Data\NHibernate\Generic\IHibernateOperations.cs">
+      <Link>Data\NHibernate\Generic\IHibernateOperations.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate12\Data\NHibernate\HibernateAccessor.cs">
+      <Link>Data\NHibernate\HibernateAccessor.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate12\Data\NHibernate\SpringSessionContext.cs">
+      <Link>Data\NHibernate\SpringSessionContext.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate12\Data\NHibernate\SpringSessionSynchronization.cs">
+      <Link>Data\NHibernate\SpringSessionSynchronization.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\HibernateAdoException.cs">
+      <Link>Data\NHibernate\HibernateAdoException.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\HibernateDelegate.cs">
+      <Link>Data\NHibernate\HibernateDelegate.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\HibernateQueryException.cs">
+      <Link>Data\NHibernate\HibernateQueryException.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\HibernateSystemException.cs">
+      <Link>Data\NHibernate\HibernateSystemException.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\HibernateTemplate.cs">
+      <Link>Data\NHibernate\HibernateTemplate.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\HibernateTransactionManager.cs">
+      <Link>Data\NHibernate\HibernateTransactionManager.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\ICommonHibernateOperations.cs">
+      <Link>Data\NHibernate\ICommonHibernateOperations.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\IHibernateCallback.cs">
+      <Link>Data\NHibernate\IHibernateCallback.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\IHibernateOperations.cs">
+      <Link>Data\NHibernate\IHibernateOperations.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate12\Data\NHibernate\SessionFactoryUtils.cs">
+      <Link>Data\NHibernate\SessionFactoryUtils.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\SessionHolder.cs">
+      <Link>Data\NHibernate\SessionHolder.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\Support\ConfigSectionSessionScopeSettings.cs">
+      <Link>Data\NHibernate\Support\ConfigSectionSessionScopeSettings.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\Support\HibernateDaoSupport.cs">
+      <Link>Data\NHibernate\Support\HibernateDaoSupport.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\Support\OpenSessionInViewModule.cs">
+      <Link>Data\NHibernate\Support\OpenSessionInViewModule.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\Support\SessionScope.cs">
+      <Link>Data\NHibernate\Support\SessionScope.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\Support\SessionScopeSettings.cs">
+      <Link>Data\NHibernate\Support\SessionScopeSettings.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\TemplateFlushMode.cs">
+      <Link>Data\NHibernate\TemplateFlushMode.cs</Link>
+    </Compile>
+    <Compile Include="AssemblyInfo.cs" />
+    <Compile Include="..\Spring.Data.NHibernate20\Data\NHibernate\FilterDefiniitionFactoryObject.cs">
+		<Link>Data\NHibernate\FilterDefiniitionFactoryObject.cs</Link>
+	</Compile>
+    <Compile Include="..\Spring.Data.NHibernate20\Data\NHibernate\HibernateObjectRetrievalFailureException.cs">
+		<Link>Data\NHibernate\HibernateObjectRetrievalFailureException.cs</Link>
+	</Compile>
+    <Compile Include="..\Spring.Data.NHibernate20\Data\NHibernate\HibernateOptimisticLockingFailureException.cs">
+		<Link>Data\NHibernate\HibernateOptimisticLockingFailureException.cs</Link>
+	</Compile>
+    <Compile Include="..\Spring.Data.NHibernate20\Data\NHibernate\LocalSessionFactoryObject.cs">
+		<Link>Data\NHibernate\LocalSessionFactoryObject.cs</Link>
+	</Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Spring.Aop\Spring.Aop.2005.csproj">
+      <Project>{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}</Project>
+      <Name>Spring.Aop.2005</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Spring.Core\Spring.Core.2005.csproj">
+      <Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project>
+      <Name>Spring.Core.2005</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Spring.Data\Spring.Data.2005.csproj">
+      <Project>{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}</Project>
+      <Name>Spring.Data.2005</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
diff --git a/src/Spring/Spring.Data.NHibernate21/Spring.Data.NHibernate21.2008.csproj b/src/Spring/Spring.Data.NHibernate21/Spring.Data.NHibernate21.2008.csproj
new file mode 100644
index 00000000..4856465c
--- /dev/null
+++ b/src/Spring/Spring.Data.NHibernate21/Spring.Data.NHibernate21.2008.csproj
@@ -0,0 +1,172 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>9.0.30729</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{71368632-B8B7-4A6A-8C65-8DA848120C82}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Spring</RootNamespace>
+    <AssemblyName>Spring.Data.NHibernate21</AssemblyName>
+    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>..\..\..\build\VS.Net.2008\Spring.Data.NHibernate21\Debug\</OutputPath>
+    <DefineConstants>TRACE;DEBUG;NET_2_0,NH_2_1</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <DocumentationFile>Spring.Data.NHibernate21.xml</DocumentationFile>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>..\..\..\build\VS.Net.2008\Spring.Data.NHibernate21\Release\</OutputPath>
+    <DefineConstants>TRACE;NET_2_0,NH_2_1</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Common.Logging, Version=1.0.2.0, Culture=neutral, PublicKeyToken=af08829b84f0328e">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\Net\2.0\Common.Logging.dll</HintPath>
+    </Reference>
+    <Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\NHibernate21\net\2.0\log4net.dll</HintPath>
+    </Reference>
+    <Reference Include="NHibernate, Version=2.0.0.1001, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\NHibernate21\net\2.0\NHibernate.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Web" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\CommonAssemblyInfo.cs">
+      <Link>CommonAssemblyInfo.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate12\Data\NHibernate\Generic\FindHibernateDelegate.cs">
+      <Link>Data\NHibernate\Generic\FindHibernateDelegate.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate12\Data\NHibernate\Generic\HibernateDaoSupport.cs">
+      <Link>Data\NHibernate\Generic\HibernateDaoSupport.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate12\Data\NHibernate\Generic\HibernateDelegate.cs">
+      <Link>Data\NHibernate\Generic\HibernateDelegate.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate12\Data\NHibernate\Generic\HibernateTemplate.cs">
+      <Link>Data\NHibernate\Generic\HibernateTemplate.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate12\Data\NHibernate\Generic\IFindHibernateCallback.cs">
+      <Link>Data\NHibernate\Generic\IFindHibernateCallback.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate12\Data\NHibernate\Generic\IHibernateCallback.cs">
+      <Link>Data\NHibernate\Generic\IHibernateCallback.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate12\Data\NHibernate\Generic\IHibernateOperations.cs">
+      <Link>Data\NHibernate\Generic\IHibernateOperations.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate12\Data\NHibernate\HibernateAccessor.cs">
+      <Link>Data\NHibernate\HibernateAccessor.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate12\Data\NHibernate\SpringSessionContext.cs">
+      <Link>Data\NHibernate\SpringSessionContext.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate12\Data\NHibernate\SpringSessionSynchronization.cs">
+      <Link>Data\NHibernate\SpringSessionSynchronization.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\HibernateAdoException.cs">
+      <Link>Data\NHibernate\HibernateAdoException.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\HibernateDelegate.cs">
+      <Link>Data\NHibernate\HibernateDelegate.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\HibernateQueryException.cs">
+      <Link>Data\NHibernate\HibernateQueryException.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\HibernateSystemException.cs">
+      <Link>Data\NHibernate\HibernateSystemException.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\HibernateTemplate.cs">
+      <Link>Data\NHibernate\HibernateTemplate.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\HibernateTransactionManager.cs">
+      <Link>Data\NHibernate\HibernateTransactionManager.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\ICommonHibernateOperations.cs">
+      <Link>Data\NHibernate\ICommonHibernateOperations.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\IHibernateCallback.cs">
+      <Link>Data\NHibernate\IHibernateCallback.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\IHibernateOperations.cs">
+      <Link>Data\NHibernate\IHibernateOperations.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate12\Data\NHibernate\SessionFactoryUtils.cs">
+      <Link>Data\NHibernate\SessionFactoryUtils.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\SessionHolder.cs">
+      <Link>Data\NHibernate\SessionHolder.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\Support\ConfigSectionSessionScopeSettings.cs">
+      <Link>Data\NHibernate\Support\ConfigSectionSessionScopeSettings.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\Support\HibernateDaoSupport.cs">
+      <Link>Data\NHibernate\Support\HibernateDaoSupport.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\Support\OpenSessionInViewModule.cs">
+      <Link>Data\NHibernate\Support\OpenSessionInViewModule.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\Support\SessionScope.cs">
+      <Link>Data\NHibernate\Support\SessionScope.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\Support\SessionScopeSettings.cs">
+      <Link>Data\NHibernate\Support\SessionScopeSettings.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\TemplateFlushMode.cs">
+      <Link>Data\NHibernate\TemplateFlushMode.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate20\Data\NHibernate\FilterDefiniitionFactoryObject.cs">
+      <Link>Data\NHibernate\FilterDefiniitionFactoryObject.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate20\Data\NHibernate\HibernateObjectRetrievalFailureException.cs">
+      <Link>Data\NHibernate\HibernateObjectRetrievalFailureException.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate20\Data\NHibernate\HibernateOptimisticLockingFailureException.cs">
+      <Link>Data\NHibernate\HibernateOptimisticLockingFailureException.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate20\Data\NHibernate\LocalSessionFactoryObject.cs">
+      <Link>Data\NHibernate\LocalSessionFactoryObject.cs</Link>
+    </Compile>
+    <Compile Include="AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Spring.Aop\Spring.Aop.2008.csproj">
+      <Project>{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}</Project>
+      <Name>Spring.Aop.2008</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Spring.Core\Spring.Core.2008.csproj">
+      <Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project>
+      <Name>Spring.Core.2008</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Spring.Data\Spring.Data.2008.csproj">
+      <Project>{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}</Project>
+      <Name>Spring.Data.2008</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
diff --git a/src/Spring/Spring.Data.NHibernate21/Spring.Data.NHibernate21.build b/src/Spring/Spring.Data.NHibernate21/Spring.Data.NHibernate21.build
new file mode 100644
index 00000000..a9143804
--- /dev/null
+++ b/src/Spring/Spring.Data.NHibernate21/Spring.Data.NHibernate21.build
@@ -0,0 +1,57 @@
+<?xml version="1.0" ?>
+<project name="Spring.Data.NHibernate21" default="build" xmlns="http://nant.sf.net/schemas/nant.xsd">
+<!--
+    Required properties:
+      * current.bin.dir           - (path) root level to build to
+      * current.build.debug       - (true|false) debug build?
+      * current.build.defines.csc - framework-specific build defines for C# compiler
+ -->
+	<target name="build">
+
+		<echo message="${nh21.lib.dir}" />
+
+		<!-- build Spring.Data.NHibernate21 -->
+		<csc target="library" define="${current.build.defines.csc},NH_2_0,NH_2_1"
+                     warnaserror="true"
+		     debug="${current.build.debug}"
+                     output="${current.bin.dir}/${project::get-name()}.dll"
+                     doc="${current.bin.dir}/${project::get-name()}.xml">
+			<arg line="${compiler.args}"/>
+			<nowarn>
+				<warning number="${nowarn.numbers.test},0169" />
+				<warning number="0219" if="${nant.settings.currentframework=='mono-2.0'}"/>
+			</nowarn>
+			<sources failonempty="true">
+				<include name="**/*.cs" />
+				<include name="../Spring.Data.NHibernate/Data/**/*.cs" />
+				<include name="../Spring.Data.NHibernate/Support/**/*.cs" />
+				<include name="../Spring.Data.NHibernate12/Data/**/*.cs" />
+				<include name="../Spring.Data.NHibernate12/Support/**/*.cs" />
+				<include name="../Spring.Data.NHibernate20/Data/**/*.cs" />				
+				<exclude name="../Spring.Data.NHibernate/Data/**/HibernateAccessor.cs" />
+				<exclude name="../Spring.Data.NHibernate/Data/**/SpringSessionSynchronization.cs" />
+				<exclude name="../Spring.Data.NHibernate/Data/**/LocalSessionFactoryObject.cs" />
+				<exclude name="../Spring.Data.NHibernate/Data/**/HibernateAccessor.cs" />
+				<exclude name="../Spring.Data.NHibernate/Data/**/HibernateObjectRetrievalFailureException.cs" />
+				<exclude name="../Spring.Data.NHibernate/Data/**/HibernateOptimisticLockingFailureException.cs" />
+				<exclude name="../Spring.Data.NHibernate/Data/**/SessionFactoryUtils.cs" />	
+				<exclude name="../Spring.Data.NHibernate12/Data/**/HibernateOptimisticLockingFailureException.cs" />				
+				<exclude name="../Spring.Data.NHibernate12/Data/**/LocalSessionFactoryObject.cs" />
+				<include name="../GenCommonAssemblyInfo.cs" />
+			</sources>
+			<references basedir="${current.bin.dir}">
+				<include name="${nh21.lib.dir}/NHibernate.dll"/>
+				<include name="System.Data.dll" />
+				<include name="System.Web.dll" />
+				<include name="System.EnterpriseServices.dll" />
+				<include name="*NHibernate.dll" />
+				<include name="*.dll" />
+				<exclude name="${project::get-name()}.dll" />
+				<exclude name="Spring.Data.NHibernate.dll" />
+				<exclude name="Spring.Data.NHibernate12.dll" />
+				<exclude name="Spring.Data.NHibernate20.dll" />
+				<exclude name="CloverRuntime.dll" />
+			</references>
+		</csc>
+	</target>
+</project>
diff --git a/test/Spring/Spring.Data.NHibernate.Integration.Tests/Data/NHibernate/DbProviderTemplateTests.cs b/test/Spring/Spring.Data.NHibernate.Integration.Tests/Data/NHibernate/DbProviderTemplateTests.cs
index 4abce9e7..55859c56 100644
--- a/test/Spring/Spring.Data.NHibernate.Integration.Tests/Data/NHibernate/DbProviderTemplateTests.cs
+++ b/test/Spring/Spring.Data.NHibernate.Integration.Tests/Data/NHibernate/DbProviderTemplateTests.cs
@@ -44,7 +44,9 @@ namespace Spring.Data.NHibernate
         public void SetUp()
         {
             BasicConfigurator.Configure();
-#if NH_2_0
+#if NH_2_1
+            ctx = new XmlApplicationContext("assembly://Spring.Data.NHibernate21.Integration.Tests/Spring.Data.NHibernate/dbProviderTemplateTests.xml");
+#elif NH_2_0
             ctx = new XmlApplicationContext("assembly://Spring.Data.NHibernate20.Integration.Tests/Spring.Data.NHibernate/dbProviderTemplateTests.xml");
 #else
             ctx = new XmlApplicationContext("assembly://Spring.Data.NHibernate.Integration.Tests/Spring.Data.NHibernate/dbProviderTemplateTests.xml");
diff --git a/test/Spring/Spring.Data.NHibernate.Integration.Tests/Data/NHibernate/MultipleDbTests.cs b/test/Spring/Spring.Data.NHibernate.Integration.Tests/Data/NHibernate/MultipleDbTests.cs
index c1e5a7a8..0e441874 100644
--- a/test/Spring/Spring.Data.NHibernate.Integration.Tests/Data/NHibernate/MultipleDbTests.cs
+++ b/test/Spring/Spring.Data.NHibernate.Integration.Tests/Data/NHibernate/MultipleDbTests.cs
@@ -76,7 +76,9 @@ namespace Spring.Data.NHibernate
         public void SetUp()
         {
             BasicConfigurator.Configure();
-#if NH_2_0
+#if NH_2_1
+            ctx = new XmlApplicationContext("assembly://Spring.Data.NHibernate21.Integration.Tests/Spring.Data.NHibernate/MultipleDbTests.xml");
+#elif NH_2_0
             ctx = new XmlApplicationContext("assembly://Spring.Data.NHibernate20.Integration.Tests/Spring.Data.NHibernate/MultipleDbTests.xml");
 #else
             ctx = new XmlApplicationContext("assembly://Spring.Data.NHibernate.Integration.Tests/Spring.Data.NHibernate/MultipleDbTests.xml");
diff --git a/test/Spring/Spring.Data.NHibernate.Integration.Tests/Data/NHibernate/NHDAOTests.cs b/test/Spring/Spring.Data.NHibernate.Integration.Tests/Data/NHibernate/NHDAOTests.cs
index 26906757..21178165 100644
--- a/test/Spring/Spring.Data.NHibernate.Integration.Tests/Data/NHibernate/NHDAOTests.cs
+++ b/test/Spring/Spring.Data.NHibernate.Integration.Tests/Data/NHibernate/NHDAOTests.cs
@@ -65,7 +65,9 @@ namespace Spring.Data.NHibernate
         {
             BasicConfigurator.Configure();
             
-#if NH_2_0
+#if NH_2_1
+            ctx = new XmlApplicationContext("assembly://Spring.Data.NHibernate21.Integration.Tests/Spring.Data.NHibernate/NHDAOTests.xml");
+#elif NH_2_0
             ctx = new XmlApplicationContext("assembly://Spring.Data.NHibernate20.Integration.Tests/Spring.Data.NHibernate/NHDAOTests.xml");
 #else
             ctx = new XmlApplicationContext("assembly://Spring.Data.NHibernate.Integration.Tests/Spring.Data.NHibernate/NHDAOTests.xml");
diff --git a/test/Spring/Spring.Data.NHibernate.Integration.Tests/Data/NHibernate/NativeNHTests.cs b/test/Spring/Spring.Data.NHibernate.Integration.Tests/Data/NHibernate/NativeNHTests.cs
index 0ec58f2a..961b40b5 100644
--- a/test/Spring/Spring.Data.NHibernate.Integration.Tests/Data/NHibernate/NativeNHTests.cs
+++ b/test/Spring/Spring.Data.NHibernate.Integration.Tests/Data/NHibernate/NativeNHTests.cs
@@ -55,7 +55,9 @@ namespace Spring.Data.NHibernate
 	    public void CreateNative()
 	    {
             IApplicationContext ctx;
-#if NH_2_0
+#if NH_2_1
+            ctx = new XmlApplicationContext("assembly://Spring.Data.NHibernate21.Integration.Tests/Spring.Data.NHibernate/templateTests.xml");
+#elif NH_2_0
             ctx = new XmlApplicationContext("assembly://Spring.Data.NHibernate20.Integration.Tests/Spring.Data.NHibernate/templateTests.xml");
 #else
             ctx = new XmlApplicationContext("assembly://Spring.Data.NHibernate.Integration.Tests/Spring.Data.NHibernate/templateTests.xml");
diff --git a/test/Spring/Spring.Data.NHibernate.Integration.Tests/Data/NHibernate/TemplateTests.cs b/test/Spring/Spring.Data.NHibernate.Integration.Tests/Data/NHibernate/TemplateTests.cs
index bc8a6432..778fcc7f 100644
--- a/test/Spring/Spring.Data.NHibernate.Integration.Tests/Data/NHibernate/TemplateTests.cs
+++ b/test/Spring/Spring.Data.NHibernate.Integration.Tests/Data/NHibernate/TemplateTests.cs
@@ -77,7 +77,9 @@ namespace Spring.Data.NHibernate
         {
             //NamespaceParserRegistry.RegisterParser(typeof(DatabaseNamespaceParser));
             BasicConfigurator.Configure();
-#if NH_2_0
+#if NH_2_1
+            ctx = new XmlApplicationContext("assembly://Spring.Data.NHibernate21.Integration.Tests/Spring.Data.NHibernate/templateTests.xml");
+#elif NH_2_0
             ctx = new XmlApplicationContext("assembly://Spring.Data.NHibernate20.Integration.Tests/Spring.Data.NHibernate/templateTests.xml");
 #else
             ctx = new XmlApplicationContext("assembly://Spring.Data.NHibernate.Integration.Tests/Spring.Data.NHibernate/templateTests.xml");
diff --git a/test/Spring/Spring.Data.NHibernate.Integration.Tests/Spring.Data.NHibernate.Integration.Tests.build b/test/Spring/Spring.Data.NHibernate.Integration.Tests/Spring.Data.NHibernate.Integration.Tests.build
index 17acd740..1b433b87 100644
--- a/test/Spring/Spring.Data.NHibernate.Integration.Tests/Spring.Data.NHibernate.Integration.Tests.build
+++ b/test/Spring/Spring.Data.NHibernate.Integration.Tests/Spring.Data.NHibernate.Integration.Tests.build
@@ -34,6 +34,7 @@
 				<exclude name="Spring.Data.NHibernate.Tests.dll" />
 				<exclude name="Spring.Data.NHibernate12.dll" />
 				<exclude name="Spring.Data.NHibernate20.dll" />
+				<exclude name="Spring.Data.NHibernate21.dll" />
 				<exclude name="CloverRuntime.dll" />
 			</references>
 			<resources prefix="Spring" dynamicprefix="true" failonempty="true">
diff --git a/test/Spring/Spring.Data.NHibernate.Tests/Data/NHibernate/Config/AopConfiguration.cs b/test/Spring/Spring.Data.NHibernate.Tests/Data/NHibernate/Config/AopConfiguration.cs
index fb538aff..ae3fb49d 100644
--- a/test/Spring/Spring.Data.NHibernate.Tests/Data/NHibernate/Config/AopConfiguration.cs
+++ b/test/Spring/Spring.Data.NHibernate.Tests/Data/NHibernate/Config/AopConfiguration.cs
@@ -42,7 +42,9 @@ namespace Spring.Data.NHibernate.Config
         [SetUp]
         public void Setup()
         {
-#if NH_2_0
+#if NH_2_1
+            ctx = new XmlApplicationContext("assembly://Spring.Data.NHibernate21.Tests/Spring.Data.NHibernate.Config/AopConfiguration.xml");
+#elif NH_2_0
             ctx = new XmlApplicationContext("assembly://Spring.Data.NHibernate20.Tests/Spring.Data.NHibernate.Config/AopConfiguration.xml");
 #else
             ctx = new XmlApplicationContext("assembly://Spring.Data.NHibernate.Tests/Spring.Data.NHibernate.Config/AopConfiguration.xml");
diff --git a/test/Spring/Spring.Data.NHibernate.Tests/Data/NHibernate/LocalSessionFactoryObjectTests.cs b/test/Spring/Spring.Data.NHibernate.Tests/Data/NHibernate/LocalSessionFactoryObjectTests.cs
index 51b8b78a..e470a3ac 100644
--- a/test/Spring/Spring.Data.NHibernate.Tests/Data/NHibernate/LocalSessionFactoryObjectTests.cs
+++ b/test/Spring/Spring.Data.NHibernate.Tests/Data/NHibernate/LocalSessionFactoryObjectTests.cs
@@ -50,6 +50,9 @@ namespace Spring.Data.NHibernate
             properties.Add(Environment.Dialect, "NHibernate.Dialect.MsSql2000Dialect");
             properties.Add(Environment.ConnectionDriver, "NHibernate.Driver.SqlClientDriver");
             properties.Add(Environment.ConnectionProvider, "NHibernate.Connection.DriverConnectionProvider");
+#if NH_2_1
+            properties.Add(Environment.ProxyFactoryFactoryClass, "NHibernate.ByteCode.Castle.ProxyFactoryFactory, NHibernate.ByteCode.Castle");
+#endif
             sfo.HibernateProperties = properties;
             sfo.AfterPropertiesSet();
 
@@ -58,6 +61,10 @@ namespace Spring.Data.NHibernate
                             "NHibernate.Connection.DriverConnectionProvider");
             Assert.AreEqual(sfo.Configuration.Properties[Environment.Dialect],
                             "NHibernate.Dialect.MsSql2000Dialect");
+
+#if NH_2_1
+            Assert.AreEqual(sfo.Configuration.Properties[Environment.ProxyFactoryFactoryClass], "NHibernate.ByteCode.Castle.ProxyFactoryFactory, NHibernate.ByteCode.Castle");
+#endif
         }
 
         [Test]
diff --git a/test/Spring/Spring.Data.NHibernate.Tests/Spring.Data.NHibernate.Tests.build b/test/Spring/Spring.Data.NHibernate.Tests/Spring.Data.NHibernate.Tests.build
index 0a2bbc76..66657f26 100644
--- a/test/Spring/Spring.Data.NHibernate.Tests/Spring.Data.NHibernate.Tests.build
+++ b/test/Spring/Spring.Data.NHibernate.Tests/Spring.Data.NHibernate.Tests.build
@@ -30,6 +30,7 @@
 				<exclude name="${project::get-name()}.dll" />
 				<exclude name="Spring.Data.NHibernate12.dll" />
 				<exclude name="Spring.Data.NHibernate20.dll" />
+				<exclude name="Spring.Data.NHibernate21.dll" />
 				<exclude name="CloverRuntime.dll" />
 			</references>
 			<resources prefix="Spring" dynamicprefix="true" failonempty="true">
diff --git a/test/Spring/Spring.Data.NHibernate20.Integration.Tests/Spring.Data.NHibernate20.Integration.Tests.build b/test/Spring/Spring.Data.NHibernate20.Integration.Tests/Spring.Data.NHibernate20.Integration.Tests.build
index cbbc87e9..4993c1d5 100644
--- a/test/Spring/Spring.Data.NHibernate20.Integration.Tests/Spring.Data.NHibernate20.Integration.Tests.build
+++ b/test/Spring/Spring.Data.NHibernate20.Integration.Tests/Spring.Data.NHibernate20.Integration.Tests.build
@@ -34,6 +34,7 @@
 				<exclude name="Spring.Data.NHibernate.Tests.dll" />
 				<exclude name="Spring.Data.NHibernate.dll" />
 				<exclude name="Spring.Data.NHibernate12.dll" />
+				<exclude name="Spring.Data.NHibernate21.dll" />
 				<exclude name="CloverRuntime.dll" />
 			</references>
 			<resources prefix="Spring" dynamicprefix="true" failonempty="true">
diff --git a/test/Spring/Spring.Data.NHibernate20.Tests/Data/NHibernate/Config/AopConfigurationTxPointcut.xml b/test/Spring/Spring.Data.NHibernate20.Tests/Data/NHibernate/Config/AopConfigurationTxPointcut.xml
index 2e6cdae6..93b976de 100644
--- a/test/Spring/Spring.Data.NHibernate20.Tests/Data/NHibernate/Config/AopConfigurationTxPointcut.xml
+++ b/test/Spring/Spring.Data.NHibernate20.Tests/Data/NHibernate/Config/AopConfigurationTxPointcut.xml
@@ -13,11 +13,11 @@
 
 
 
-  <object id="SessionFactory" type="Spring.Data.NHibernate.LocalSessionFactoryObject, Spring.Data.NHibernate">
+  <object id="SessionFactory" type="Spring.Data.NHibernate.LocalSessionFactoryObject, Spring.Data.NHibernate20">
     <property name="DbProvider" ref="DbProvider"/>
     <property name="MappingResources">
       <list>
-        <value>assembly://Spring.Data.NHibernate.Tests/Spring.Data.NHibernate/TestObject.hbm.xml</value>
+        <value>assembly://Spring.Data.NHibernate20.Tests/Spring.Data.NHibernate/TestObject.hbm.xml</value>
       </list>
     </property>
     <property name="HibernateProperties">
@@ -34,11 +34,11 @@
   </object>
 
 
-  <object id="TestObjectDao" type="Spring.Data.NHibernate.TestObjectDao, Spring.Data.NHibernate.Tests">
+  <object id="TestObjectDao" type="Spring.Data.NHibernate.TestObjectDao, Spring.Data.NHibernate20.Tests">
     <property name="SessionFactory" ref="SessionFactory"/>
   </object>
 
-  <object id="transactionManager" type="Spring.Data.NHibernate.HibernateTransactionManager, Spring.Data.NHibernate">
+  <object id="transactionManager" type="Spring.Data.NHibernate.HibernateTransactionManager, Spring.Data.NHibernate20">
 
     <property name="DbProvider" ref="DbProvider"/>
     <property name="sessionFactory" ref="SessionFactory"/>
@@ -46,11 +46,11 @@
   </object>
 
 
-  <object name="SimpleService" type="Spring.Data.NHibernate.SimpleService, Spring.Data.NHibernate.Tests">
+  <object name="SimpleService" type="Spring.Data.NHibernate.SimpleService, Spring.Data.NHibernate20.Tests">
     <property name="TestObjectDao" ref="TestObjectDao"/>
   </object>
 
-  <object name="hibernateTemplate" type="Spring.Data.NHibernate.HibernateTemplate, Spring.Data.NHibernate">
+  <object name="hibernateTemplate" type="Spring.Data.NHibernate.HibernateTemplate, Spring.Data.NHibernate20">
     <property name="sessionFactory" ref="SessionFactory"/>
   </object>
   
diff --git a/test/Spring/Spring.Data.NHibernate20.Tests/Spring.Data.NHibernate20.Tests.build b/test/Spring/Spring.Data.NHibernate20.Tests/Spring.Data.NHibernate20.Tests.build
index 9a33a260..1e0c3d0f 100644
--- a/test/Spring/Spring.Data.NHibernate20.Tests/Spring.Data.NHibernate20.Tests.build
+++ b/test/Spring/Spring.Data.NHibernate20.Tests/Spring.Data.NHibernate20.Tests.build
@@ -30,6 +30,7 @@
 				<exclude name="${project::get-name()}.dll" />
 				<exclude name="Spring.Data.NHibernate.dll" />
 				<exclude name="Spring.Data.NHibernate12.dll" />
+				<exclude name="Spring.Data.NHibernate21.dll" />
 				<exclude name="CloverRuntime.dll" />
 			</references>
 			<resources prefix="Spring" dynamicprefix="true" failonempty="true">
diff --git a/test/Spring/Spring.Data.NHibernate21.Integration.Tests/AssemblyInfo.cs b/test/Spring/Spring.Data.NHibernate21.Integration.Tests/AssemblyInfo.cs
new file mode 100644
index 00000000..287e6ef5
--- /dev/null
+++ b/test/Spring/Spring.Data.NHibernate21.Integration.Tests/AssemblyInfo.cs
@@ -0,0 +1,5 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+
+[assembly: AssemblyTitle("Spring.Data.NHibernate21 Integration Tests")]
+[assembly: AssemblyDescription("Integration tests for Spring.Data.NHibernate21 assembly")]
diff --git a/test/Spring/Spring.Data.NHibernate21.Integration.Tests/Data/NHibernate/Credit.hbm.xml b/test/Spring/Spring.Data.NHibernate21.Integration.Tests/Data/NHibernate/Credit.hbm.xml
new file mode 100644
index 00000000..65884199
--- /dev/null
+++ b/test/Spring/Spring.Data.NHibernate21.Integration.Tests/Data/NHibernate/Credit.hbm.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" ?> 
+<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2">
+    <class name="Spring.Data.NHibernate.Credit, Spring.Data.NHibernate21.Integration.Tests" 
+           table="Credits" lazy="false">
+        <id name="CreditID" column="CreditID" type="Int32"> 
+            <generator class="identity" /> 
+        </id> 
+        <property name="Amount" column="CreditAmount"/> 
+    </class>
+</hibernate-mapping>
diff --git a/test/Spring/Spring.Data.NHibernate21.Integration.Tests/Data/NHibernate/Debit.hbm.xml b/test/Spring/Spring.Data.NHibernate21.Integration.Tests/Data/NHibernate/Debit.hbm.xml
new file mode 100644
index 00000000..bdd7c2be
--- /dev/null
+++ b/test/Spring/Spring.Data.NHibernate21.Integration.Tests/Data/NHibernate/Debit.hbm.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" ?> 
+<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2">
+    <class name="Spring.Data.NHibernate.Debit, Spring.Data.NHibernate21.Integration.Tests" 
+           table="Debits" lazy="false">
+        <id name="DebitID" column="DebitID" type="Int32"> 
+            <generator class="identity" /> 
+        </id> 
+        <property name="Amount" column="DebitAmount"/> 
+    </class>
+</hibernate-mapping>
diff --git a/test/Spring/Spring.Data.NHibernate21.Integration.Tests/Data/NHibernate/MultipleDbTests.xml b/test/Spring/Spring.Data.NHibernate21.Integration.Tests/Data/NHibernate/MultipleDbTests.xml
new file mode 100644
index 00000000..b3ddd4cf
--- /dev/null
+++ b/test/Spring/Spring.Data.NHibernate21.Integration.Tests/Data/NHibernate/MultipleDbTests.xml
@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<objects xmlns='http://www.springframework.net'
+         xmlns:db="http://www.springframework.net/database">
+
+  <db:provider id="DbProvider1" 
+                 provider="SqlServer-1.1" 
+                 connectionString="Data Source=(local);Database=Spring;User ID=springqa;Password=springqa;Trusted_Connection=False"/>
+
+  <db:provider id="DbProvider2" 
+                 provider="SqlServer-1.1" 
+                 connectionString="Data Source=(local);Database=Spring;User ID=springqa;Password=springqa;Trusted_Connection=False"/>
+
+  <object id="SessionFactory1" type="Spring.Data.NHibernate.LocalSessionFactoryObject, Spring.Data.NHibernate21">
+
+    <property name="DbProvider" ref="DbProvider1"/>
+    <property name="MappingAssemblies">
+      <list>
+        <value>Spring.Data.NHibernate21.Integration.Tests</value>
+      </list>
+    </property>
+    <property name="HibernateProperties">
+      <dictionary>
+
+        <entry key="connection.provider"
+               value="NHibernate.Connection.DriverConnectionProvider"/>
+
+        <entry key="dialect"
+               value="NHibernate.Dialect.MsSql2000Dialect"/>
+
+        <entry key="connection.driver_class"
+               value="NHibernate.Driver.SqlClientDriver"/>
+
+          <entry key="proxyfactory.factory_class"
+               value="NHibernate.ByteCode.Castle.ProxyFactoryFactory, NHibernate.ByteCode.Castle"/>
+      </dictionary>
+    </property>
+
+  </object>
+
+  <object id="SessionFactory2" type="Spring.Data.NHibernate.LocalSessionFactoryObject, Spring.Data.NHibernate21">
+
+    <property name="DbProvider" ref="DbProvider2"/>
+    <property name="MappingAssemblies">
+      <list>
+        <value>Spring.Data.NHibernate21.Integration.Tests</value>
+      </list>
+    </property>
+    <property name="HibernateProperties">
+      <dictionary>
+
+        <entry key="connection.provider"
+               value="NHibernate.Connection.DriverConnectionProvider"/>
+
+        <entry key="dialect"
+               value="NHibernate.Dialect.MsSql2000Dialect"/>
+
+        <entry key="connection.driver_class"
+               value="NHibernate.Driver.SqlClientDriver"/>
+        
+        <entry key="proxyfactory.factory_class"
+               value="NHibernate.ByteCode.Castle.ProxyFactoryFactory, NHibernate.ByteCode.Castle"/>
+
+      </dictionary>
+    </property>
+
+  </object>
+
+
+  <object id="transactionManager"
+          type="Spring.Data.Core.TxScopeTransactionManager, Spring.Data">
+  </object>
+
+  <object id="AccountCreditDao" type="Spring.Data.NHibernate.AccountCreditDao, Spring.Data.NHibernate21.Integration.Tests">
+    <property name="SessionFactory" ref="SessionFactory1"/>
+  </object>
+  <object id="AccountDebitDao" type="Spring.Data.NHibernate.AccountDebitDao, Spring.Data.NHibernate21.Integration.Tests">
+    <property name="SessionFactory" ref="SessionFactory2"/>
+  </object>
+
+  
+  <!-- The DAO object that performs multiple data access operations -->
+  <object id="accountManagerTarget" 
+          type="Spring.Data.NHibernate.AccountManager, Spring.Data.NHibernate21.Integration.Tests">
+    <property name="AccountCreditDao" ref="AccountCreditDao"/>
+    <property name="AccountDebitDao" ref="AccountDebitDao"/>
+
+    <!--
+      <property name="AuditDao" ref="AuditDao"/>
+      -->
+
+
+    <!--
+      <property name="ThrowException" value="true"/>
+      -->
+
+    <!--
+      <property name="ThrowExceptionAtEnd" value="true"/>
+      -->
+
+  </object>
+
+
+  <!-- construct the transaction proxy based on [Transaction()] in DAO class -->
+  <!-- todo condense this xml for attribute usage for ease of use -->
+  <!--
+    <aop:transaction name=testObjectDao"
+                     target="NHTestObjectDao"
+                     interfaces="Spring.NHibernate.ITestObjectDao"
+                     transactionManager="hibernateTransactionManager"/>
+    -->
+
+  <!-- Transactional Proxy for TestObjectManager using the ProxyFactoryObject -->
+  <object id="accountManager" 
+          type="Spring.Aop.Framework.ProxyFactoryObject, Spring.Aop">
+
+    <property name="Target" ref="accountManagerTarget"/>
+
+    <property name="InterceptorNames">
+      <value>transactionInterceptor</value>
+    </property>
+
+  </object>
+
+  <!-- Transaction Interceptor based on attribute [Transaction()] -->
+  <object id="transactionInterceptor" 
+          type="Spring.Transaction.Interceptor.TransactionInterceptor, Spring.Data">
+    <property name="TransactionManager" ref="transactionManager"/>
+    <!-- note do not have converter from string to this property type registered -->
+    <property name="TransactionAttributeSource">
+      <object type="Spring.Transaction.Interceptor.AttributesTransactionAttributeSource, Spring.Data"/>
+    </property>
+  </object>
+
+</objects>
\ No newline at end of file
diff --git a/test/Spring/Spring.Data.NHibernate21.Integration.Tests/Data/NHibernate/NHDAOTests.xml b/test/Spring/Spring.Data.NHibernate21.Integration.Tests/Data/NHibernate/NHDAOTests.xml
new file mode 100644
index 00000000..7917fc27
--- /dev/null
+++ b/test/Spring/Spring.Data.NHibernate21.Integration.Tests/Data/NHibernate/NHDAOTests.xml
@@ -0,0 +1,119 @@
+<?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="System.Data.SqlClient" 
+                   connectionString="Data Source=MARKT60\SQL2005;Initial Catalog=CreditsAndDebits;User ID=springqa;Password=springqa"/>
+  -->
+
+    <object id="SessionFactory" type="Spring.Data.NHibernate.LocalSessionFactoryObject, Spring.Data.NHibernate21">
+        <property name="DbProvider" ref="DbProvider"/>
+        
+      
+        <property name="MappingAssemblies">
+            <list>
+                <value>Spring.Data.NHibernate21.Integration.Tests</value>
+            </list>
+        </property>
+        <property name="HibernateProperties">
+           <dictionary>
+
+                <entry key="connection.provider"
+                       value="NHibernate.Connection.DriverConnectionProvider"/>
+
+                <entry key="dialect"
+                       value="NHibernate.Dialect.MsSql2000Dialect"/>
+                     
+                <entry key="connection.driver_class"
+                       value="NHibernate.Driver.SqlClientDriver"/>
+
+               <entry key="proxyfactory.factory_class"
+                       value="NHibernate.ByteCode.Castle.ProxyFactoryFactory, NHibernate.ByteCode.Castle"/>
+
+           </dictionary>
+        </property>
+                      
+    </object>
+
+    <object id="AccountCreditDao" type="Spring.Data.NHibernate.AccountCreditDao, Spring.Data.NHibernate21.Integration.Tests">
+        <property name="SessionFactory" ref="SessionFactory"/>
+    </object>
+    <object id="AccountDebitDao" type="Spring.Data.NHibernate.AccountDebitDao, Spring.Data.NHibernate21.Integration.Tests">
+        <property name="SessionFactory" ref="SessionFactory"/>
+    </object>
+
+    <object id="AuditDao" type="Spring.Data.NHibernate.AuditDao, Spring.Data.NHibernate21.Integration.Tests">
+      <property name="DbProvider" ref="DbProvider"/>
+    </object>
+
+
+  <!-- The DAO object that performs multiple data access operations -->
+    <object id="accountManagerTarget" 
+            type="Spring.Data.NHibernate.AccountManager, Spring.Data.NHibernate21.Integration.Tests">
+      <property name="AccountCreditDao" ref="AccountCreditDao"/>
+      <property name="AccountDebitDao" ref="AccountDebitDao"/>
+      
+      <!--
+      <property name="AuditDao" ref="AuditDao"/>
+      -->
+      
+      
+      <!--
+      <property name="ThrowException" value="true"/>
+      -->
+      
+      <!--
+      <property name="ThrowExceptionAtEnd" value="true"/>
+      -->
+     
+    </object> 
+    
+    <object id="hibernateTransactionManager" 
+            type="Spring.Data.NHibernate.HibernateTransactionManager, Spring.Data.NHibernate21">
+        <!--  Comment out DbProvider if you want to have the tx mgr infer the DbProvider from
+              the session factory.  -->
+        <!--  Set the DbProvider explicitly if you would like to have ADO.NET and NHibernate 
+              operations take place within the same transaction.  -->
+        <property name="DbProvider" ref="DbProvider"/>
+        <property name="sessionFactory" ref="SessionFactory"/>
+
+    </object>
+    
+    <!-- construct the transaction proxy based on [Transaction()] in DAO class -->
+    <!-- todo condense this xml for attribute usage for ease of use -->
+    <!--
+    <aop:transaction name=testObjectDao"
+                     target="NHTestObjectDao"
+                     interfaces="Spring.NHibernate.ITestObjectDao"
+                     transactionManager="hibernateTransactionManager"/>
+    -->
+    
+    <!-- Transactional Proxy for TestObjectManager using the ProxyFactoryObject -->
+    <object id="accountManager" 
+            type="Spring.Aop.Framework.ProxyFactoryObject, Spring.Aop">
+        
+        <property name="Target" ref="accountManagerTarget"/>
+
+        <property name="InterceptorNames">
+            <value>transactionInterceptor</value>
+        </property>  
+            
+    </object>
+    
+    <!-- Transaction Interceptor based on attribute [Transaction()] -->
+    <object id="transactionInterceptor" 
+            type="Spring.Transaction.Interceptor.TransactionInterceptor, Spring.Data">
+        <property name="TransactionManager" ref="hibernateTransactionManager"/>
+        <!-- note do not have converter from string to this property type registered -->
+        <property name="TransactionAttributeSource">
+            <object type="Spring.Transaction.Interceptor.AttributesTransactionAttributeSource, Spring.Data"/>            
+        </property>     
+    </object>   
+    
+</objects>
\ No newline at end of file
diff --git a/test/Spring/Spring.Data.NHibernate21.Integration.Tests/Data/NHibernate/TestObject.hbm.xml b/test/Spring/Spring.Data.NHibernate21.Integration.Tests/Data/NHibernate/TestObject.hbm.xml
new file mode 100644
index 00000000..dce586c2
--- /dev/null
+++ b/test/Spring/Spring.Data.NHibernate21.Integration.Tests/Data/NHibernate/TestObject.hbm.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8" ?> 
+<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2">
+    <class name="Spring.Data.NHibernate.TestObject, Spring.Data.NHibernate21.Integration.Tests" table="TestObjects">
+        <id name="ObjectNumber" column="TestObjectNo" type="Int32"> 
+          <generator class="identity" /> 
+          
+          <!--
+          <generator class="sequence">
+            <param name="sequence">ID_SEQ</param>
+          </generator>
+          -->
+
+        </id> 
+        <property name="Age" column="Age" type="Int32"/> 
+        <property name="Name" type="String" length="50"/> 
+    </class>
+</hibernate-mapping>
diff --git a/test/Spring/Spring.Data.NHibernate21.Integration.Tests/Data/NHibernate/dbProviderTemplateTests.xml b/test/Spring/Spring.Data.NHibernate21.Integration.Tests/Data/NHibernate/dbProviderTemplateTests.xml
new file mode 100644
index 00000000..1b8107be
--- /dev/null
+++ b/test/Spring/Spring.Data.NHibernate21.Integration.Tests/Data/NHibernate/dbProviderTemplateTests.xml
@@ -0,0 +1,108 @@
+<?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"/>
+
+
+  <!--
+  <object id="DbProvider" type="Spring.Data.Common.UserCredentialsDbProvider, Spring.Data">
+    <property name="TargetDbProvider" ref="targetDbProvider"/>
+    <property name="Username" value="User ID=defaultName"/>
+    <property name="Password" value="Password=defaultPass"/>
+  </object>
+-->
+  <db:provider id="targetDbProvider" 
+               provider="SqlServer-2.0"
+               connectionString="Data Source=MARKT60\SQL2005;Trusted_Connection=False"/>
+
+
+  <db:provider id="standardDbProvider"
+             provider="SqlServer-2.0"
+             connectionString="Data Source=MARKT60\SQL2005;Trusted_Connection=False;User ID=springqa;Password=springqa"/>
+
+
+
+  <object id="SessionFactory" type="Spring.Data.NHibernate.LocalSessionFactoryObject, Spring.Data.NHibernate21">
+        <property name="DbProvider" ref="DbProvider"/>
+        <property name="MappingResources">
+          <list>
+            <value>assembly://Spring.Data.NHibernate21.Integration.Tests/Spring.Data.NHibernate/TestObject.hbm.xml</value>
+          </list>
+        </property>
+        <!--
+        <property name="MappingAssemblies">
+            <list>
+                <value>Spring.Data.NHibernate.Integration.Tests</value>
+            </list>
+        </property>
+        -->
+        <property name="HibernateProperties">
+           <dictionary>
+            <!-- use connection provided by DbProvider 
+             <entry key="hibernate.connection.provider"
+                       value="NHibernate.Connection.DriverConnectionProvider"/>
+            -->
+             <entry key="dialect"
+                    value="NHibernate.Dialect.MsSql2000Dialect"/>
+                     
+              <entry key="connection.driver_class"
+                     value="NHibernate.Driver.SqlClientDriver"/>
+
+             <!--
+             <entry key="hibernate.dialect"
+                    value="NHibernate.Dialect.Oracle9Dialect"/>
+             -->
+
+             <entry key="proxyfactory.factory_class"
+                    value="NHibernate.ByteCode.Castle.ProxyFactoryFactory, NHibernate.ByteCode.Castle"/>
+            </dictionary>
+        </property>
+                      
+    </object>
+
+  <!--
+    <object id="nativeNHTestObjectDao" type="Spring.Data.NHibernate.NativeNHTestObjectDao, Spring.Data.NHibernate.Integration.Tests">
+        <property name="SessionFactory" ref="SessionFactory"/>
+    </object>
+        
+    <object id="NHTestObjectDao" type="Spring.Data.NHibernate.NHTestObjectDao, Spring.Data.NHibernate.Integration.Tests">
+        <property name="SessionFactory" ref="SessionFactory"/>
+    </object>
+    -->
+    
+    <object id="hibernateTransactionManager" 
+            type="Spring.Data.NHibernate.HibernateTransactionManager, Spring.Data.NHibernate21">
+            
+        <property name="DbProvider" ref="DbProvider"/>
+        <property name="sessionFactory" ref="SessionFactory"/>
+
+    </object>
+    
+
+       
+    <!-- Transactional Proxy for TestObjectDao using the TransactionProxyFactory -->
+    <object id="testObjectDaoTransProxy" 
+            type="Spring.Transaction.Interceptor.TransactionProxyFactoryObject, Spring.Data">
+        <property name="PlatformTransactionManager" ref="hibernateTransactionManager"/>
+        <property name="Target">
+            <object type="Spring.Data.NHibernate.NHTestObjectDao, Spring.Data.NHibernate21.Integration.Tests">
+                <property name="SessionFactory" ref="SessionFactory"/>
+            </object>            
+        </property>
+        
+        <property name="ProxyInterfaces" value="Spring.Data.NHibernate.ITestObjectDao"/>
+        
+        <property name="TransactionAttributes">
+            <name-values>
+                <add key="Create*" value="PROPAGATION_REQUIRED"/>
+                <add key="Delete*" value="PROPAGATION_REQUIRED"/>
+                <add key="Update*" value="PROPAGATION_REQUIRED"/>
+                <add key="Find*" value="PROPAGATION_REQUIRED"/>
+            </name-values>
+        </property>
+    </object>    
+    
+</objects>
\ No newline at end of file
diff --git a/test/Spring/Spring.Data.NHibernate21.Integration.Tests/Data/NHibernate/templateTests.xml b/test/Spring/Spring.Data.NHibernate21.Integration.Tests/Data/NHibernate/templateTests.xml
new file mode 100644
index 00000000..70db836e
--- /dev/null
+++ b/test/Spring/Spring.Data.NHibernate21.Integration.Tests/Data/NHibernate/templateTests.xml
@@ -0,0 +1,105 @@
+<?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"/>
+                   <!--
+                   connectionString="Data Source=MARKT60\SQL2005;Initial Catalog=Spring;User ID=springqa; Password=springqa"/>
+                   -->
+                   <!--                   
+    <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.NHibernate21">
+        <!-- TODO Provide dedicated NHibernate Schema -->
+        <property name="DbProvider" ref="DbProvider"/>
+        <property name="MappingResources">
+          <list>
+            <value>assembly://Spring.Data.NHibernate21.Integration.Tests/Spring.Data.NHibernate/TestObject.hbm.xml</value>
+          </list>
+        </property>
+        <!--
+        <property name="MappingAssemblies">
+            <list>
+                <value>Spring.Data.NHibernate.Integration.Tests</value>
+            </list>
+        </property>
+        -->
+        <property name="HibernateProperties">
+           <dictionary>
+
+             <!--
+             <entry key="hibernate.connection.provider"
+                       value="NHibernate.Connection.DriverConnectionProvider"/>
+
+             <entry key="hibernate.dialect"
+                    value="NHibernate.Dialect.Oracle9Dialect"/>
+             -->
+
+             
+                <entry key="dialect"
+                       value="NHibernate.Dialect.MsSql2000Dialect"/>
+                     
+                <entry key="connection.driver_class"
+                       value="NHibernate.Driver.SqlClientDriver"/>
+
+               <entry key="proxyfactory.factory_class"
+                       value="NHibernate.ByteCode.Castle.ProxyFactoryFactory, NHibernate.ByteCode.Castle"/>
+
+           </dictionary>
+        </property>
+                      
+    </object>
+
+    <object id="nativeNHTestObjectDao" type="Spring.Data.NHibernate.NativeNHTestObjectDao, Spring.Data.NHibernate21.Integration.Tests">
+        <property name="SessionFactory" ref="SessionFactory"/>
+    </object>
+        
+    <object id="NHTestObjectDao" type="Spring.Data.NHibernate.NHTestObjectDao, Spring.Data.NHibernate21.Integration.Tests">
+        <property name="SessionFactory" ref="SessionFactory"/>
+    </object>
+    
+    <object id="hibernateTransactionManager" 
+            type="Spring.Data.NHibernate.HibernateTransactionManager, Spring.Data.NHibernate21">
+            
+        <property name="DbProvider" ref="DbProvider"/>
+        <property name="sessionFactory" ref="SessionFactory"/>
+
+    </object>
+    
+
+       
+    <!-- Transactional Proxy for TestObjectDao using the TransactionProxyFactory -->
+    <object id="testObjectDaoTransProxy" 
+            type="Spring.Transaction.Interceptor.TransactionProxyFactoryObject, Spring.Data">
+        
+        <property name="PlatformTransactionManager" ref="hibernateTransactionManager"/>
+        <property name="Target">
+            <object type="Spring.Data.NHibernate.NHTestObjectDao, Spring.Data.NHibernate21.Integration.Tests">
+                <property name="SessionFactory" ref="SessionFactory"/>
+            </object>            
+        </property>
+        
+        <property name="ProxyInterfaces" value="Spring.Data.NHibernate.ITestObjectDao"/>
+        
+        <property name="TransactionAttributes">
+            <name-values>
+                <add key="Create*" value="PROPAGATION_REQUIRED"/>
+                <add key="Delete*" value="PROPAGATION_REQUIRED"/>
+                <add key="Update*" value="PROPAGATION_REQUIRED"/>
+                <add key="Find*" value="PROPAGATION_REQUIRED"/>
+            </name-values>
+        </property>
+    </object>    
+    
+</objects>
\ No newline at end of file
diff --git a/test/Spring/Spring.Data.NHibernate21.Integration.Tests/Spring.Data.NHibernate21.Integration.Tests.2005.csproj b/test/Spring/Spring.Data.NHibernate21.Integration.Tests/Spring.Data.NHibernate21.Integration.Tests.2005.csproj
new file mode 100644
index 00000000..2a93ba19
--- /dev/null
+++ b/test/Spring/Spring.Data.NHibernate21.Integration.Tests/Spring.Data.NHibernate21.Integration.Tests.2005.csproj
@@ -0,0 +1,177 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{4A07E150-ED90-407C-8CAD-4760444DDFD9}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Spring</RootNamespace>
+    <AssemblyName>Spring.Data.NHibernate21.Integration.Tests</AssemblyName>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>..\..\..\build\VS.Net.2005\Spring.Data.NHibernate21.Integration.Tests\Debug\</OutputPath>
+    <DefineConstants>TRACE;DEBUG;NET_2_0,NH_2_0,NH_2_1</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>..\..\..\build\VS.Net.2005\Spring.Data.NHibernate21.Integration.Tests\Release\</OutputPath>
+    <DefineConstants>TRACE;NET_2_0,NH_2_0,NH_2_1</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Castle.DynamicProxy, Version=1.1.5.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\NHibernate21\net\2.0\Castle.DynamicProxy.dll</HintPath>
+    </Reference>
+    <Reference Include="Common.Logging, Version=1.0.2.0, Culture=neutral, PublicKeyToken=af08829b84f0328e">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\Net\2.0\Common.Logging.dll</HintPath>
+    </Reference>
+    <Reference Include="Iesi.Collections, Version=1.0.0.3, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\NHibernate21\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\NHibernate21\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\NHibernate21\net\2.0\NHibernate.dll</HintPath>
+    </Reference>
+    <Reference Include="NHibernate.ByteCode.Castle, Version=2.1.0.1001, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\NHibernate21\net\2.0\NHibernate.ByteCode.Castle.dll</HintPath>
+    </Reference>
+    <Reference Include="nunit.framework, Version=2.4.1.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\Net\2.0\nunit.framework.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\Spring.Data.NHibernate.Integration.Tests\Data\NHibernate\AccountCreditDao.cs">
+      <Link>Data\NHibernate\AccountCreditDao.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate.Integration.Tests\Data\NHibernate\AccountDebitDao.cs">
+      <Link>Data\NHibernate\AccountDebitDao.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate.Integration.Tests\Data\NHibernate\AccountManager.cs">
+      <Link>Data\NHibernate\AccountManager.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate.Integration.Tests\Data\NHibernate\AuditDao.cs">
+      <Link>Data\NHibernate\AuditDao.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate.Integration.Tests\Data\NHibernate\Credit.cs">
+      <Link>Data\NHibernate\Credit.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate.Integration.Tests\Data\NHibernate\DbProviderTemplateTests.cs">
+      <Link>Data\NHibernate\DbProviderTemplateTests.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate.Integration.Tests\Data\NHibernate\Debit.cs">
+      <Link>Data\NHibernate\Debit.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate.Integration.Tests\Data\NHibernate\IAccountCreditDao.cs">
+      <Link>Data\NHibernate\IAccountCreditDao.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate.Integration.Tests\Data\NHibernate\IAccountDebitDao.cs">
+      <Link>Data\NHibernate\IAccountDebitDao.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate.Integration.Tests\Data\NHibernate\IAccountManager.cs">
+      <Link>Data\NHibernate\IAccountManager.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate.Integration.Tests\Data\NHibernate\IAuditDao.cs">
+      <Link>Data\NHibernate\IAuditDao.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate.Integration.Tests\Data\NHibernate\ITestObjectDao.cs">
+      <Link>Data\NHibernate\ITestObjectDao.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate.Integration.Tests\Data\NHibernate\MultipleDbTests.cs">
+      <Link>Data\NHibernate\MultipleDbTests.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate.Integration.Tests\Data\NHibernate\NativeNHTestObjectDao.cs">
+      <Link>Data\NHibernate\NativeNHTestObjectDao.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate.Integration.Tests\Data\NHibernate\NativeNHTests.cs">
+      <Link>Data\NHibernate\NativeNHTests.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate.Integration.Tests\Data\NHibernate\NHDAOTests.cs">
+      <Link>Data\NHibernate\NHDAOTests.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate.Integration.Tests\Data\NHibernate\NHTestObjectDao.cs">
+      <Link>Data\NHibernate\NHTestObjectDao.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate.Integration.Tests\Data\NHibernate\TemplateTests.cs">
+      <Link>Data\NHibernate\TemplateTests.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate.Integration.Tests\Data\NHibernate\TestObject.cs">
+      <Link>Data\NHibernate\TestObject.cs</Link>
+    </Compile>
+    <Compile Include="AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\Spring.Data.NHibernate.Integration.Tests\Data\NHibernate\creditdebit.sql">
+      <Link>Data\NHibernate\creditdebit.sql</Link>
+    </None>
+    <None Include="Spring.Data.NHibernate21.Integration.Tests.dll.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Aop\Spring.Aop.2005.csproj">
+      <Project>{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}</Project>
+      <Name>Spring.Aop.2005</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Core\Spring.Core.2005.csproj">
+      <Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project>
+      <Name>Spring.Core.2005</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Data.NHibernate21\Spring.Data.NHibernate21.2005.csproj">
+      <Project>{71368632-B8B7-4A6A-8C65-8DA848120C82}</Project>
+      <Name>Spring.Data.NHibernate21.2005</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Data\Spring.Data.2005.csproj">
+      <Project>{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}</Project>
+      <Name>Spring.Data.2005</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Data\NHibernate\dbProviderTemplateTests.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Data\NHibernate\templateTests.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Data\NHibernate\Credit.hbm.xml" />
+    <EmbeddedResource Include="Data\NHibernate\NHDAOTests.xml" />
+    <EmbeddedResource Include="Data\NHibernate\TestObject.hbm.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Data\NHibernate\Debit.hbm.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Data\NHibernate\MultipleDbTests.xml" />
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+  <PropertyGroup>
+    <PostBuildEvent>echo "Copying .xml files for tests"
+xcopy "$(ProjectDir)Data" ..\..\..\..\build\VS.Net.2005\Spring.Data.NHibernate21.Integration.Tests\$(ConfigurationName)\ /y /s /q /d
+xcopy  "$(ProjectDir)$(TargetFileName).config" ..\..\..\..\build\VS.Net.2005\Spring.Data.NHibernate21.Integration.Tests\$(ConfigurationName)\ /y /s /q</PostBuildEvent>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/test/Spring/Spring.Data.NHibernate21.Integration.Tests/Spring.Data.NHibernate21.Integration.Tests.2008.csproj b/test/Spring/Spring.Data.NHibernate21.Integration.Tests/Spring.Data.NHibernate21.Integration.Tests.2008.csproj
new file mode 100644
index 00000000..8df8a0b5
--- /dev/null
+++ b/test/Spring/Spring.Data.NHibernate21.Integration.Tests/Spring.Data.NHibernate21.Integration.Tests.2008.csproj
@@ -0,0 +1,171 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>9.0.30729</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{4A07E150-ED90-407C-8CAD-4760444DDFD9}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Spring</RootNamespace>
+    <AssemblyName>Spring.Data.NHibernate21.Integration.Tests</AssemblyName>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>..\..\..\build\VS.Net.2008\Spring.Data.NHibernate21.Integration.Tests\Debug\</OutputPath>
+    <DefineConstants>TRACE;DEBUG;NET_2_0,NH_2_0,NH_2_1</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>..\..\..\build\VS.Net.2008\Spring.Data.NHibernate21.Integration.Tests\Release\</OutputPath>
+    <DefineConstants>TRACE;NET_2_0,NH_2_0,NH_2_1</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Castle.DynamicProxy, Version=1.1.5.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\NHibernate21\net\2.0\Castle.DynamicProxy.dll</HintPath>
+    </Reference>
+    <Reference Include="Common.Logging, Version=1.0.2.0, Culture=neutral, PublicKeyToken=af08829b84f0328e">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\Net\2.0\Common.Logging.dll</HintPath>
+    </Reference>
+    <Reference Include="Iesi.Collections, Version=1.0.0.3, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\NHibernate21\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\NHibernate21\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\NHibernate21\net\2.0\NHibernate.dll</HintPath>
+    </Reference>
+    <Reference Include="NHibernate.ByteCode.Castle, Version=2.1.0.1001, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\NHibernate21\net\2.0\NHibernate.ByteCode.Castle.dll</HintPath>
+    </Reference>
+    <Reference Include="nunit.framework, Version=2.4.1.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\Net\2.0\nunit.framework.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\Spring.Data.NHibernate.Integration.Tests\Data\NHibernate\AccountCreditDao.cs">
+      <Link>Data\NHibernate\AccountCreditDao.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate.Integration.Tests\Data\NHibernate\AccountDebitDao.cs">
+      <Link>Data\NHibernate\AccountDebitDao.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate.Integration.Tests\Data\NHibernate\AccountManager.cs">
+      <Link>Data\NHibernate\AccountManager.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate.Integration.Tests\Data\NHibernate\AuditDao.cs">
+      <Link>Data\NHibernate\AuditDao.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate.Integration.Tests\Data\NHibernate\Credit.cs">
+      <Link>Data\NHibernate\Credit.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate.Integration.Tests\Data\NHibernate\DbProviderTemplateTests.cs">
+      <Link>Data\NHibernate\DbProviderTemplateTests.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate.Integration.Tests\Data\NHibernate\Debit.cs">
+      <Link>Data\NHibernate\Debit.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate.Integration.Tests\Data\NHibernate\IAccountCreditDao.cs">
+      <Link>Data\NHibernate\IAccountCreditDao.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate.Integration.Tests\Data\NHibernate\IAccountDebitDao.cs">
+      <Link>Data\NHibernate\IAccountDebitDao.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate.Integration.Tests\Data\NHibernate\IAccountManager.cs">
+      <Link>Data\NHibernate\IAccountManager.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate.Integration.Tests\Data\NHibernate\IAuditDao.cs">
+      <Link>Data\NHibernate\IAuditDao.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate.Integration.Tests\Data\NHibernate\ITestObjectDao.cs">
+      <Link>Data\NHibernate\ITestObjectDao.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate.Integration.Tests\Data\NHibernate\MultipleDbTests.cs">
+      <Link>Data\NHibernate\MultipleDbTests.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate.Integration.Tests\Data\NHibernate\NativeNHTestObjectDao.cs">
+      <Link>Data\NHibernate\NativeNHTestObjectDao.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate.Integration.Tests\Data\NHibernate\NativeNHTests.cs">
+      <Link>Data\NHibernate\NativeNHTests.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate.Integration.Tests\Data\NHibernate\NHDAOTests.cs">
+      <Link>Data\NHibernate\NHDAOTests.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate.Integration.Tests\Data\NHibernate\NHTestObjectDao.cs">
+      <Link>Data\NHibernate\NHTestObjectDao.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate.Integration.Tests\Data\NHibernate\TemplateTests.cs">
+      <Link>Data\NHibernate\TemplateTests.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate.Integration.Tests\Data\NHibernate\TestObject.cs">
+      <Link>Data\NHibernate\TestObject.cs</Link>
+    </Compile>
+    <Compile Include="AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\Spring.Data.NHibernate.Integration.Tests\Data\NHibernate\creditdebit.sql">
+      <Link>Data\NHibernate\creditdebit.sql</Link>
+    </None>
+    <None Include="Spring.Data.NHibernate21.Integration.Tests.dll.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Aop\Spring.Aop.2008.csproj">
+      <Project>{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}</Project>
+      <Name>Spring.Aop.2008</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Core\Spring.Core.2008.csproj">
+      <Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project>
+      <Name>Spring.Core.2008</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Data.NHibernate21\Spring.Data.NHibernate21.2008.csproj">
+      <Project>{71368632-B8B7-4A6A-8C65-8DA848120C82}</Project>
+      <Name>Spring.Data.NHibernate21.2008</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Data\Spring.Data.2008.csproj">
+      <Project>{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}</Project>
+      <Name>Spring.Data.2008</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Data\NHibernate\Credit.hbm.xml" />
+    <EmbeddedResource Include="Data\NHibernate\dbProviderTemplateTests.xml" />
+    <EmbeddedResource Include="Data\NHibernate\Debit.hbm.xml" />
+    <EmbeddedResource Include="Data\NHibernate\MultipleDbTests.xml" />
+    <EmbeddedResource Include="Data\NHibernate\templateTests.xml" />
+    <EmbeddedResource Include="Data\NHibernate\TestObject.hbm.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Data\NHibernate\NHDAOTests.xml" />
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+  <PropertyGroup>
+    <PostBuildEvent>echo "Copying .xml files for tests"
+xcopy "$(ProjectDir)Data" ..\..\..\..\build\VS.Net.2008\Spring.Data.NHibernate21.Integration.Tests\$(ConfigurationName)\ /y /s /q /d
+xcopy  "$(ProjectDir)$(TargetFileName).config" ..\..\..\..\build\VS.Net.2008\Spring.Data.NHibernate21.Integration.Tests\$(ConfigurationName)\ /y /s /q</PostBuildEvent>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/test/Spring/Spring.Data.NHibernate21.Integration.Tests/Spring.Data.NHibernate21.Integration.Tests.build b/test/Spring/Spring.Data.NHibernate21.Integration.Tests/Spring.Data.NHibernate21.Integration.Tests.build
new file mode 100644
index 00000000..c09c6e49
--- /dev/null
+++ b/test/Spring/Spring.Data.NHibernate21.Integration.Tests/Spring.Data.NHibernate21.Integration.Tests.build
@@ -0,0 +1,59 @@
+<?xml version="1.0" ?>
+<project name="Spring.Data.NHibernate21.Integration.Tests" default="test" xmlns="http://nant.sf.net/schemas/nant.xsd">
+<!--
+	Required properties:
+	  * current.bin.dir           - (path) root level to build to
+	  * current.build.debug       - (true|false) debug build?
+	  * current.build.defines.csc - framework-specific build defines for C# compiler
+ -->
+	<target name="build">
+
+		<!-- build Spring.Data.NHibernate21.Integration.Tests -->
+		<csc target="library" define="${current.build.defines.csc},NH_2_0,NH_2_1"
+				warnaserror="true"
+				debug="${current.build.debug}"
+				output="${current.bin.dir}/${project::get-name()}.dll"
+				doc="${current.bin.dir}/${project::get-name()}.xml">
+			<nowarn>
+				<warning number="${nowarn.numbers.test}" />
+			</nowarn>
+			<sources failonempty="true">
+				<include name="**/*.cs" />
+				<include name="../CommonAssemblyInfo.cs" />
+			</sources>
+			<references basedir="${current.bin.dir}">
+				<lib>
+					<include name="${nh21.lib.dir}"/>
+				</lib>
+				<include name="System.Data.dll" />
+				<include name="System.EnterpriseServices.dll" />
+				<include name="log4net.dll" />
+				<include name="NHibernate.dll" />
+				<include name="*.dll" />
+				<exclude name="${project::get-name()}.dll" />
+				<exclude name="Spring.Data.NHibernate.Tests.dll" />
+				<exclude name="Spring.Data.NHibernate.dll" />
+				<exclude name="Spring.Data.NHibernate12.dll" />
+				<exclude name="Spring.Data.NHibernate20.dll" />
+				<exclude name="CloverRuntime.dll" />
+			</references>
+			<resources prefix="Spring" dynamicprefix="true" failonempty="true">
+				<include name="**/*.xml" />
+			</resources>
+		</csc>
+
+        <copy file="${project::get-base-directory()}/${project::get-name()}.dll.config"
+              tofile="${current.bin.dir}/${project::get-name()}.dll.config"/>
+
+	</target>
+	<target name="test" depends="build">
+			<!-- skipping running of tests for now
+		<nunit2outproc>
+			<formatter type="Plain" />
+			<formatter type="Xml" usefile="true" extension=".xml"
+					   outputdir="${current.bin.dir}/results" />
+			<test assemblyname="${current.bin.dir}/${project::get-name()}.dll" />
+		</nunit2outproc>
+		-->
+	</target>
+</project>
diff --git a/test/Spring/Spring.Data.NHibernate21.Integration.Tests/Spring.Data.NHibernate21.Integration.Tests.dll.config b/test/Spring/Spring.Data.NHibernate21.Integration.Tests/Spring.Data.NHibernate21.Integration.Tests.dll.config
new file mode 100644
index 00000000..12e5ecbf
--- /dev/null
+++ b/test/Spring/Spring.Data.NHibernate21.Integration.Tests/Spring.Data.NHibernate21.Integration.Tests.dll.config
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+  <configSections>
+    <sectionGroup name="common">
+      <section name="logging" type="Common.Logging.ConfigurationSectionHandler, Common.Logging" />
+    </sectionGroup>
+    <sectionGroup name="spring">
+      <section name="parsers" type="Spring.Context.Support.NamespaceParsersSectionHandler, Spring.Core" />
+    </sectionGroup>
+  </configSections>
+
+
+  <common>
+    <logging>
+
+      <factoryAdapter type="Common.Logging.Simple.ConsoleOutLoggerFactoryAdapter, Common.Logging">
+        <arg key="level" value="DEBUG" />
+
+      </factoryAdapter>
+
+    </logging>
+  </common>
+
+  <!--
+  <common>
+    <logging>
+      <factoryAdapter type="Common.Logging.Log4Net.Log4NetLoggerFactoryAdapter, Common.Logging.Log4Net129">
+        <arg key="configType" value="EXTERNAL" />
+      </factoryAdapter>
+    </logging>
+  </common>
+  -->
+
+  <spring>
+    <parsers>
+      <parser type="Spring.Data.Config.DatabaseNamespaceParser, Spring.Data" />
+    </parsers>
+  </spring>
+
+</configuration>
\ No newline at end of file
diff --git a/test/Spring/Spring.Data.NHibernate21.Tests/AssemblyInfo.cs b/test/Spring/Spring.Data.NHibernate21.Tests/AssemblyInfo.cs
new file mode 100644
index 00000000..3da885ea
--- /dev/null
+++ b/test/Spring/Spring.Data.NHibernate21.Tests/AssemblyInfo.cs
@@ -0,0 +1,5 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+
+[assembly: AssemblyTitle("Spring.Data.NHibernate Integration Tests")]
+[assembly: AssemblyDescription("Integration tests for Spring.Data.NHibernate assembly")]
diff --git a/test/Spring/Spring.Data.NHibernate21.Tests/Data/NHibernate/Config/AopConfiguration.xml b/test/Spring/Spring.Data.NHibernate21.Tests/Data/NHibernate/Config/AopConfiguration.xml
new file mode 100644
index 00000000..10b966a6
--- /dev/null
+++ b/test/Spring/Spring.Data.NHibernate21.Tests/Data/NHibernate/Config/AopConfiguration.xml
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<objects xmlns="http://www.springframework.net"
+         xmlns:db="http://www.springframework.net/database"
+         xmlns:tx="http://www.springframework.net/tx">
+
+
+  <!-- Database and NHibernate Configuration -->
+
+  <db:provider id="DbProvider"
+                   provider="SqlServer-2.0"
+                   connectionString="Data Source=MARKT60\SQL2005;Initial Catalog=Spring;Persist Security Info=True;User ID=springqa;Password=springqa;"/>
+
+
+
+  <object id="SessionFactory" type="Spring.Data.NHibernate.LocalSessionFactoryObject, Spring.Data.NHibernate21">
+    <property name="DbProvider" ref="DbProvider"/>
+    <property name="MappingResources">
+      <list>
+        <value>assembly://Spring.Data.NHibernate21.Tests/Spring.Data.NHibernate/TestObject.hbm.xml</value>
+      </list>
+    </property>
+    <property name="HibernateProperties">
+      <dictionary>
+        <entry key="dialect"
+               value="NHibernate.Dialect.MsSql2000Dialect"/>
+             
+        <entry key="connection.driver_class"
+               value="NHibernate.Driver.SqlClientDriver"/>
+
+        <entry key="proxyfactory.factory_class" 
+               value="NHibernate.ByteCode.Castle.ProxyFactoryFactory, NHibernate.ByteCode.Castle" />
+      </dictionary>
+    </property>
+
+  </object>
+
+
+  <object id="TestObjectDao" type="Spring.Data.NHibernate.TestObjectDao, Spring.Data.NHibernate21.Tests">
+    <property name="SessionFactory" ref="SessionFactory"/>
+  </object>
+
+  <object id="hibernateTransactionManager" type="Spring.Data.NHibernate.HibernateTransactionManager, Spring.Data.NHibernate21">
+
+    <property name="DbProvider" ref="DbProvider"/>
+    <property name="sessionFactory" ref="SessionFactory"/>
+
+  </object>
+
+  <object name="transactionManager" type="Spring.Transaction.CallCountingTransactionManager, Spring.Data.Tests"/>
+
+  <object name="SimpleService" type="Spring.Data.NHibernate.SimpleService, Spring.Data.NHibernate21.Tests">
+    <property name="TestObjectDao" ref="TestObjectDao"/>
+  </object>
+
+  <object id="loggingAroundAdvice" type="Spring.Data.LoggingAroundAdvice, Spring.Data.Tests"/>
+  
+  <object id ="myAutoProxy" type="Spring.Aop.Framework.AutoProxy.ObjectNameAutoProxyCreator">
+
+    <property name="InterceptorNames">
+      <list>
+        <value>loggingAroundAdvice</value>
+      </list>
+    </property>
+    
+    <property name="ProxyTargetType" value="false"/>
+    <property name="ExposeProxy" value="false"/>
+    <property name="Optimize" value="false"/>
+
+    <property name="ObjectNames">
+      <list>
+        <value>TestObjectDao</value>
+      </list>
+    </property>
+  </object>
+
+  <tx:attribute-driven transaction-manager="transactionManager"/>
+  
+  <!-- Transactional Proxy for TestObjectDao using the TransactionProxyFactory -->
+  <!--
+  <object id="testObjectDaoTransProxy"
+          type="Spring.Transaction.Interceptor.TransactionProxyFactoryObject, Spring.Data">
+
+    <property name="PlatformTransactionManager" ref="transactionManager"/>
+    <property name="Target" ref="SimpleService"/>
+
+    <property name="ProxyInterfaces" value="Spring.Data.NHibernate.ISimpleService"/>
+
+    <property name="TransactionAttributes">
+      <name-values>
+        <add key="Create*" value="PROPAGATION_REQUIRED"/>
+        <add key="Delete*" value="PROPAGATION_REQUIRED"/>
+        <add key="Update*" value="PROPAGATION_REQUIRED"/>
+        <add key="Find*"   value="PROPAGATION_REQUIRED"/>
+      </name-values>
+    </property>
+  </object>
+  -->
+
+</objects>
\ No newline at end of file
diff --git a/test/Spring/Spring.Data.NHibernate21.Tests/Data/NHibernate/Config/AopConfigurationTxPointcut.xml b/test/Spring/Spring.Data.NHibernate21.Tests/Data/NHibernate/Config/AopConfigurationTxPointcut.xml
new file mode 100644
index 00000000..8fcdcb62
--- /dev/null
+++ b/test/Spring/Spring.Data.NHibernate21.Tests/Data/NHibernate/Config/AopConfigurationTxPointcut.xml
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<objects xmlns="http://www.springframework.net"
+         xmlns:db="http://www.springframework.net/database"
+         xmlns:tx="http://www.springframework.net/tx"
+         xmlns:aop="http://www.springframework.net/aop">
+
+
+  <!-- Database and NHibernate Configuration -->
+
+  <db:provider id="DbProvider"
+                   provider="SqlServer-2.0"
+                   connectionString="Data Source=MARKT60\SQL2005;Initial Catalog=Spring;Persist Security Info=True;User ID=springqa;Password=springqa;"/>
+
+
+
+  <object id="SessionFactory" type="Spring.Data.NHibernate.LocalSessionFactoryObject, Spring.Data.NHibernate21">
+    <property name="DbProvider" ref="DbProvider"/>
+    <property name="MappingResources">
+      <list>
+        <value>assembly://Spring.Data.NHibernate21.Tests/Spring.Data.NHibernate/TestObject.hbm.xml</value>
+      </list>
+    </property>
+    <property name="HibernateProperties">
+      <dictionary>
+        <entry key="hibernate.dialect"
+               value="NHibernate.Dialect.MsSql2000Dialect"/>
+             
+        <entry key="hibernate.connection.driver_class"
+               value="NHibernate.Driver.SqlClientDriver"/>
+
+        <entry key="proxyfactory.factory_class"
+               value="NHibernate.ByteCode.Castle.ProxyFactoryFactory, NHibernate.ByteCode.Castle" />
+
+      </dictionary>
+    </property>
+
+  </object>
+
+
+  <object id="TestObjectDao" type="Spring.Data.NHibernate.TestObjectDao, Spring.Data.NHibernate21.Tests">
+    <property name="SessionFactory" ref="SessionFactory"/>
+  </object>
+
+  <object id="transactionManager" type="Spring.Data.NHibernate.HibernateTransactionManager, Spring.Data.NHibernate21">
+
+    <property name="DbProvider" ref="DbProvider"/>
+    <property name="sessionFactory" ref="SessionFactory"/>
+
+  </object>
+
+
+  <object name="SimpleService" type="Spring.Data.NHibernate.SimpleService, Spring.Data.NHibernate21.Tests">
+    <property name="TestObjectDao" ref="TestObjectDao"/>
+  </object>
+
+  <object name="hibernateTemplate" type="Spring.Data.NHibernate.HibernateTemplate, Spring.Data.NHibernate21">
+    <property name="sessionFactory" ref="SessionFactory"/>
+  </object>
+  
+  <!-- once add 'internal' role for autoproxycreator that is created via the tx:attribute-driven element -->
+  <!-- then we can add advisors to the config and have them picked up by any 'user' role defined autoproxycreators -->
+
+  <object id="loggingAdvisor" type="Spring.Aop.Support.NameMatchMethodPointcutAdvisor, Spring.Aop">
+    <property name="Advice">
+      <object id="loggingAroundAdvice" type="Spring.Data.LoggingAroundAdvice, Spring.Data.Tests"/>
+    </property>
+    <property name="MappedNames">
+      <list>
+        <value>12341234asdf*</value>
+      </list>
+    </property>
+  </object>
+
+  <object id ="myAutoProxy" type="Spring.Aop.Framework.AutoProxy.ObjectNameAutoProxyCreator">
+
+    <property name="InterceptorNames">
+      <list>
+        <value>loggingAdvisor</value>
+      </list>
+    </property>
+    
+    <property name="ProxyTargetType" value="false"/>
+    <property name="ExposeProxy" value="false"/>
+    <property name="Optimize" value="false"/>
+
+    <property name="ObjectNames">
+      <list>
+        <value>TestObjectDao</value>
+      </list>
+    </property>
+  </object>
+
+ 
+  <tx:attribute-driven transaction-manager="transactionManager"/>
+
+
+</objects>
\ No newline at end of file
diff --git a/test/Spring/Spring.Data.NHibernate21.Tests/Data/NHibernate/TestObject.hbm.xml b/test/Spring/Spring.Data.NHibernate21.Tests/Data/NHibernate/TestObject.hbm.xml
new file mode 100644
index 00000000..012c0343
--- /dev/null
+++ b/test/Spring/Spring.Data.NHibernate21.Tests/Data/NHibernate/TestObject.hbm.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8" ?> 
+<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2">
+    <class name="Spring.Data.NHibernate.TestObject, Spring.Data.NHibernate21.Tests" table="TestObjects">
+        <id name="ObjectNumber" column="TestObjectNo" type="Int32"> 
+          <generator class="identity" /> 
+          
+          <!--
+          <generator class="sequence">
+            <param name="sequence">ID_SEQ</param>
+          </generator>
+          -->
+
+        </id> 
+        <property name="Age" column="Age" type="Int32"/> 
+        <property name="Name" type="String" length="50"/> 
+    </class>
+</hibernate-mapping>
diff --git a/test/Spring/Spring.Data.NHibernate21.Tests/Spring.Data.NHibernate21.Tests.2005.csproj b/test/Spring/Spring.Data.NHibernate21.Tests/Spring.Data.NHibernate21.Tests.2005.csproj
new file mode 100644
index 00000000..eadd4e3b
--- /dev/null
+++ b/test/Spring/Spring.Data.NHibernate21.Tests/Spring.Data.NHibernate21.Tests.2005.csproj
@@ -0,0 +1,149 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{94E4E1B4-D424-4EB9-BF34-2EE8CC3D7048}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Spring</RootNamespace>
+    <AssemblyName>Spring.Data.NHibernate21.Tests</AssemblyName>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>..\..\..\build\VS.Net.2005\Spring.Data.NHibernate21.Tests\Debug\</OutputPath>
+    <DefineConstants>TRACE;DEBUG;NET_2_0,NH_2_0,NH_2_1</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>..\..\..\build\VS.Net.2005\Spring.Data.NHibernate21.Tests\Release\</OutputPath>
+    <DefineConstants>TRACE;NET_2_0,NH_2_0;NH_2_1</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Castle.DynamicProxy, Version=1.1.5.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\NHibernate21\net\2.0\Castle.DynamicProxy.dll</HintPath>
+    </Reference>
+    <Reference Include="Common.Logging, Version=1.1.0.0, Culture=neutral, PublicKeyToken=af08829b84f0328e">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\Net\2.0\Common.Logging.dll</HintPath>
+    </Reference>
+    <Reference Include="Iesi.Collections, Version=1.0.0.1, Culture=neutral, PublicKeyToken=154fdcb44c4484fc">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\NHibernate21\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\NHibernate21\net\2.0\log4net.dll</HintPath>
+    </Reference>
+    <Reference Include="NHibernate, Version=1.0.4.0, Culture=neutral, PublicKeyToken=154fdcb44c4484fc">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\NHibernate21\net\2.0\NHibernate.dll</HintPath>
+    </Reference>
+    <Reference Include="NHibernate.ByteCode.Castle, Version=2.1.0.1001, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\NHibernate21\net\2.0\NHibernate.ByteCode.Castle.dll</HintPath>
+    </Reference>
+    <Reference Include="nunit.framework, Version=2.2.7.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\net\2.0\nunit.framework.dll</HintPath>
+    </Reference>
+    <Reference Include="Rhino.Mocks, Version=2.9.6.40380, Culture=neutral, PublicKeyToken=0b3305902db7183f, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\Net\2.0\Rhino.Mocks.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\Spring.Data.NHibernate.Tests\Data\NHibernate\Config\AopConfiguration.cs">
+      <Link>Data\NHibernate\Config\AopConfiguration.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate.Tests\Data\NHibernate\HibernateTransactionManagerTests.cs">
+      <Link>Data\NHibernate\HibernateTransactionManagerTests.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate.Tests\Data\NHibernate\ISimpleService.cs">
+      <Link>Data\NHibernate\ISimpleService.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate.Tests\Data\NHibernate\ITestObjectDao.cs">
+      <Link>Data\NHibernate\ITestObjectDao.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate.Tests\Data\NHibernate\LocalSessionFactoryObjectTests.cs">
+      <Link>Data\NHibernate\LocalSessionFactoryObjectTests.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate.Tests\Data\NHibernate\NHTestObjectDao.cs">
+      <Link>Data\NHibernate\NHTestObjectDao.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate.Tests\Data\NHibernate\SimpleService.cs">
+      <Link>Data\NHibernate\SimpleService.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate.Tests\Data\NHibernate\Support\ConfigSectionSessionScopeSettingsTests.cs">
+      <Link>Data\NHibernate\Support\ConfigSectionSessionScopeSettingsTests.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate.Tests\Data\NHibernate\Support\SessionScopeSettingsTests.cs">
+      <Link>Data\NHibernate\Support\SessionScopeSettingsTests.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate.Tests\Data\NHibernate\Support\SessionScopeTests.cs">
+      <Link>Data\NHibernate\Support\SessionScopeTests.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate.Tests\Data\NHibernate\TestObject.cs">
+      <Link>Data\NHibernate\TestObject.cs</Link>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Spring.Data.NHibernate21.Tests.dll.config">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Aop\Spring.Aop.2005.csproj">
+      <Project>{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}</Project>
+      <Name>Spring.Aop.2005</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Core\Spring.Core.2005.csproj">
+      <Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project>
+      <Name>Spring.Core.2005</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Data.NHibernate21\Spring.Data.NHibernate21.2005.csproj">
+      <Project>{71368632-B8B7-4A6A-8C65-8DA848120C82}</Project>
+      <Name>Spring.Data.NHibernate21.2005</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Data\Spring.Data.2005.csproj">
+      <Project>{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}</Project>
+      <Name>Spring.Data.2005</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Spring.Data.Tests\Spring.Data.Tests.2005.csproj">
+      <Project>{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}</Project>
+      <Name>Spring.Data.Tests.2005</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Data\NHibernate\Config\AopConfiguration.xml" />
+    <EmbeddedResource Include="Data\NHibernate\Config\AopConfigurationTxPointcut.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Data\NHibernate\TestObject.hbm.xml" />
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+  <PropertyGroup>
+    <PostBuildEvent>echo "Copying .xml files for tests"
+xcopy "$(ProjectDir)Data" ..\..\..\..\build\VS.Net.2005\Spring.Data.NHibernate21.Tests\$(ConfigurationName)\ /y /s /q /d
+xcopy  "$(ProjectDir)$(TargetFileName).config" ..\..\..\..\build\VS.Net.2005\Spring.Data.NHibernate21.Tests\$(ConfigurationName)\ /y /s /q</PostBuildEvent>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/test/Spring/Spring.Data.NHibernate21.Tests/Spring.Data.NHibernate21.Tests.2008.csproj b/test/Spring/Spring.Data.NHibernate21.Tests/Spring.Data.NHibernate21.Tests.2008.csproj
new file mode 100644
index 00000000..2975e5e2
--- /dev/null
+++ b/test/Spring/Spring.Data.NHibernate21.Tests/Spring.Data.NHibernate21.Tests.2008.csproj
@@ -0,0 +1,153 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>9.0.30729</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{94E4E1B4-D424-4EB9-BF34-2EE8CC3D7048}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Spring</RootNamespace>
+    <AssemblyName>Spring.Data.NHibernate21.Tests</AssemblyName>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>..\..\..\build\VS.Net.2008\Spring.Data.NHibernate21.Tests\Debug\</OutputPath>
+    <DefineConstants>TRACE;DEBUG;NET_2_0,NH_2_0,NH_2_1</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>..\..\..\build\VS.Net.2008\Spring.Data.NHibernate21.Tests\Release\</OutputPath>
+    <DefineConstants>TRACE;NET_2_0,NET_2_1</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Castle.DynamicProxy, Version=1.1.5.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\NHibernate21\net\2.0\Castle.DynamicProxy.dll</HintPath>
+    </Reference>
+    <Reference Include="Common.Logging, Version=1.1.0.0, Culture=neutral, PublicKeyToken=af08829b84f0328e">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\Net\2.0\Common.Logging.dll</HintPath>
+    </Reference>
+    <Reference Include="Iesi.Collections, Version=1.0.0.1, Culture=neutral, PublicKeyToken=154fdcb44c4484fc">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\NHibernate21\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\NHibernate21\net\2.0\log4net.dll</HintPath>
+    </Reference>
+    <Reference Include="NHibernate, Version=1.0.4.0, Culture=neutral, PublicKeyToken=154fdcb44c4484fc">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\NHibernate21\net\2.0\NHibernate.dll</HintPath>
+    </Reference>
+    <Reference Include="NHibernate.ByteCode.Castle, Version=2.1.0.1001, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\NHibernate21\net\2.0\NHibernate.ByteCode.Castle.dll</HintPath>
+    </Reference>
+    <Reference Include="nunit.framework, Version=2.2.7.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\net\2.0\nunit.framework.dll</HintPath>
+    </Reference>
+    <Reference Include="Rhino.Mocks, Version=2.9.6.40380, Culture=neutral, PublicKeyToken=0b3305902db7183f, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\Net\2.0\Rhino.Mocks.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\Spring.Data.NHibernate.Tests\Data\NHibernate\Config\AopConfiguration.cs">
+      <Link>Data\NHibernate\Config\AopConfiguration.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate.Tests\Data\NHibernate\HibernateTransactionManagerTests.cs">
+      <Link>Data\NHibernate\HibernateTransactionManagerTests.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate.Tests\Data\NHibernate\ISimpleService.cs">
+      <Link>Data\NHibernate\ISimpleService.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate.Tests\Data\NHibernate\ITestObjectDao.cs">
+      <Link>Data\NHibernate\ITestObjectDao.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate.Tests\Data\NHibernate\LocalSessionFactoryObjectTests.cs">
+      <Link>Data\NHibernate\LocalSessionFactoryObjectTests.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate.Tests\Data\NHibernate\NHTestObjectDao.cs">
+      <Link>Data\NHibernate\NHTestObjectDao.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate.Tests\Data\NHibernate\SimpleService.cs">
+      <Link>Data\NHibernate\SimpleService.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate.Tests\Data\NHibernate\Support\ConfigSectionSessionScopeSettingsTests.cs">
+      <Link>Data\NHibernate\Support\ConfigSectionSessionScopeSettingsTests.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate.Tests\Data\NHibernate\Support\SessionScopeSettingsTests.cs">
+      <Link>Data\NHibernate\Support\SessionScopeSettingsTests.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate.Tests\Data\NHibernate\Support\SessionScopeTests.cs">
+      <Link>Data\NHibernate\Support\SessionScopeTests.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate.Tests\Data\NHibernate\TestObject.cs">
+      <Link>Data\NHibernate\TestObject.cs</Link>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Spring.Data.NHibernate21.Tests.dll.config">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Aop\Spring.Aop.2008.csproj">
+      <Project>{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}</Project>
+      <Name>Spring.Aop.2008</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Core\Spring.Core.2008.csproj">
+      <Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project>
+      <Name>Spring.Core.2008</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Data.NHibernate21\Spring.Data.NHibernate21.2008.csproj">
+      <Project>{71368632-B8B7-4A6A-8C65-8DA848120C82}</Project>
+      <Name>Spring.Data.NHibernate21.2008</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Data\Spring.Data.2008.csproj">
+      <Project>{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}</Project>
+      <Name>Spring.Data.2008</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Spring.Data.Tests\Spring.Data.Tests.2008.csproj">
+      <Project>{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}</Project>
+      <Name>Spring.Data.Tests.2008</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="..\Spring.Data.NHibernate21.Tests\Data\NHibernate\Config\AopConfigurationTxPointcut.xml">
+      <Link>Data\NHibernate\Config\AopConfigurationTxPointcut.xml</Link>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Data\NHibernate\Config\AopConfiguration.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Data\NHibernate\TestObject.hbm.xml" />
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+  <PropertyGroup>
+    <PostBuildEvent>echo "Copying .xml files for tests"
+xcopy "$(ProjectDir)Data" ..\..\..\..\build\VS.Net.2008\Spring.Data.NHibernate21.Tests\$(ConfigurationName)\ /y /s /q /d
+xcopy  "$(ProjectDir)$(TargetFileName).config" ..\..\..\..\build\VS.Net.2008\Spring.Data.NHibernate21.Tests\$(ConfigurationName)\ /y /s /q</PostBuildEvent>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/test/Spring/Spring.Data.NHibernate21.Tests/Spring.Data.NHibernate21.Tests.build b/test/Spring/Spring.Data.NHibernate21.Tests/Spring.Data.NHibernate21.Tests.build
new file mode 100644
index 00000000..d02ede4a
--- /dev/null
+++ b/test/Spring/Spring.Data.NHibernate21.Tests/Spring.Data.NHibernate21.Tests.build
@@ -0,0 +1,63 @@
+<?xml version="1.0" ?>
+<project name="Spring.Data.NHibernate21.Tests" default="build" xmlns="http://nant.sf.net/schemas/nant.xsd">
+	<!--
+        Required properties:
+            * current.bin.dir           - (path) root level to build to
+            * build.debug               - (true|false) debug build?
+            * current.build.defines.csc - framework-specific build defines
+    -->
+	<target name="build">
+		<csc target="library" define="${current.build.defines.csc},NH_2_0,NH_2_1"
+		     warnaserror="true"
+		     debug="${current.build.debug}"
+      		     output="${current.bin.dir}/${project::get-name()}.dll"
+		     doc="${current.bin.dir}/${project::get-name()}.xml">
+			<nowarn>
+				<warning number="${nowarn.numbers.test}" />
+			</nowarn>
+			<sources failonempty="true">
+				<include name="**/*.cs" />
+				<include name="../CommonAssemblyInfo.cs" />
+			</sources>
+			<references basedir="${current.bin.dir}">
+				<lib>
+					<include name="${nh21.lib.dir}"/>
+				</lib>
+				<include name="System.Data.dll" />
+				<include name="System.EnterpriseServices.dll" />
+				<include name="NHibernate.dll" />
+				<include name="*.dll" />
+				<exclude name="${project::get-name()}.dll" />
+				<exclude name="Spring.Data.NHibernate.dll" />
+				<exclude name="Spring.Data.NHibernate12.dll" />
+				<exclude name="Spring.Data.NHibernate20.dll" />
+				<exclude name="CloverRuntime.dll" />
+			</references>
+			<resources prefix="Spring" dynamicprefix="true" failonempty="true">
+				<include name="**/*.xml" />
+			</resources>
+		</csc>
+
+        <copy file="${project::get-base-directory()}/${project::get-name()}.dll.config"
+              tofile="${current.bin.dir}/${project::get-name()}.dll.config"/>
+
+		<!-- copy nh libs -->
+		<copy todir="${current.bin.dir}" overwrite="true">
+			<fileset basedir="${nh.lib.dir}">
+				<include name="**/*.dll" />
+			</fileset>
+		</copy>
+
+	</target>
+
+	<target name="test" depends="build">
+		<nunit2outproc>
+			<formatter type="Plain" />
+			<formatter type="Xml" usefile="true" extension=".xml"
+			           outputdir="${current.bin.dir}/results" />
+			<test assemblyname="${current.bin.dir}/${project::get-name()}.dll"
+			      appconfig="${current.bin.dir}/${project::get-name()}.dll.config" />
+		</nunit2outproc>
+	</target>
+
+</project>
diff --git a/test/Spring/Spring.Data.NHibernate21.Tests/Spring.Data.NHibernate21.Tests.dll.config b/test/Spring/Spring.Data.NHibernate21.Tests/Spring.Data.NHibernate21.Tests.dll.config
new file mode 100644
index 00000000..3f8da4d1
--- /dev/null
+++ b/test/Spring/Spring.Data.NHibernate21.Tests/Spring.Data.NHibernate21.Tests.dll.config
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+  <configSections>
+    <sectionGroup name="common">
+      <section name="logging" type="Common.Logging.ConfigurationSectionHandler, Common.Logging" />
+    </sectionGroup>
+    <sectionGroup name="spring">
+      <section name="parsers" type="Spring.Context.Support.NamespaceParsersSectionHandler, Spring.Core" />
+    </sectionGroup>
+  </configSections>
+
+<!--
+  <common>
+    <logging>
+      <factoryAdapter type="Common.Logging.Log4Net.Log4NetLoggerFactoryAdapter, Common.Logging.Log4Net129">
+        <arg key="configType" value="EXTERNAL" />
+      </factoryAdapter>
+    </logging>
+  </common>
+-->
+    
+  <spring>
+    <parsers>
+      <parser type="Spring.Data.Config.DatabaseNamespaceParser, Spring.Data"/>
+      <parser type="Spring.Transaction.Config.TxNamespaceParser, Spring.Data" />
+      <parser type="Spring.Aop.Config.AopNamespaceParser, Spring.Aop" />
+    </parsers>
+  </spring>
+
+</configuration>
\ No newline at end of file