From 9fb46fd5fb96a0d9fa2117ebd59a14475223850f Mon Sep 17 00:00:00 2001 From: eeichinger Date: Wed, 5 Aug 2009 15:56:23 +0000 Subject: [PATCH] fixed NH21 integration ProxyFactoryFactory Bug --- .../Spring.Net.NHibernate21.2008.sln | 14 ++ common-project.include | 13 +- .../net/2.0/LinFu.DynamicProxy.dll | Bin 0 -> 20992 bytes lib/NHibernate21/net/2.0/LinFu.License.txt | 167 ++++++++++++++++++ .../net/2.0/NHibernate.Test.dll.config | 143 --------------- .../NHibernate/Bytecode/LazyInitializer.cs | 2 +- .../Data/NHibernate/Bytecode/ProxyFactory.cs | 13 +- .../Bytecode/ProxyFactoryFactory.cs | 4 - .../Spring.Data.NHibernate21.2008.csproj | 10 +- .../Spring.Messaging.Ems.2008.csproj | 23 +-- .../Spring.Messaging.Nms.2008.csproj | 3 +- .../LocalSessionFactoryObjectTests.cs | 4 +- .../AbstractInjectableUserTypeFixture.cs | 0 .../Data/NHibernate/Bytecode/Foo.Spechbm.xml | 0 .../Data/NHibernate/Bytecode/Foo.cs | 0 .../Data/NHibernate/Bytecode/IDelimiter.cs | 0 .../Bytecode/InjectableStringUserType.cs | 0 .../Bytecode/InjectableUserTypeFixture.cs | 0 .../Bytecode/NHibernateTestImports.cs | 34 ++++ .../Data/NHibernate/Bytecode/Product.cs | 0 .../NHibernate.Test.dll.config | 114 ++++++++++++ .../RecreateDatabases.sql | 12 ++ ...NHibernate21.Integration.Tests.2008.csproj | 29 ++- ....Data.NHibernate21.Integration.Tests.build | 18 ++ ....NHibernate21.Integration.Tests.dll.config | 24 +++ .../TestEnbeddedConfig.cfg.xml | 11 ++ ...Spring.Data.NHibernate21.Tests.2008.csproj | 11 +- 27 files changed, 451 insertions(+), 198 deletions(-) create mode 100644 lib/NHibernate21/net/2.0/LinFu.DynamicProxy.dll create mode 100644 lib/NHibernate21/net/2.0/LinFu.License.txt delete mode 100644 lib/NHibernate21/net/2.0/NHibernate.Test.dll.config rename test/Spring/{Spring.Data.NHibernate21.Tests => Spring.Data.NHibernate21.Integration.Tests}/Data/NHibernate/Bytecode/AbstractInjectableUserTypeFixture.cs (100%) rename test/Spring/{Spring.Data.NHibernate21.Tests => Spring.Data.NHibernate21.Integration.Tests}/Data/NHibernate/Bytecode/Foo.Spechbm.xml (100%) rename test/Spring/{Spring.Data.NHibernate21.Tests => Spring.Data.NHibernate21.Integration.Tests}/Data/NHibernate/Bytecode/Foo.cs (100%) rename test/Spring/{Spring.Data.NHibernate21.Tests => Spring.Data.NHibernate21.Integration.Tests}/Data/NHibernate/Bytecode/IDelimiter.cs (100%) rename test/Spring/{Spring.Data.NHibernate21.Tests => Spring.Data.NHibernate21.Integration.Tests}/Data/NHibernate/Bytecode/InjectableStringUserType.cs (100%) rename test/Spring/{Spring.Data.NHibernate21.Tests => Spring.Data.NHibernate21.Integration.Tests}/Data/NHibernate/Bytecode/InjectableUserTypeFixture.cs (100%) create mode 100644 test/Spring/Spring.Data.NHibernate21.Integration.Tests/Data/NHibernate/Bytecode/NHibernateTestImports.cs rename test/Spring/{Spring.Data.NHibernate21.Tests => Spring.Data.NHibernate21.Integration.Tests}/Data/NHibernate/Bytecode/Product.cs (100%) create mode 100644 test/Spring/Spring.Data.NHibernate21.Integration.Tests/NHibernate.Test.dll.config create mode 100644 test/Spring/Spring.Data.NHibernate21.Integration.Tests/TestEnbeddedConfig.cfg.xml diff --git a/build-support/solutions/Spring.Net.NHibernate21.2008.sln b/build-support/solutions/Spring.Net.NHibernate21.2008.sln index 57252410..5617dace 100644 --- a/build-support/solutions/Spring.Net.NHibernate21.2008.sln +++ b/build-support/solutions/Spring.Net.NHibernate21.2008.sln @@ -2,8 +2,10 @@ 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 + ..\..\common-project.include = ..\..\common-project.include ..\..\Spring.build = ..\..\Spring.build ..\..\src\Spring\Spring.Data.NHibernate21\Spring.Data.NHibernate21.build = ..\..\src\Spring\Spring.Data.NHibernate21\Spring.Data.NHibernate21.build + ..\..\Spring.include = ..\..\Spring.include EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Core.2008", "..\..\src\Spring\Spring.Core\Spring.Core.2008.csproj", "{710961A3-0DF4-49E4-A26E-F5B9C044AC84}" @@ -24,6 +26,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Core.Tests.2008", ". EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Aop.Tests.2008", "..\..\test\Spring\Spring.Aop.Tests\Spring.Aop.Tests.2008.csproj", "{2111596A-0327-4C9D-8919-294FBD988A23}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Testing.NUnit.2008", "..\..\src\Spring\Spring.Testing.NUnit\Spring.Testing.NUnit.2008.csproj", "{ED204A7B-832F-44C7-BFE3-504AEBE1BCC8}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|.NET = Debug|.NET @@ -134,6 +138,16 @@ Global {2111596A-0327-4C9D-8919-294FBD988A23}.Release|Any CPU.Build.0 = Release|Any CPU {2111596A-0327-4C9D-8919-294FBD988A23}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU {2111596A-0327-4C9D-8919-294FBD988A23}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {ED204A7B-832F-44C7-BFE3-504AEBE1BCC8}.Debug|.NET.ActiveCfg = Debug|Any CPU + {ED204A7B-832F-44C7-BFE3-504AEBE1BCC8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {ED204A7B-832F-44C7-BFE3-504AEBE1BCC8}.Debug|Any CPU.Build.0 = Debug|Any CPU + {ED204A7B-832F-44C7-BFE3-504AEBE1BCC8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {ED204A7B-832F-44C7-BFE3-504AEBE1BCC8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {ED204A7B-832F-44C7-BFE3-504AEBE1BCC8}.Release|.NET.ActiveCfg = Release|Any CPU + {ED204A7B-832F-44C7-BFE3-504AEBE1BCC8}.Release|Any CPU.ActiveCfg = Release|Any CPU + {ED204A7B-832F-44C7-BFE3-504AEBE1BCC8}.Release|Any CPU.Build.0 = Release|Any CPU + {ED204A7B-832F-44C7-BFE3-504AEBE1BCC8}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {ED204A7B-832F-44C7-BFE3-504AEBE1BCC8}.Release|Mixed Platforms.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/common-project.include b/common-project.include index 1ef3d389..6e82dc08 100644 --- a/common-project.include +++ b/common-project.include @@ -185,7 +185,7 @@ ${tool.dir} : dir for tools --> - + @@ -229,11 +229,13 @@ ${tool.dir} : dir for tools + + - - + + @@ -255,11 +257,12 @@ ${tool.dir} : dir for tools + - + @@ -272,7 +275,7 @@ ${tool.dir} : dir for tools - + 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 0000000000000000000000000000000000000000..222252208bf79f91cbaf3cd75cb0bf5a609b8a11 GIT binary patch literal 20992 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 literal 0 HcmV?d00001 diff --git a/lib/NHibernate21/net/2.0/LinFu.License.txt b/lib/NHibernate21/net/2.0/LinFu.License.txt new file mode 100644 index 00000000..e4c8db14 --- /dev/null +++ b/lib/NHibernate21/net/2.0/LinFu.License.txt @@ -0,0 +1,167 @@ +The LinFu Library, (c) 2007 Philip Laureano, is subject to the terms of the following license: + + GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + + This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + + 0. Additional Definitions. + + As used herein, "this License" refers to version 3 of the GNU Lesser +General Public License, and the "GNU GPL" refers to version 3 of the GNU +General Public License. + + "The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + + An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + + A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". + + The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + + The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + + 1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + + 2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the object code with a copy of the GNU GPL and this license + document. + + 4. Combined Works. + + You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: + + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the Combined Work with a copy of the GNU GPL and this license + document. + + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + + d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + a copy of the Library already present on the user's computer + system, and (b) will operate properly with a modified version + of the Library that is interface-compatible with the Linked + Version. + + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.) + + 5. Combined Libraries. + + 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 that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions +of the GNU 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 as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. + + If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library. diff --git a/lib/NHibernate21/net/2.0/NHibernate.Test.dll.config b/lib/NHibernate21/net/2.0/NHibernate.Test.dll.config deleted file mode 100644 index a3ce0d1a..00000000 --- a/lib/NHibernate21/net/2.0/NHibernate.Test.dll.config +++ /dev/null @@ -1,143 +0,0 @@ - - - -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - NHibernate.Test.DebugConnectionProvider, NHibernate.Test - NHibernate.Cache.HashtableCacheProvider, NHibernate - true - false - - 10 - ReadCommitted - none - true - - - NHibernate.Driver.SqlClientDriver - NHibernate.Dialect.MsSql2005Dialect - Server=(local);initial catalog=nhibernate;Integrated Security=SSPI - - false - true - 444 - true 1, false 0, yes 'Y', no 'N' - false - - Spring.Data.NHibernate.ByteCode.LinFu.ProxyFactoryFactory, NHibernate.ByteCode.LinFu - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Spring/Spring.Data.NHibernate21/Data/NHibernate/Bytecode/LazyInitializer.cs b/src/Spring/Spring.Data.NHibernate21/Data/NHibernate/Bytecode/LazyInitializer.cs index ae06082d..4b2e2123 100644 --- a/src/Spring/Spring.Data.NHibernate21/Data/NHibernate/Bytecode/LazyInitializer.cs +++ b/src/Spring/Spring.Data.NHibernate21/Data/NHibernate/Bytecode/LazyInitializer.cs @@ -57,7 +57,7 @@ namespace Spring.Data.NHibernate.Bytecode MethodInfo setIdentifierMethod, IAbstractComponentType componentIdType, ISessionImplementor session) : base( - entityName, persistentClass.IsInterface ? typeof(object) : persistentClass, id, getIdentifierMethod, + entityName, persistentClass, id, getIdentifierMethod, setIdentifierMethod, componentIdType, session) { } #region Implementation of IInterceptor diff --git a/src/Spring/Spring.Data.NHibernate21/Data/NHibernate/Bytecode/ProxyFactory.cs b/src/Spring/Spring.Data.NHibernate21/Data/NHibernate/Bytecode/ProxyFactory.cs index 8a34ac6f..17905e08 100644 --- a/src/Spring/Spring.Data.NHibernate21/Data/NHibernate/Bytecode/ProxyFactory.cs +++ b/src/Spring/Spring.Data.NHibernate21/Data/NHibernate/Bytecode/ProxyFactory.cs @@ -1,6 +1,4 @@ #if NH_2_1 -using System; - #region License /* @@ -21,16 +19,12 @@ using System; #endregion -#region Imports - +using System; using Common.Logging; - using NHibernate; using NHibernate.Engine; using NHibernate.Proxy; -#endregion - namespace Spring.Data.NHibernate.Bytecode { /// @@ -66,12 +60,13 @@ namespace Spring.Data.NHibernate.Bytecode { try { - LazyInitializer initializer = new LazyInitializer(EntityName, PersistentClass.IsInterface ? typeof(object) : PersistentClass, + // PersistentClass = PersistentClass.IsInterface ? typeof(object) : PersistentClass + LazyInitializer initializer = new LazyInitializer(EntityName, PersistentClass, id, GetIdentifierMethod, SetIdentifierMethod, ComponentIdType, session); SerializableProxyFactory proxyFactory = new SerializableProxyFactory(); proxyFactory.Interfaces = Interfaces; -// proxyFactory.TargetSource = initializer; + proxyFactory.TargetSource = initializer; proxyFactory.ProxyTargetType = IsClassProxy; proxyFactory.AddAdvice(initializer); diff --git a/src/Spring/Spring.Data.NHibernate21/Data/NHibernate/Bytecode/ProxyFactoryFactory.cs b/src/Spring/Spring.Data.NHibernate21/Data/NHibernate/Bytecode/ProxyFactoryFactory.cs index dbfda121..693876a5 100644 --- a/src/Spring/Spring.Data.NHibernate21/Data/NHibernate/Bytecode/ProxyFactoryFactory.cs +++ b/src/Spring/Spring.Data.NHibernate21/Data/NHibernate/Bytecode/ProxyFactoryFactory.cs @@ -34,8 +34,6 @@ namespace Spring.Data.NHibernate.Bytecode /// Erich Eichinger public class ProxyFactoryFactory : IProxyFactoryFactory { - #region IProxyFactoryFactory Members - /// /// Build a proxy factory specifically for handling runtime lazy loading. /// @@ -51,8 +49,6 @@ namespace Spring.Data.NHibernate.Bytecode { get { return new DynProxyTypeValidator(); } } - - #endregion } } #endif \ 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 index 46db4c54..588bb3e5 100644 --- a/src/Spring/Spring.Data.NHibernate21/Spring.Data.NHibernate21.2008.csproj +++ b/src/Spring/Spring.Data.NHibernate21/Spring.Data.NHibernate21.2008.csproj @@ -19,7 +19,7 @@ TRACE;DEBUG;NET_2_0,NH_2_1 prompt 4 - ..\..\..\build\VS.Net.2008\Spring.Data.NHibernate21\Debug\Spring.Data.NHibernate21.xml + Spring.Data.NHibernate21.xml true @@ -33,10 +33,18 @@ 4 + + False + ..\..\..\lib\NHibernate21\net\2.0\Antlr3.Runtime.dll + False ..\..\..\lib\Net\2.0\Common.Logging.dll + + False + ..\..\..\lib\NHibernate21\net\2.0\Iesi.Collections.dll + False ..\..\..\lib\NHibernate21\net\2.0\log4net.dll diff --git a/src/Spring/Spring.Messaging.Ems/Spring.Messaging.Ems.2008.csproj b/src/Spring/Spring.Messaging.Ems/Spring.Messaging.Ems.2008.csproj index 2ab998f0..02bc5da5 100644 --- a/src/Spring/Spring.Messaging.Ems/Spring.Messaging.Ems.2008.csproj +++ b/src/Spring/Spring.Messaging.Ems/Spring.Messaging.Ems.2008.csproj @@ -9,26 +9,7 @@ Properties Spring Spring.Messaging.Ems - - - 2.0 - - - http://localhost/Spring.Messaging.Ems/ - true - Web - true - Foreground - 7 - Days - false - false - true - 0 - 1.0.0.%2a - true - false - true + v2.0 true @@ -38,7 +19,7 @@ TRACE;DEBUG;NET_2_0 prompt 4 - ..\..\..\build\VS.NET.2008\Spring.Messaging.Ems\Debug\Spring.Messaging.Ems.xml + Spring.Messaging.Ems.xml true 1591,0618 diff --git a/src/Spring/Spring.Messaging.Nms/Spring.Messaging.Nms.2008.csproj b/src/Spring/Spring.Messaging.Nms/Spring.Messaging.Nms.2008.csproj index c1ce2d31..65fd4eff 100644 --- a/src/Spring/Spring.Messaging.Nms/Spring.Messaging.Nms.2008.csproj +++ b/src/Spring/Spring.Messaging.Nms/Spring.Messaging.Nms.2008.csproj @@ -21,6 +21,7 @@ 4 Spring.Messaging.Nms.xml true + pdbonly @@ -119,7 +120,7 @@ - + + + + + + + + + + + + + + + + NHibernate.Test.DebugConnectionProvider, NHibernate.Test + NHibernate.Cache.HashtableCacheProvider, NHibernate + true + false + + 10 + ReadCommitted + none + true + + + NHibernate.Driver.SqlClientDriver + NHibernate.Dialect.MsSql2005Dialect + Server=SPRINGQA;initial catalog=nhibernate;Integrated Security=SSPI + + false + true + 444 + true 1, false 0, yes 'Y', no 'N' + false + + + Spring.Data.NHibernate.Bytecode.ProxyFactoryFactory, Spring.Data.NHibernate21 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/test/Spring/Spring.Data.NHibernate21.Integration.Tests/RecreateDatabases.sql b/test/Spring/Spring.Data.NHibernate21.Integration.Tests/RecreateDatabases.sql index 347e8482..e6308104 100644 --- a/test/Spring/Spring.Data.NHibernate21.Integration.Tests/RecreateDatabases.sql +++ b/test/Spring/Spring.Data.NHibernate21.Integration.Tests/RecreateDatabases.sql @@ -8,12 +8,24 @@ BEGIN END GO +IF EXISTS (SELECT name FROM sys.databases WHERE name = N'NHibernate') +BEGIN + ALTER DATABASE NHibernate + SET SINGLE_USER + WITH ROLLBACK IMMEDIATE + + DROP DATABASE NHibernate +END +GO + IF EXISTS (SELECT * FROM sys.server_principals WHERE name = N'springqa2') DROP LOGIN [springqa2] GO CREATE DATABASE Spring GO +CREATE DATABASE NHibernate +GO CREATE LOGIN [springqa2] WITH PASSWORD=N'springqa2', DEFAULT_DATABASE=[Spring], DEFAULT_LANGUAGE=[us_english] GO 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 index 2a6e4d93..20dc7aa4 100644 --- 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 @@ -36,10 +36,18 @@ False ..\..\..\lib\Net\2.0\Common.Logging.dll + + False + ..\..\..\lib\Net\2.0\DotNetMock.dll + False ..\..\..\lib\NHibernate21\net\2.0\Iesi.Collections.dll + + False + ..\..\..\lib\NHibernate21\net\2.0\LinFu.DynamicProxy.dll + False ..\..\..\lib\NHibernate21\net\2.0\log4net.dll @@ -61,7 +69,10 @@ ..\..\..\lib\Net\2.0\nunit.framework.dll + + + @@ -122,6 +133,13 @@ Data\NHibernate\TestObject.cs + + + + + + + @@ -132,6 +150,9 @@ Data\NHibernate\testObject.sql + + Always + @@ -145,7 +166,7 @@ Spring.Core.2008 - {71368632-B8B7-4A6A-8C65-8DA848120C82} + {E57B4652-0231-49CB-B058-87E10EFE540D} Spring.Data.NHibernate21.2008 @@ -174,6 +195,12 @@ + + + + Always + + + + + + + + + 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 index 126e7873..8756ea13 100644 --- 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 @@ -9,6 +9,30 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/test/Spring/Spring.Data.NHibernate21.Integration.Tests/TestEnbeddedConfig.cfg.xml b/test/Spring/Spring.Data.NHibernate21.Integration.Tests/TestEnbeddedConfig.cfg.xml new file mode 100644 index 00000000..2d1cd7ea --- /dev/null +++ b/test/Spring/Spring.Data.NHibernate21.Integration.Tests/TestEnbeddedConfig.cfg.xml @@ -0,0 +1,11 @@ + + + + NHibernate.Test.DebugConnectionProvider, NHibernate.Test + NHibernate.Cache.HashtableCacheProvider, NHibernate + NHibernate.Driver.SqlClientDriver + Server=localhost;initial catalog=nhibernate;User Id=;Password= + true 1, false 0, yes 1, no 0 + NHibernate.Dialect.MsSql2000Dialect + + \ 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 index 9547b3dd..24b6618d 100644 --- 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 @@ -91,12 +91,6 @@ Data\NHibernate\TestObject.cs - - - - - - @@ -114,7 +108,7 @@ Spring.Core.2008 - {71368632-B8B7-4A6A-8C65-8DA848120C82} + {E57B4652-0231-49CB-B058-87E10EFE540D} Spring.Data.NHibernate21.2008 @@ -133,9 +127,6 @@ - - -