diff --git a/Spring.build b/Spring.build index 0a9ea98f..f3f5c728 100644 --- a/Spring.build +++ b/Spring.build @@ -22,10 +22,15 @@ Build properties that may be set: signs all assemblies. Requires the key file $/Spring.Net.snk to be in place "package.version": set the package version -"build-testing-ems": - set to true if you want to build Tibco EMS support (you need to copy tibco.ems.dll and tibco.ems.admin.dll into /lib/net/2.0 first) -"build-testing-microsoft": - set to true if local machine has VS.NET 2008 MSTest installed (you need to copy Microsoft.VisualStudio.QualityTools.UnitTestFramework.dll to /lib/net/2.0 first) + +Additional Remarks: +=================== + +*) Building Spring.Messaging.Ems +if you want to build Spring.Messaging.Ems (Tibco EMS support), you need to copy tibco.ems.dll and tibco.ems.admin.dll into '/lib/net/2.0' + +*) Building Spring.Testing.Microsoft +if you want to build Spring.Testing.Microsoft (MSTest Support), you need to copy Microsoft.VisualStudio.QualityTools.UnitTestFramework.dll to '/lib/net/2.0' --> @@ -229,7 +234,8 @@ Build properties that may be set: - + + @@ -377,8 +383,8 @@ Build properties that may be set: - - + + @@ -403,10 +409,10 @@ Build properties that may be set: + if="${build-data and nant.settings.currentframework == 'net-3.5'}"/> - + @@ -427,13 +433,13 @@ Build properties that may be set: - - - - - - - + + + + + + + @@ -441,11 +447,11 @@ Build properties that may be set: depends="set-net-1.1-runtime-configuration, check-spring-basedir, clean-current-bin-dir, TestInit"> - - - - - + + + + + @@ -453,7 +459,6 @@ Build properties that may be set: depends="set-net-2.0-runtime-configuration, check-spring-basedir, clean-current-bin-dir, TestInit"> - @@ -461,12 +466,12 @@ Build properties that may be set: depends="set-net-3.0-runtime-configuration, check-spring-basedir, clean-current-bin-dir, TestInit"> - - - - - - + + + + + + @@ -474,12 +479,12 @@ Build properties that may be set: depends="set-net-3.5-runtime-configuration, check-spring-basedir, clean-current-bin-dir, TestInit"> - - - - - - + + + + + + @@ -487,9 +492,9 @@ Build properties that may be set: depends="set-mono-2.0-runtime-configuration, check-spring-basedir, clean-current-bin-dir, TestInit"> - - - + + + @@ -772,16 +777,16 @@ Build properties that may be set: - - + - + @@ -808,8 +813,6 @@ Build properties that may be set: - - @@ -836,7 +839,7 @@ Build properties that may be set: - + @@ -869,11 +872,13 @@ Build properties that may be set: - + + - + + @@ -1423,17 +1428,18 @@ Build properties that may be set: - - - - - - - - - - - + + + + + + + + + + + + @@ -1464,11 +1470,11 @@ Build properties that may be set: - + - + diff --git a/Spring.include b/Spring.include index c90f3f77..ce4772ed 100644 --- a/Spring.include +++ b/Spring.include @@ -30,7 +30,7 @@ hive="LocalMachine" unless="${property::exists('registry.net-3.0.installed')}" failonerror="false" /> - + @@ -207,7 +207,7 @@ - - - + + @@ -418,7 +418,7 @@ value="${sdkdoc.dir}/${framework::get-family(framework::get-target-framework())}/3.5"/> - + diff --git a/common-project.include b/common-project.include index 17937835..54d65bd5 100644 --- a/common-project.include +++ b/common-project.include @@ -5,7 +5,7 @@ + + @@ -265,12 +267,12 @@ ${tool.dir} : dir for tools - + - + diff --git a/src/Spring/Spring.Data.NHibernate/Spring.Data.NHibernate.build b/src/Spring/Spring.Data.NHibernate/Spring.Data.NHibernate.build index a62a2147..876ac7c5 100644 --- a/src/Spring/Spring.Data.NHibernate/Spring.Data.NHibernate.build +++ b/src/Spring/Spring.Data.NHibernate/Spring.Data.NHibernate.build @@ -7,7 +7,15 @@ * current.build.defines.csc - framework-specific build defines for C# compiler --> - + + + + + + + + + - - - - - - + + diff --git a/src/Spring/Spring.Data.NHibernate12/Spring.Data.NHibernate12.build b/src/Spring/Spring.Data.NHibernate12/Spring.Data.NHibernate12.build index 5494bffd..abc68325 100644 --- a/src/Spring/Spring.Data.NHibernate12/Spring.Data.NHibernate12.build +++ b/src/Spring/Spring.Data.NHibernate12/Spring.Data.NHibernate12.build @@ -8,6 +8,14 @@ --> + + + + + + + + - - - - - - + + diff --git a/src/Spring/Spring.Data.NHibernate20/Data/NHibernate/LocalSessionFactoryObject.cs b/src/Spring/Spring.Data.NHibernate20/Data/NHibernate/LocalSessionFactoryObject.cs index 8a6171d4..5d04e98c 100644 --- a/src/Spring/Spring.Data.NHibernate20/Data/NHibernate/LocalSessionFactoryObject.cs +++ b/src/Spring/Spring.Data.NHibernate20/Data/NHibernate/LocalSessionFactoryObject.cs @@ -34,7 +34,7 @@ using NHibernate.Dialect; using NHibernate.Engine; using NHibernate.Event; using NHibernate.Tool.hbm2ddl; - +using Spring.Context; using Spring.Core.IO; using Spring.Dao; using Spring.Dao.Attributes; @@ -73,8 +73,8 @@ namespace Spring.Data.NHibernate /// /// /// Mark Pollack (.NET) - /// $Id: LocalSessionFactoryObject.cs,v 1.2 2008/05/01 12:50:34 lahma Exp $ public class LocalSessionFactoryObject : IFactoryObject, IInitializingObject, IPersistenceExceptionTranslator, IDisposable + , IApplicationContextAware { #region Fields @@ -112,6 +112,8 @@ namespace Spring.Data.NHibernate private IAdoExceptionTranslator adoExceptionTranslator; + private IResourceLoader resourceLoader; + // Configuration time DB provider. // This will not be available after configuration has been done. private static IDbProvider configTimeDbProvider; @@ -142,6 +144,33 @@ namespace Spring.Data.NHibernate #region Properties /// + /// Setting the Application Context determines were resources are loaded from + /// + IApplicationContext IApplicationContextAware.ApplicationContext + { + set + { + this.ResourceLoader = value; + } + } + + /// + /// Gets or sets the to use for loading mapping assemblies etc. + /// + public IResourceLoader ResourceLoader + { + get + { + if (resourceLoader == null) + { + resourceLoader = new ConfigurableResourceLoader(); + } + return resourceLoader; + } + set { resourceLoader = value; } + } + + /// /// Sets the assemblies to load that contain mapping files. /// /// The mapping assemblies. @@ -387,6 +416,7 @@ namespace Spring.Data.NHibernate } } + #endregion #region Methods @@ -540,13 +570,11 @@ namespace Spring.Data.NHibernate } } - IResourceLoader resourceLoader = new ConfigurableResourceLoader(); - if (this.mappingResources != null) { foreach (string resourceName in mappingResources) { - config.AddInputStream(resourceLoader.GetResource(resourceName).InputStream); + config.AddInputStream(this.ResourceLoader.GetResource(resourceName).InputStream); } } diff --git a/src/Spring/Spring.Data.NHibernate20/Spring.Data.NHibernate20.2008.csproj b/src/Spring/Spring.Data.NHibernate20/Spring.Data.NHibernate20.2008.csproj index 1540ac02..4d275f63 100644 --- a/src/Spring/Spring.Data.NHibernate20/Spring.Data.NHibernate20.2008.csproj +++ b/src/Spring/Spring.Data.NHibernate20/Spring.Data.NHibernate20.2008.csproj @@ -2,7 +2,7 @@ Debug AnyCPU - 9.0.21022 + 9.0.30729 2.0 {71368632-B8B7-4A6A-8C65-8DA848120C82} Library @@ -153,6 +153,9 @@ Spring.Data.2008 + + + - + + + + + + + - + - - + + - - - - - - + + diff --git a/src/Spring/Spring.Data.NHibernate21/Data/NHibernate/Bytecode/BytecodeProvider.cs b/src/Spring/Spring.Data.NHibernate21/Data/NHibernate/Bytecode/BytecodeProvider.cs index 7f69543e..b0dfc1b5 100644 --- a/src/Spring/Spring.Data.NHibernate21/Data/NHibernate/Bytecode/BytecodeProvider.cs +++ b/src/Spring/Spring.Data.NHibernate21/Data/NHibernate/Bytecode/BytecodeProvider.cs @@ -1,7 +1,9 @@ +#if NH_2_1 + #region License /* - * Copyright © 2002-2005 the original author or authors. + * Copyright © 2002-2009 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,22 +20,16 @@ #endregion -#region Imports - using System; - using NHibernate.Bytecode; using NHibernate.Properties; using NHibernate.Type; - using Spring.Objects.Factory; -#endregion - namespace Spring.Data.NHibernate.Bytecode { /// - /// Bytecode provider using Spring Proxy + /// The Spring for .NET-backed ByteCodeprovider for NHibernate /// /// Fabio Maulo public class BytecodeProvider : IBytecodeProvider @@ -41,15 +37,18 @@ namespace Spring.Data.NHibernate.Bytecode private readonly IListableObjectFactory listableObjectFactory; private readonly IObjectsFactory objectsFactory; private readonly DefaultCollectionTypeFactory collectionTypefactory; + private readonly IProxyFactoryFactory proxyFactoryFactory; /// + /// Creates a new bytecode Provider instance using the specified object factory /// /// public BytecodeProvider(IListableObjectFactory listableObjectFactory) { this.listableObjectFactory = listableObjectFactory; - objectsFactory = new ObjectsFactory(listableObjectFactory); - collectionTypefactory = new DefaultCollectionTypeFactory(); + this.objectsFactory = new ObjectsFactory(listableObjectFactory); + this.collectionTypefactory = new DefaultCollectionTypeFactory(); + this.proxyFactoryFactory = new ProxyFactoryFactory(); } /// @@ -69,7 +68,7 @@ namespace Spring.Data.NHibernate.Bytecode /// public IProxyFactoryFactory ProxyFactoryFactory { - get { return new ProxyFactoryFactory(); } + get { return this.proxyFactoryFactory; } } /// @@ -80,7 +79,7 @@ namespace Spring.Data.NHibernate.Bytecode /// public IObjectsFactory ObjectsFactory { - get { return objectsFactory; } + get { return this.objectsFactory; } } /// @@ -88,8 +87,10 @@ namespace Spring.Data.NHibernate.Bytecode /// public ICollectionTypeFactory CollectionTypeFactory { - get { return collectionTypefactory; } + get { return this.collectionTypefactory; } } } -} \ No newline at end of file +} + +#endif \ No newline at end of file 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 036bab25..ae06082d 100644 --- a/src/Spring/Spring.Data.NHibernate21/Data/NHibernate/Bytecode/LazyInitializer.cs +++ b/src/Spring/Spring.Data.NHibernate21/Data/NHibernate/Bytecode/LazyInitializer.cs @@ -2,7 +2,7 @@ #region License /* - * Copyright © 2002-2005 the original author or authors. + * Copyright © 2002-2009 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,21 +19,15 @@ #endregion -#region Imports using System; using System.Reflection; - using AopAlliance.Intercept; - using NHibernate.Engine; using NHibernate.Proxy.Poco; using NHibernate.Type; - using Spring.Aop; using Spring.Reflection.Dynamic; -#endregion - namespace Spring.Data.NHibernate.Bytecode { /// @@ -43,8 +37,12 @@ namespace Spring.Data.NHibernate.Bytecode [Serializable] public class LazyInitializer : BasicLazyInitializer, IMethodInterceptor, ITargetSource { - private static readonly MethodInfo exceptionInternalPreserveStackTrace = - typeof(Exception).GetMethod("InternalPreserveStackTrace", BindingFlags.Instance | BindingFlags.NonPublic); + private static readonly MethodInfo exceptionInternalPreserveStackTrace; + + static LazyInitializer() + { + exceptionInternalPreserveStackTrace = typeof(Exception).GetMethod("InternalPreserveStackTrace", BindingFlags.Instance | BindingFlags.NonPublic); + } /// /// 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 8e71d7f3..8a34ac6f 100644 --- a/src/Spring/Spring.Data.NHibernate21/Data/NHibernate/Bytecode/ProxyFactory.cs +++ b/src/Spring/Spring.Data.NHibernate21/Data/NHibernate/Bytecode/ProxyFactory.cs @@ -71,7 +71,7 @@ namespace Spring.Data.NHibernate.Bytecode 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/Spring.Data.NHibernate21.2008.csproj b/src/Spring/Spring.Data.NHibernate21/Spring.Data.NHibernate21.2008.csproj index ae440f17..46db4c54 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 - Spring.Data.NHibernate21.xml + ..\..\..\build\VS.Net.2008\Spring.Data.NHibernate21\Debug\Spring.Data.NHibernate21.xml true @@ -41,7 +41,7 @@ False ..\..\..\lib\NHibernate21\net\2.0\log4net.dll - + False ..\..\..\lib\NHibernate21\net\2.0\NHibernate.dll @@ -169,6 +169,9 @@ Spring.Data.2008 + + + - + + + + + + + - + - + - - + + - - - - - - - - + + + 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 6c1569ac..b4262d0e 100644 --- a/test/Spring/Spring.Data.NHibernate.Tests/Data/NHibernate/LocalSessionFactoryObjectTests.cs +++ b/test/Spring/Spring.Data.NHibernate.Tests/Data/NHibernate/LocalSessionFactoryObjectTests.cs @@ -59,6 +59,11 @@ namespace Spring.Data.NHibernate properties.Add(Environment.ConnectionDriver, typeof(SqlClientDriver).AssemblyQualifiedName); properties.Add(Environment.ConnectionProvider, typeof(DriverConnectionProvider).AssemblyQualifiedName); +#if NH_2_1 + // since 2.1. "hbm2ddl.keywords = 'keywords'" is the default which causes the SessionFactory to connect to the db upon creation + // we don't want this in this unit test + properties.Add(Environment.Hbm2ddlKeyWords, "none"); +#endif sfo.HibernateProperties = properties; sfo.AfterPropertiesSet(); 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 3a96beb9..85f2c424 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 @@ -10,6 +10,15 @@ * current.build.defines.csc - framework-specific build defines --> + + + + + + + + + - - - - - + - - - - - + + + + @@ -44,13 +48,6 @@ - - - - - - - diff --git a/test/Spring/Spring.Data.NHibernate20.Tests/Spring.Data.NHibernate20.Tests.2008.csproj b/test/Spring/Spring.Data.NHibernate20.Tests/Spring.Data.NHibernate20.Tests.2008.csproj index dd289be1..608a1029 100644 --- a/test/Spring/Spring.Data.NHibernate20.Tests/Spring.Data.NHibernate20.Tests.2008.csproj +++ b/test/Spring/Spring.Data.NHibernate20.Tests/Spring.Data.NHibernate20.Tests.2008.csproj @@ -96,6 +96,7 @@ + Always 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 d6a72c86..3c8837f2 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 @@ -10,7 +10,16 @@ * current.build.defines.csc - framework-specific build defines --> - + + + + + + + + - - - + + + + + + - - - - - + - - - + + + @@ -44,13 +52,6 @@ - - - - - - - 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 e106d4cb..a26a7978 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 @@ -116,9 +116,18 @@ Data\NHibernate\creditdebit.sql + + + {5C649B55-1B3F-4C38-9998-1B043E94A244} + NHibernate.DomainModel + + + {7AEE5B37-C552-4E59-9B6F-88755BCB5070} + NHibernate.Test + {3A3A4E65-45A6-4B20-B460-0BEDC302C02C} Spring.Aop.2008 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 index c09c6e49..3b76927e 100644 --- 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 @@ -25,17 +25,15 @@ - - - - - - - - - - - + + + + + + + + + diff --git a/test/Spring/Spring.Data.NHibernate21.Tests/Data/NHibernate/Bytecode/AbstractInjectableUserTypeFixture.cs b/test/Spring/Spring.Data.NHibernate21.Tests/Data/NHibernate/Bytecode/AbstractInjectableUserTypeFixture.cs index e6f35d05..9454c928 100644 --- a/test/Spring/Spring.Data.NHibernate21.Tests/Data/NHibernate/Bytecode/AbstractInjectableUserTypeFixture.cs +++ b/test/Spring/Spring.Data.NHibernate21.Tests/Data/NHibernate/Bytecode/AbstractInjectableUserTypeFixture.cs @@ -1,6 +1,6 @@ -#if NH_2_1XX +#if NH_2_1 using log4net.Config; - +using NHibernate; using NHibernate.Bytecode; using NHibernate.Cfg; using NHibernate.Engine; @@ -39,7 +39,7 @@ namespace Spring.Data.NHibernate.Bytecode public void CreateDb() { InitializeServiceLocator(); - var cfg = new Configuration(); + Configuration cfg = new Configuration(); Environment.BytecodeProvider = GetBytecodeProvider(); cfg.Configure(); cfg.AddResource("uNhAddIns.Adapters.CommonTests.EnhancedBytecodeProvider.Foo.Spechbm.xml", @@ -64,18 +64,18 @@ namespace Spring.Data.NHibernate.Bytecode public void SaveObjectWithStringChangedToUpper() { object savedId; - Foo f = new Foo { Description = "something" }; + Foo f = new Foo("something"); - using (var s = sessions.OpenSession()) - using (var tx = s.BeginTransaction()) + using (ISession s = sessions.OpenSession()) + using (ITransaction tx = s.BeginTransaction()) { savedId = s.Save(f); tx.Commit(); } - using (var s = sessions.OpenSession()) + using (ISession s = sessions.OpenSession()) { - var upperFoo = s.Get(savedId); + Foo upperFoo = s.Get(savedId); Assert.AreEqual("[something]", upperFoo.Description); } @@ -86,18 +86,18 @@ namespace Spring.Data.NHibernate.Bytecode public void SaveNullPropertyAndGetItBack() { object savedId; - var f = new Foo(); + Foo f = new Foo(""); - using (var s = sessions.OpenSession()) - using (var tx = s.BeginTransaction()) + using (ISession s = sessions.OpenSession()) + using (ITransaction tx = s.BeginTransaction()) { savedId = s.Save(f); tx.Commit(); } - using (var s = sessions.OpenSession()) + using (ISession s = sessions.OpenSession()) { - var upperFoo = s.Get(savedId); + Foo upperFoo = s.Get(savedId); Assert.IsNull(upperFoo.Description); } diff --git a/test/Spring/Spring.Data.NHibernate21.Tests/Data/NHibernate/Bytecode/Foo.cs b/test/Spring/Spring.Data.NHibernate21.Tests/Data/NHibernate/Bytecode/Foo.cs index d48d07e8..7fb70613 100644 --- a/test/Spring/Spring.Data.NHibernate21.Tests/Data/NHibernate/Bytecode/Foo.cs +++ b/test/Spring/Spring.Data.NHibernate21.Tests/Data/NHibernate/Bytecode/Foo.cs @@ -1,9 +1,20 @@ -#if NH_2_1XX +#if NH_2_1 namespace Spring.Data.NHibernate.Bytecode { public class Foo { - public virtual string Description { get; set; } + private string _description; + + public Foo(string description) + { + _description = description; + } + + public virtual string Description + { + get { return _description; } + set { _description = value; } + } } } #endif \ No newline at end of file diff --git a/test/Spring/Spring.Data.NHibernate21.Tests/Data/NHibernate/Bytecode/IDelimiter.cs b/test/Spring/Spring.Data.NHibernate21.Tests/Data/NHibernate/Bytecode/IDelimiter.cs index be91aff4..ba22655d 100644 --- a/test/Spring/Spring.Data.NHibernate21.Tests/Data/NHibernate/Bytecode/IDelimiter.cs +++ b/test/Spring/Spring.Data.NHibernate21.Tests/Data/NHibernate/Bytecode/IDelimiter.cs @@ -1,4 +1,4 @@ -#if NH_2_1XX +#if NH_2_1 namespace Spring.Data.NHibernate.Bytecode { public interface IDelimiter diff --git a/test/Spring/Spring.Data.NHibernate21.Tests/Data/NHibernate/Bytecode/InjectableStringUserType.cs b/test/Spring/Spring.Data.NHibernate21.Tests/Data/NHibernate/Bytecode/InjectableStringUserType.cs index eec8f25f..3b555d94 100644 --- a/test/Spring/Spring.Data.NHibernate21.Tests/Data/NHibernate/Bytecode/InjectableStringUserType.cs +++ b/test/Spring/Spring.Data.NHibernate21.Tests/Data/NHibernate/Bytecode/InjectableStringUserType.cs @@ -1,4 +1,4 @@ -#if NH_2_1XX +#if NH_2_1 using System.Data; using NHibernate; using NHibernate.SqlTypes; @@ -17,7 +17,7 @@ namespace Spring.Data.NHibernate.Bytecode public object NullSafeGet(IDataReader rs, string[] names, object owner) { - var resultString = (string)NHibernateUtil.String.NullSafeGet(rs, names[0]); + string resultString = (string)NHibernateUtil.String.NullSafeGet(rs, names[0]); if (resultString != null) return delimiter.Delimit(resultString); return null; @@ -61,7 +61,7 @@ namespace Spring.Data.NHibernate.Bytecode { get { - return new[] { new SqlType(DbType.String) }; + return new SqlType[] { new SqlType(DbType.String) }; } } diff --git a/test/Spring/Spring.Data.NHibernate21.Tests/Data/NHibernate/Bytecode/InjectableUserTypeFixture.cs b/test/Spring/Spring.Data.NHibernate21.Tests/Data/NHibernate/Bytecode/InjectableUserTypeFixture.cs index 866edd1b..ec790298 100644 --- a/test/Spring/Spring.Data.NHibernate21.Tests/Data/NHibernate/Bytecode/InjectableUserTypeFixture.cs +++ b/test/Spring/Spring.Data.NHibernate21.Tests/Data/NHibernate/Bytecode/InjectableUserTypeFixture.cs @@ -1,4 +1,4 @@ -#if NH_2_1XX +#if NH_2_1 using NHibernate.Bytecode; using NUnit.Framework; @@ -10,7 +10,7 @@ using Spring.Objects.Factory.Support; namespace Spring.Data.NHibernate.Bytecode { - //[TestFixture] + [TestFixture, Explicit("requires database")] public class InjectableUserTypeFixture : AbstractInjectableUserTypeFixture { private IConfigurableListableObjectFactory objectFactory; @@ -32,14 +32,14 @@ namespace Spring.Data.NHibernate.Bytecode private static void Register(IConfigurableListableObjectFactory confObjFactory) { - var odb = ObjectDefinitionBuilder.RootObjectDefinition(objectDefinitionFactory, typeof (TImplementation)). + ObjectDefinitionBuilder odb = ObjectDefinitionBuilder.RootObjectDefinition(objectDefinitionFactory, typeof(TImplementation)). SetAutowireMode(AutoWiringMode.Constructor); confObjFactory.RegisterObjectDefinition(typeof (TSerivice).FullName, odb.ObjectDefinition); } private static void RegisterPrototype(IConfigurableListableObjectFactory confObjFactory) { - var odb = ObjectDefinitionBuilder.RootObjectDefinition(objectDefinitionFactory, typeof(TImplementation)) + ObjectDefinitionBuilder odb = ObjectDefinitionBuilder.RootObjectDefinition(objectDefinitionFactory, typeof(TImplementation)) .SetSingleton(false).SetAutowireMode(AutoWiringMode.AutoDetect); confObjFactory.RegisterObjectDefinition(typeof(TImplementation).FullName, odb.ObjectDefinition); } diff --git a/test/Spring/Spring.Data.NHibernate21.Tests/Data/NHibernate/Bytecode/Product.cs b/test/Spring/Spring.Data.NHibernate21.Tests/Data/NHibernate/Bytecode/Product.cs index fdb1832c..83b1c4c4 100644 --- a/test/Spring/Spring.Data.NHibernate21.Tests/Data/NHibernate/Bytecode/Product.cs +++ b/test/Spring/Spring.Data.NHibernate21.Tests/Data/NHibernate/Bytecode/Product.cs @@ -1,13 +1,31 @@ -#if NH_2_1XX +#if NH_2_1 using System; namespace Spring.Data.NHibernate.Bytecode { public class Product { - public virtual Guid Id { get; set; } - public virtual string Description { get; set; } - public virtual decimal Price { get; set; } + private Guid _id; + private string _description; + private decimal _price; + + public virtual Guid Id + { + get { return _id; } + set { _id = value; } + } + + public virtual string Description + { + get { return _description; } + set { _description = value; } + } + + public virtual decimal Price + { + get { return _price; } + set { _price = value; } + } } } #endif \ No newline at end of file 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 index 5ecd9d09..b1dc5251 100644 --- a/test/Spring/Spring.Data.NHibernate21.Tests/Data/NHibernate/Config/AopConfiguration.xml +++ b/test/Spring/Spring.Data.NHibernate21.Tests/Data/NHibernate/Config/AopConfiguration.xml @@ -27,8 +27,7 @@ - + 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 index cff80ec4..c996a74b 100644 --- a/test/Spring/Spring.Data.NHibernate21.Tests/Data/NHibernate/Config/AopConfigurationTxPointcut.xml +++ b/test/Spring/Spring.Data.NHibernate21.Tests/Data/NHibernate/Config/AopConfigurationTxPointcut.xml @@ -28,8 +28,7 @@ - + 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 deb1756a..9547b3dd 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 @@ -40,7 +40,7 @@ False ..\..\..\lib\NHibernate21\net\2.0\log4net.dll - + False ..\..\..\lib\NHibernate21\net\2.0\NHibernate.dll @@ -90,6 +90,7 @@ Data\NHibernate\TestObject.cs + @@ -98,6 +99,7 @@ + Always 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 index 53bf9f3e..778e02d2 100644 --- a/test/Spring/Spring.Data.NHibernate21.Tests/Spring.Data.NHibernate21.Tests.build +++ b/test/Spring/Spring.Data.NHibernate21.Tests/Spring.Data.NHibernate21.Tests.build @@ -10,7 +10,16 @@ * current.build.defines.csc - framework-specific build defines --> - + + + + + + + + - - + + + + + - - - - + - - - - - - + + + + + @@ -44,13 +52,6 @@ - - - - - - -