Permalink
Browse files

SPRNET-1504 Support NHibernate 3.3.0 GA

  • Loading branch information...
1 parent 6af7952 commit 29be537043f6e431dab6dbfd211abcd1b813729c @lahma lahma committed Apr 22, 2012
Showing with 3,701 additions and 331 deletions.
  1. +2 −2 .gitignore
  2. +24 −0 Spring.Net.2008.sln
  3. +276 −252 Spring.Net.2010.sln
  4. +34 −17 Spring.build
  5. +84 −48 build-support/solutions/Spring.Net.NHibernate.2010.sln
  6. BIN lib/NHibernate33/net/3.5/Iesi.Collections.dll
  7. +9 −0 lib/NHibernate33/net/3.5/Iesi.Collections.license.txt
  8. BIN lib/NHibernate33/net/3.5/NHibernate.dll
  9. +460 −0 lib/NHibernate33/net/3.5/NHibernate.license.txt
  10. BIN lib/NHibernate33/net/4.0/Iesi.Collections.dll
  11. +9 −0 lib/NHibernate33/net/4.0/Iesi.Collections.license.txt
  12. BIN lib/NHibernate33/net/4.0/NHibernate.dll
  13. +460 −0 lib/NHibernate33/net/4.0/NHibernate.license.txt
  14. BIN lib/Net/2.0/log4net.dll
  15. +5 −0 src/Spring/Spring.Data.NHibernate33/AssemblyInfo.cs
  16. +1 −0 src/Spring/Spring.Data.NHibernate33/Data/NHibernate/Bytecode/dontdelete.txt
  17. +1 −0 src/Spring/Spring.Data.NHibernate33/Data/NHibernate/Generic/dontdelete.txt
  18. +1 −0 src/Spring/Spring.Data.NHibernate33/Data/NHibernate/Support/dontdelete.txt
  19. +203 −0 src/Spring/Spring.Data.NHibernate33/Spring.Data.NHibernate33.2008.csproj
  20. +245 −0 src/Spring/Spring.Data.NHibernate33/Spring.Data.NHibernate33.2010.csproj
  21. +47 −0 src/Spring/Spring.Data.NHibernate33/Spring.Data.NHibernate33.build
  22. +31 −0 src/Spring/Spring.Data.NHibernate33/Spring.Data.NHibernate33.nuspec
  23. +2 −2 ...Spring.Data.NHibernate32.Integration.Tests/Spring.Data.NHibernate32.Integration.Tests.2008.csproj
  24. +2 −3 ...Spring.Data.NHibernate32.Integration.Tests/Spring.Data.NHibernate32.Integration.Tests.2010.csproj
  25. +0 −4 test/Spring/Spring.Data.NHibernate32.Tests/Spring.Data.NHibernate32.Tests.2008.csproj
  26. +0 −3 test/Spring/Spring.Data.NHibernate32.Tests/Spring.Data.NHibernate32.Tests.2010.csproj
  27. +4 −0 test/Spring/Spring.Data.NHibernate33.Integration.Tests/AssemblyInfo.cs
  28. +15 −0 test/Spring/Spring.Data.NHibernate33.Integration.Tests/Data/NHibernate/Bytecode/Foo.Spechbm.xml
  29. +10 −0 test/Spring/Spring.Data.NHibernate33.Integration.Tests/Data/NHibernate/Credit.hbm.xml
  30. +63 −0 test/Spring/Spring.Data.NHibernate33.Integration.Tests/Data/NHibernate/Dao.xml
  31. +10 −0 test/Spring/Spring.Data.NHibernate33.Integration.Tests/Data/NHibernate/Debit.hbm.xml
  32. +129 −0 test/Spring/Spring.Data.NHibernate33.Integration.Tests/Data/NHibernate/MultipleDbTests.xml
  33. +122 −0 test/Spring/Spring.Data.NHibernate33.Integration.Tests/Data/NHibernate/NHDAOTests.xml
  34. +17 −0 test/Spring/Spring.Data.NHibernate33.Integration.Tests/Data/NHibernate/TestObject.hbm.xml
  35. +110 −0 test/Spring/Spring.Data.NHibernate33.Integration.Tests/Data/NHibernate/dbProviderTemplateTests.xml
  36. +124 −0 test/Spring/Spring.Data.NHibernate33.Integration.Tests/Data/NHibernate/templateTests.xml
  37. +208 −0 ...Spring.Data.NHibernate33.Integration.Tests/Spring.Data.NHibernate33.Integration.Tests.2008.csproj
  38. +247 −0 ...Spring.Data.NHibernate33.Integration.Tests/Spring.Data.NHibernate33.Integration.Tests.2010.csproj
  39. +59 −0 ...pring/Spring.Data.NHibernate33.Integration.Tests/Spring.Data.NHibernate33.Integration.Tests.build
  40. +40 −0 .../Spring.Data.NHibernate33.Integration.Tests/Spring.Data.NHibernate33.Integration.Tests.dll.config
  41. +5 −0 test/Spring/Spring.Data.NHibernate33.Tests/AssemblyInfo.cs
  42. +102 −0 test/Spring/Spring.Data.NHibernate33.Tests/Data/NHibernate/Config/AopConfiguration.xml
  43. +100 −0 test/Spring/Spring.Data.NHibernate33.Tests/Data/NHibernate/Config/AopConfigurationTxPointcut.xml
  44. +17 −0 test/Spring/Spring.Data.NHibernate33.Tests/Data/NHibernate/TestObject.hbm.xml
  45. +137 −0 test/Spring/Spring.Data.NHibernate33.Tests/Spring.Data.NHibernate33.Tests.2008.csproj
  46. +181 −0 test/Spring/Spring.Data.NHibernate33.Tests/Spring.Data.NHibernate33.Tests.2010.csproj
  47. +75 −0 test/Spring/Spring.Data.NHibernate33.Tests/Spring.Data.NHibernate33.Tests.build
  48. +30 −0 test/Spring/Spring.Data.NHibernate33.Tests/Spring.Data.NHibernate33.Tests.dll.config
View
@@ -50,12 +50,12 @@ PrecompiledWeb
*.dotCover
/src/Spring/Spring.Aop/Spring.Aop.xml
/src/Spring/Spring.Core/Spring.Core.xml
-/src/Spring/Spring.Data.NHibernate12/Spring.Data.NHibernate12.xml
/src/Spring/Spring.Data.NHibernate20/Spring.Data.NHibernate20.xml
/src/Spring/Spring.Data.NHibernate21/Spring.Data.NHibernate21.xml
/src/Spring/Spring.Data.NHibernate30/Spring.Data.NHibernate30.xml
/src/Spring/Spring.Data.NHibernate31/Spring.Data.NHibernate31.xml
/src/Spring/Spring.Data.NHibernate32/Spring.Data.NHibernate32.xml
+/src/Spring/Spring.Data.NHibernate33/Spring.Data.NHibernate33.xml
/src/Spring/Spring.Messaging.Nms/Spring.Messaging.Nms.xml
/src/Spring/Spring.Messaging/Spring.Messaging.xml
/src/Spring/Spring.Data/Spring.Data.xml
@@ -65,4 +65,4 @@ PrecompiledWeb
/src/Spring/Spring.Testing.NUnit/Spring.Testing.NUnit.xml
/src/Spring/Spring.Services/Spring.Services.xml
/src/Spring/Spring.Web.Extensions/Spring.Web.Extensions.xml
-/src/Spring/GenCommonAssemblyInfo.cs
+/src/Spring/GenCommonAssemblyInfo.cs
View
@@ -62,6 +62,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Data.NHibernate32.20
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Data.NHibernate32.Tests.2008", "test\Spring\Spring.Data.NHibernate32.Tests\Spring.Data.NHibernate32.Tests.2008.csproj", "{231512F3-4F1D-45E1-BADE-D01F68DB9A80}"
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Data.NHibernate33.2008", "src\Spring\Spring.Data.NHibernate33\Spring.Data.NHibernate33.2008.csproj", "{67EA5988-C54E-4348-BFFB-E4A61F26143C}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Data.NHibernate33.Tests.2008", "test\Spring\Spring.Data.NHibernate33.Tests\Spring.Data.NHibernate33.Tests.2008.csproj", "{B48B00A6-8E4C-4953-9B82-7121A08AC57C}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|.NET = Debug|.NET
@@ -360,6 +364,26 @@ Global
{231512F3-4F1D-45E1-BADE-D01F68DB9A80}.Release|Any CPU.Build.0 = Release|Any CPU
{231512F3-4F1D-45E1-BADE-D01F68DB9A80}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{231512F3-4F1D-45E1-BADE-D01F68DB9A80}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+ {67EA5988-C54E-4348-BFFB-E4A61F26143C}.Debug|.NET.ActiveCfg = Debug|Any CPU
+ {67EA5988-C54E-4348-BFFB-E4A61F26143C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {67EA5988-C54E-4348-BFFB-E4A61F26143C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {67EA5988-C54E-4348-BFFB-E4A61F26143C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {67EA5988-C54E-4348-BFFB-E4A61F26143C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+ {67EA5988-C54E-4348-BFFB-E4A61F26143C}.Release|.NET.ActiveCfg = Release|Any CPU
+ {67EA5988-C54E-4348-BFFB-E4A61F26143C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {67EA5988-C54E-4348-BFFB-E4A61F26143C}.Release|Any CPU.Build.0 = Release|Any CPU
+ {67EA5988-C54E-4348-BFFB-E4A61F26143C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {67EA5988-C54E-4348-BFFB-E4A61F26143C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+ {B48B00A6-8E4C-4953-9B82-7121A08AC57C}.Debug|.NET.ActiveCfg = Debug|Any CPU
+ {B48B00A6-8E4C-4953-9B82-7121A08AC57C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {B48B00A6-8E4C-4953-9B82-7121A08AC57C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {B48B00A6-8E4C-4953-9B82-7121A08AC57C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {B48B00A6-8E4C-4953-9B82-7121A08AC57C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+ {B48B00A6-8E4C-4953-9B82-7121A08AC57C}.Release|.NET.ActiveCfg = Release|Any CPU
+ {B48B00A6-8E4C-4953-9B82-7121A08AC57C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {B48B00A6-8E4C-4953-9B82-7121A08AC57C}.Release|Any CPU.Build.0 = Release|Any CPU
+ {B48B00A6-8E4C-4953-9B82-7121A08AC57C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {B48B00A6-8E4C-4953-9B82-7121A08AC57C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
View
Oops, something went wrong.
View
@@ -386,6 +386,7 @@ Commandline Examples:
<target name="compile-test"> <!-- used as configurable template by all compile-{net|mono|netcf}-x.x targets -->
<property name="lib.dir" value="${spring.basedir}/lib/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}"/>
<property name="nh32.lib.dir" value="${spring.basedir}/lib/NHibernate32/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}"/>
+ <property name="nh33.lib.dir" value="${spring.basedir}/lib/NHibernate33/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}"/>
<property name="quartz.lib.dir" value="${spring.basedir}/lib/Quartz10/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}"/>
<property name="quartz20.lib.dir" value="${spring.basedir}/lib/Quartz20/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}"/>
<call target="copylibtobin"/>
@@ -400,6 +401,7 @@ Commandline Examples:
<nant buildfile="src/Spring/Spring.Data/Spring.Data.build" target="build" if="${build-data}"/>
<nant buildfile="src/Spring/Spring.Data.NHibernate32/Spring.Data.NHibernate32.build" target="build" if="${build-data}"/>
+ <nant buildfile="src/Spring/Spring.Data.NHibernate33/Spring.Data.NHibernate33.build" target="build" if="${build-data}"/>
<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-nunit}"/>
@@ -422,6 +424,8 @@ Commandline Examples:
<nant buildfile="test/Spring/Spring.Data.NHibernate32.Tests/Spring.Data.NHibernate32.Tests.build" target="test" if="${build-data}"/>
<nant buildfile="test/Spring/Spring.Data.NHibernate32.Integration.Tests/Spring.Data.NHibernate32.Integration.Tests.build" target="test" if="${build-data}"/>
+ <nant buildfile="test/Spring/Spring.Data.NHibernate33.Tests/Spring.Data.NHibernate33.Tests.build" target="test" if="${build-data}"/>
+ <nant buildfile="test/Spring/Spring.Data.NHibernate33.Integration.Tests/Spring.Data.NHibernate33.Integration.Tests.build" target="test" if="${build-data}"/>
<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}"/>
@@ -656,6 +660,8 @@ Commandline Examples:
<delete dir="src/Spring/Spring.Data/bin" failonerror="false"/>
<delete dir="src/Spring/Spring.Data.NHibernate32/obj" failonerror="false"/>
<delete dir="src/Spring/Spring.Data.NHibernate32/bin" failonerror="false"/>
+ <delete dir="src/Spring/Spring.Data.NHibernate33/obj" failonerror="false"/>
+ <delete dir="src/Spring/Spring.Data.NHibernate33/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"/>
@@ -691,6 +697,10 @@ Commandline Examples:
<delete dir="test/Spring/Spring.Data.NHibernate32.Tests/bin" failonerror="false"/>
<delete dir="test/Spring/Spring.Data.NHibernate32.Integration.Tests/obj" failonerror="false"/>
<delete dir="test/Spring/Spring.Data.NHibernate32.Integration.Tests/bin" failonerror="false"/>
+ <delete dir="test/Spring/Spring.Data.NHibernate33.Tests/obj" failonerror="false"/>
+ <delete dir="test/Spring/Spring.Data.NHibernate33.Tests/bin" failonerror="false"/>
+ <delete dir="test/Spring/Spring.Data.NHibernate33.Integration.Tests/obj" failonerror="false"/>
+ <delete dir="test/Spring/Spring.Data.NHibernate33.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"/>
@@ -1050,7 +1060,19 @@ Commandline Examples:
<exclude name="mono/**"/>
</fileset>
</copy>
- </if>
+ </if>
+
+ <mkdir dir="${current.package.dir}/lib/NHibernate33"/>
+ <if test="${property::exists('build.allnamespaces') and not build.allnamespaces}">
+ <copy todir="${current.package.dir}/lib/NHibernate33" verbose="${copy-verbose}">
+ <fileset basedir="lib/NHibernate33">
+ <include name="**/*.dll"/>
+ <include name="**/*.xml"/>
+ <include name="**/*.license.txt"/>
+ <exclude name="mono/**"/>
+ </fileset>
+ </copy>
+ </if>
<if test="${property::exists('build.allnamespaces') and build.allnamespaces}">
<copy todir="${current.package.dir}/lib" verbose="${copy-verbose}">
@@ -1184,9 +1206,9 @@ Commandline Examples:
<include name="*/*/Spring.Data.xml"/>
<include name="*/*/Spring.Data.pdb"/>
- <include name="*/*/Spring.Data.NHibernate32.dll"/>
- <include name="*/*/Spring.Data.NHibernate32.xml"/>
- <include name="*/*/Spring.Data.NHibernate32.pdb"/>
+ <include name="*/*/Spring.Data.NHibernate*.dll"/>
+ <include name="*/*/Spring.Data.NHibernate*.xml"/>
+ <include name="*/*/Spring.Data.NHibernate*.pdb"/>
<include name="*/*/Spring.Web.dll"/>
<include name="*/*/Spring.Web.xml"/>
@@ -1266,17 +1288,9 @@ Commandline Examples:
<include name="*/Spring.Web.Extensions.xml"/>
<include name="*/Spring.Web.Extensions.pdb"/>
- <include name="*/Spring.Data.NHibernate30.dll"/>
- <include name="*/Spring.Data.NHibernate30.xml"/>
- <include name="*/Spring.Data.NHibernate30.pdb"/>
-
- <include name="*/Spring.Data.NHibernate31.dll"/>
- <include name="*/Spring.Data.NHibernate31.xml"/>
- <include name="*/Spring.Data.NHibernate31.pdb"/>
-
- <include name="*/Spring.Data.NHibernate32.dll"/>
- <include name="*/Spring.Data.NHibernate32.xml"/>
- <include name="*/Spring.Data.NHibernate32.pdb"/>
+ <include name="*/Spring.Data.NHibernate*.dll"/>
+ <include name="*/Spring.Data.NHibernate*.xml"/>
+ <include name="*/Spring.Data.NHibernate*.pdb"/>
</fileset>
</copy>
@@ -1461,12 +1475,13 @@ Commandline Examples:
<include name="src/Spring/Spring.Core/**"/>
<include name="src/Spring/Spring.Aop/**"/>
<include name="src/Spring/Spring.Web/**"/>
- <include name="src/Spring/Spring.Web.Mvc/**"/>
- <include name="src/Spring/Spring.Web.Mvc3/**"/>
+ <include name="src/Spring/Spring.Web.Mvc/**"/>
+ <include name="src/Spring/Spring.Web.Mvc3/**"/>
<include name="src/Spring/Spring.Web.Extensions/**"/>
<include name="src/Spring/Spring.Services/**"/>
<include name="src/Spring/Spring.Data/**"/>
<include name="src/Spring/Spring.Data.NHibernate32/**"/>
+ <include name="src/Spring/Spring.Data.NHibernate33/**"/>
<include name="src/Spring/Spring.Messaging/**"/>
<include name="src/Spring/Spring.Messaging.Nms/**"/>
<include name="src/Spring/Spring.Messaging.Ems/**"/>
@@ -1487,6 +1502,8 @@ Commandline Examples:
<include name="test/Spring/Spring.Data.Integration.Tests/**"/>
<include name="test/Spring/Spring.Data.NHibernate32.Tests/**"/>
<include name="test/Spring/Spring.Data.NHibernate32.Integration.Tests/**"/>
+ <include name="test/Spring/Spring.Data.NHibernate33.Tests/**"/>
+ <include name="test/Spring/Spring.Data.NHibernate33.Integration.Tests/**"/>
<include name="test/Spring/Spring.Messaging.Tests/**"/>
<include name="test/Spring/Spring.Messaging.Nms.Tests/**"/>
<include name="test/Spring/Spring.Messaging.Nms.Integration.Tests/**"/>
Oops, something went wrong.

0 comments on commit 29be537

Please sign in to comment.