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 00000000..22225220 Binary files /dev/null and b/lib/NHibernate21/net/2.0/LinFu.DynamicProxy.dll differ 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 @@ - - -