[Nhibernate-commit] SF.net SVN: nhibernate:[4002] branches/2.0.x/nhibernate

[<pha...@us...>]

Revision: 4002
          http://nhibernate.svn.sourceforge.net/nhibernate/?rev=4002&view=rev
Author:   phatcher
Date:     2009-01-26 23:00:00 +0000 (Mon, 26 Jan 2009)

Log Message:
-----------
Upgrade NUnit to 2.4.8
Backport changes to SetCacheConcurrencyStrategy for NH Search

Modified Paths:
--------------
    branches/2.0.x/nhibernate/lib/net/2.0/nunit.core.dll
    branches/2.0.x/nhibernate/lib/net/2.0/nunit.framework.dll
    branches/2.0.x/nhibernate/src/NHibernate/Cfg/Configuration.cs
    branches/2.0.x/nhibernate/src/NHibernate-2.0.sln
    branches/2.0.x/nhibernate/src/NHibernate.Test/TestCase.cs

Modified: branches/2.0.x/nhibernate/lib/net/2.0/nunit.core.dll
===================================================================
(Binary files differ)

Modified: branches/2.0.x/nhibernate/lib/net/2.0/nunit.framework.dll
===================================================================
(Binary files differ)

Modified: branches/2.0.x/nhibernate/src/NHibernate/Cfg/Configuration.cs
===================================================================
--- branches/2.0.x/nhibernate/src/NHibernate/Cfg/Configuration.cs	2009-01-26 10:26:50 UTC (rev 4001)
+++ branches/2.0.x/nhibernate/src/NHibernate/Cfg/Configuration.cs	2009-01-26 23:00:00 UTC (rev 4002)
@@ -1323,7 +1323,7 @@
 				}
 
 				string region = string.IsNullOrEmpty(ccc.Region) ? role : ccc.Region;
-				SetCacheConcurrencyStrategy(role, CfgXmlHelper.ClassCacheUsageConvertToString(ccc.Usage), region);
+				SetCollectionCacheConcurrencyStrategy(role, CfgXmlHelper.ClassCacheUsageConvertToString(ccc.Usage), region);
 			}
 
 			// Events
@@ -1353,6 +1353,20 @@
 			return this;
 		}
 
+        internal RootClass GetRootClassMapping(string clazz)
+        {
+            try
+            {
+                return (RootClass)GetClassMapping(clazz);
+            }
+            catch (InvalidCastException)
+            {
+                throw new HibernateConfigException(
+                    "class-cache Configuration: You may only specify a cache for root <class> mappings " + "(cache was specified for "
+                    + clazz + ")");
+            }
+        }
+
 		internal RootClass GetRootClassMapping(System.Type clazz)
 		{
 			PersistentClass persistentClass = GetClassMapping(clazz);
@@ -1388,6 +1402,20 @@
 			SetCacheConcurrencyStrategy(clazz, concurrencyStrategy, region, true);
 		}
 
+        /// <summary>
+        /// Set up a cache for an entity class
+        /// </summary>
+        public Configuration SetCacheConcurrencyStrategy(string clazz, string concurrencyStrategy)
+        {
+            SetCacheConcurrencyStrategy(clazz, concurrencyStrategy, clazz);
+            return this;
+        }
+
+        internal void SetCacheConcurrencyStrategy(string clazz, string concurrencyStrategy, string region)
+        {
+            SetCacheConcurrencyStrategy(clazz, concurrencyStrategy, region, true);
+        }
+
 		internal void SetCacheConcurrencyStrategy(System.Type clazz, string concurrencyStrategy,
 			string region, bool includeLazy)
 		{
@@ -1397,16 +1425,25 @@
 			rootClass.SetLazyPropertiesCacheable(includeLazy);
 		}
 
+        internal void SetCacheConcurrencyStrategy(string clazz, string concurrencyStrategy,
+            string region, bool includeLazy)
+        {
+            RootClass rootClass = GetRootClassMapping(StringHelper.GetFullClassname(clazz));
+            rootClass.CacheConcurrencyStrategy = concurrencyStrategy;
+            rootClass.CacheRegionName = region;
+            rootClass.SetLazyPropertiesCacheable(includeLazy);
+        }
+
 		/// <summary>
 		/// Set up a cache for a collection role
 		/// </summary>
-		public Configuration SetCacheConcurrencyStrategy(string collectionRole, string concurrencyStrategy)
+		public Configuration SetCollectionCacheConcurrencyStrategy(string collectionRole, string concurrencyStrategy)
 		{
-			SetCacheConcurrencyStrategy(collectionRole, concurrencyStrategy, collectionRole);
+			SetCollectionCacheConcurrencyStrategy(collectionRole, concurrencyStrategy, collectionRole);
 			return this;
 		}
 
-		internal void SetCacheConcurrencyStrategy(string collectionRole, string concurrencyStrategy, string region)
+		internal void SetCollectionCacheConcurrencyStrategy(string collectionRole, string concurrencyStrategy, string region)
 		{
 			NHibernate.Mapping.Collection collection = GetCollectionMapping(collectionRole);
 			collection.CacheConcurrencyStrategy = concurrencyStrategy;

Modified: branches/2.0.x/nhibernate/src/NHibernate-2.0.sln
===================================================================
--- branches/2.0.x/nhibernate/src/NHibernate-2.0.sln	2009-01-26 10:26:50 UTC (rev 4001)
+++ branches/2.0.x/nhibernate/src/NHibernate-2.0.sln	2009-01-26 23:00:00 UTC (rev 4002)
@@ -28,6 +28,13 @@
 	EndProjectSection
 EndProject
 Global
+	GlobalSection(DPCodeReviewSolutionGUID) = preSolution
+		DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000}
+	EndGlobalSection
+	GlobalSection(SubversionScc) = preSolution
+		Svn-Managed = True
+		Manager = AnkhSVN - Subversion Support for Visual Studio
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU

Modified: branches/2.0.x/nhibernate/src/NHibernate.Test/TestCase.cs
===================================================================
--- branches/2.0.x/nhibernate/src/NHibernate.Test/TestCase.cs	2009-01-26 10:26:50 UTC (rev 4001)
+++ branches/2.0.x/nhibernate/src/NHibernate.Test/TestCase.cs	2009-01-26 23:00:00 UTC (rev 4002)
@@ -291,7 +291,7 @@
 
 			foreach (Mapping.Collection coll in configuration.CollectionMappings)
 			{
-				configuration.SetCacheConcurrencyStrategy(coll.Role, CacheConcurrencyStrategy);
+				configuration.SetCollectionCacheConcurrencyStrategy(coll.Role, CacheConcurrencyStrategy);
 			}
 		}
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.