* Moved cache configuration from PersistentConfiguration to FluentConfiguration

* Moved methods CurrentSessionContext, ProxyFactoryFactory and CollectionTypeFactory to FluentConfiguration.
* Changed from fixed text configurations to NHibernate 3.0 Environment constants.
* Added second level cache configuration.

Author: mirapalheta

src/FluentNHibernate.Testing/Cfg/Db/PersistenceConfigurationTester.cs

@@ -76,47 +76,6 @@ public void Use_Reflection_Optimizer_should_set_value_to_const_true()
 
         }
 
-        [Test]
-        public void Provider_Class_should_set_property_value()
-        {
-            _config.Cache(c => c
-                .ProviderClass("foo"));
-            ValueOf("cache.provider_class").ShouldEqual("foo");
-
-        }
-
-        [Test]
-        public void Use_Minimal_Puts_should_set_value_to_const_true()
-        {
-            _config.Cache(c => c
-                .UseMinimalPuts());
-            ValueOf("cache.use_minimal_puts").ShouldEqual("true");
-        }
-
-        [Test]
-        public void Use_Query_Cache_should_set_value_to_const_true()
-        {
-            _config.Cache(c => c
-                .UseQueryCache());
-            ValueOf("cache.use_query_cache").ShouldEqual("true");
-        }
-
-        [Test]
-        public void Query_Cache_Factory_should_set_property_value()
-        {
-            _config.Cache(c => c
-                .QueryCacheFactory("foo"));
-            ValueOf("cache.query_cache_factory").ShouldEqual("foo");
-        }
-
-        [Test]
-        public void Region_Prefix_should_set_property_value()
-        {
-            _config.Cache(c => c
-                .RegionPrefix("foo"));
-            ValueOf("cache.region_prefix").ShouldEqual("foo");
-        }
-
         [Test]
         public void Query_Substitutions_should_set_property_value()
         {

src/FluentNHibernate.Testing/Cfg/FluentConfigurationTests.cs

@@ -130,7 +130,7 @@ public void ShouldGetAConfigurationIfEverythingIsOK()
     	public void ShouldSetCurrentSessionContext()
     	{
 			var configuration = Fluently.Configure()
-				.Database(SQLiteConfiguration.Standard.CurrentSessionContext("thread_static").InMemory)
+                .CurrentSessionContext("thread_static")
 				.BuildConfiguration();
 
 			configuration.Properties["current_session_context_class"].ShouldEqual("thread_static");
@@ -140,7 +140,7 @@ public void ShouldSetCurrentSessionContext()
     	public void ShouldSetCurrentSessionContextUsingGeneric()
     	{
 			var configuration = Fluently.Configure()
-				.Database(SQLiteConfiguration.Standard.CurrentSessionContext<NHibernate.Context.ThreadStaticSessionContext>())
+				.CurrentSessionContext<NHibernate.Context.ThreadStaticSessionContext>()
 				.BuildConfiguration();
 
 			configuration.Properties["current_session_context_class"].ShouldEqual(typeof(NHibernate.Context.ThreadStaticSessionContext).AssemblyQualifiedName);
@@ -155,6 +155,55 @@ public void ShouldSetConnectionIsolationLevel()
 
             configuration.Properties["connection.isolation"].ShouldEqual("ReadUncommitted");
         }
+
+        [Test]
+        public void Use_Minimal_Puts_should_set_value_to_const_true()
+        {
+            var configuration = Fluently.Configure()
+                .Cache(x => x.UseMinimalPuts())
+                .BuildConfiguration();
+
+            configuration.Properties.ShouldContain("cache.use_minimal_puts", "true");
+        }
+
+        [Test]
+        public void Use_Query_Cache_should_set_value_to_const_true()
+        {
+            var configuration = Fluently.Configure()
+                .Cache(x => x.UseQueryCache())
+                .BuildConfiguration();
+
+            configuration.Properties.ShouldContain("cache.use_query_cache", "true");
+        }
+
+        [Test]
+        public void Query_Cache_Factory_should_set_property_value()
+        {
+            var configuration = Fluently.Configure()
+                .Cache(x => x.QueryCacheFactory("foo"))
+                .BuildConfiguration();
+
+            configuration.Properties.ShouldContain("cache.query_cache_factory", "foo");
+        }
+
+        [Test]
+        public void Region_Prefix_should_set_property_value()
+        {
+            var configuration = Fluently.Configure()
+                .Cache(x => x.RegionPrefix("foo"))
+                .BuildConfiguration();
+
+            configuration.Properties.ShouldContain("cache.region_prefix", "foo");
+        }
+
+        [Test]
+        public void Provider_Class_should_set_property_value()
+        {
+            var configuration = Fluently.Configure()
+                .Cache(x => x.ProviderClass("foo"))
+                .BuildConfiguration();
+
+        }
     }
 
     [TestFixture]

src/FluentNHibernate/Cfg/Db/CacheSettingsBuilder.cs

@@ -1,16 +1,18 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using NHibernate.Cache;
+using NHibEnvironment = NHibernate.Cfg.Environment;
 
 namespace FluentNHibernate.Cfg.Db
 {
     public class CacheSettingsBuilder
     {
-        protected const string ProviderClassKey = "cache.provider_class";
-        protected const string CacheUseMininmalPutsKey = "cache.use_minimal_puts";
-        protected const string CacheUseQueryCacheKey = "cache.use_query_cache";
-        protected const string CacheQueryCacheFactoryKey = "cache.query_cache_factory";
-        protected const string CacheRegionPrefixKey = "cache.region_prefix";
+        protected const string ProviderClassKey = NHibEnvironment.CacheProvider;
+        protected const string CacheUseMininmalPutsKey = NHibEnvironment.UseMinimalPuts;
+        protected const string CacheUseQueryCacheKey = NHibEnvironment.UseQueryCache;
+        protected const string CacheUseSecondLevelCacheKey = NHibEnvironment.UseSecondLevelCache;
+        protected const string CacheQueryCacheFactoryKey = NHibEnvironment.QueryCacheFactory;
+        protected const string CacheRegionPrefixKey = NHibEnvironment.CacheRegionPrefix;
 
         private readonly IDictionary<string, string> settings = new Dictionary<string, string>();
         private bool nextBool = true;
@@ -54,6 +56,14 @@ public CacheSettingsBuilder UseQueryCache()
             return this;
         }
 
+        public CacheSettingsBuilder UseSecondLevelCache()
+        {
+            settings.Add(CacheUseSecondLevelCacheKey, nextBool.ToString().ToLowerInvariant());
+            nextBool = true;
+            IsDirty = true;
+            return this;
+        }
+
         public CacheSettingsBuilder QueryCacheFactory(string factory)
         {
             settings.Add(CacheQueryCacheFactoryKey, factory);

src/FluentNHibernate/Cfg/Db/PersistenceConfiguration.cs

@@ -6,6 +6,7 @@
 using NHibernate.Dialect;
 using NHibernate.Driver;
 using NHibConfiguration = NHibernate.Cfg.Configuration;
+using NHibEnvironment = NHibernate.Cfg.Environment;
 
 namespace FluentNHibernate.Cfg.Db
 {
@@ -17,37 +18,31 @@ public abstract class PersistenceConfiguration<TThisConfiguration, TConnectionSt
         where TThisConfiguration : PersistenceConfiguration<TThisConfiguration, TConnectionString>
         where TConnectionString : ConnectionStringBuilder, new()
     {
-        protected const string DialectKey = "dialect"; // Newer one, but not supported by everything
+        protected const string DialectKey = NHibEnvironment.Dialect; // Newer one, but not supported by everything
         protected const string AltDialectKey = "hibernate.dialect"; // Some older NHib tools require this
         protected const string DefaultSchemaKey = "default_schema"; 
         protected const string UseOuterJoinKey = "use_outer_join";
-        protected const string MaxFetchDepthKey = "max_fetch_depth";
-        protected const string UseReflectionOptimizerKey = "use_reflection_optimizer";
-        protected const string QuerySubstitutionsKey = "query.substitutions";
-        protected const string ShowSqlKey = "show_sql";
-        protected const string FormatSqlKey = "format_sql";
-
-		protected const string CollectionTypeFactoryClassKey = NHibernate.Cfg.Environment.CollectionTypeFactoryClass;
-        protected const string ConnectionProviderKey = "connection.provider";
+        protected const string MaxFetchDepthKey = NHibEnvironment.MaxFetchDepth;
+        protected const string UseReflectionOptimizerKey = NHibEnvironment.PropertyUseReflectionOptimizer;
+        protected const string QuerySubstitutionsKey = NHibEnvironment.QuerySubstitutions;
+        protected const string ShowSqlKey = NHibEnvironment.ShowSql;
+        protected const string FormatSqlKey = NHibEnvironment.FormatSql;
+
+        protected const string ConnectionProviderKey = NHibEnvironment.ConnectionProvider;
         protected const string DefaultConnectionProviderClassName = "NHibernate.Connection.DriverConnectionProvider";
-        protected const string DriverClassKey = "connection.driver_class";
-        protected const string ConnectionStringKey = "connection.connection_string";
-        const string IsolationLevelKey = "connection.isolation";
-        protected const string ProxyFactoryFactoryClassKey = "proxyfactory.factory_class";
-        protected const string DefaultProxyFactoryFactoryClassName = "NHibernate.ByteCode.Castle.ProxyFactoryFactory, NHibernate.ByteCode.Castle";
-        protected const string AdoNetBatchSizeKey = "adonet.batch_size";
-        protected const string CurrentSessionContextClassKey = "current_session_context_class";
+        protected const string DriverClassKey = NHibEnvironment.ConnectionDriver;
+        protected const string ConnectionStringKey = NHibEnvironment.ConnectionString;
+        protected const string IsolationLevelKey = NHibEnvironment.Isolation;
+        protected const string AdoNetBatchSizeKey = NHibEnvironment.BatchSize;
 
         private readonly Dictionary<string, string> values = new Dictionary<string, string>();
 
         private bool nextBoolSettingValue = true;
         private readonly TConnectionString connectionString;
-        private readonly CacheSettingsBuilder cache = new CacheSettingsBuilder();
 
         protected PersistenceConfiguration()
         {
             values[ConnectionProviderKey] = DefaultConnectionProviderClassName;
-            values[ProxyFactoryFactoryClassKey] =  DefaultProxyFactoryFactoryClassName;
             connectionString = new TConnectionString();
         }
 
@@ -56,22 +51,14 @@ protected virtual IDictionary<string, string> CreateProperties()
             if (connectionString.IsDirty)
                 Raw(ConnectionStringKey, connectionString.Create());
 
-            if (cache.IsDirty)
-            {
-                foreach (var pair in cache.Create())
-                {
-                    Raw(pair.Key, pair.Value);
-                }
-            }
-
             return values;
         }
 
         public NHibConfiguration ConfigureProperties(NHibConfiguration nhibernateConfig)
         {
             var settings = CreateProperties();
 
-            nhibernateConfig.SetProperties(settings);
+            nhibernateConfig.AddProperties(settings);
 
             return nhibernateConfig;
         }
@@ -276,24 +263,6 @@ public TThisConfiguration ConnectionString(string value)
             return (TThisConfiguration)this;
         }
 
-        /// <summary>
-        /// Configure caching.
-        /// </summary>
-        /// <example>
-        ///     Cache(x =>
-        ///     {
-        ///       x.UseQueryCache();
-        ///       x.UseMinimalPuts();
-        ///     });
-        /// </example>
-        /// <param name="cacheExpression">Closure for configuring caching</param>
-        /// <returns>Configuration builder</returns>
-        public TThisConfiguration Cache(Action<CacheSettingsBuilder> cacheExpression)
-        {
-            cacheExpression(cache);
-            return (TThisConfiguration)this;
-        }
-
         /// <summary>
         /// Sets a raw property on the NHibernate configuration. Use this method
         /// if there isn't a specific option available in the API.
@@ -307,76 +276,6 @@ public TThisConfiguration Raw(string key, string value)
             return (TThisConfiguration) this;
         }
 
-		/// <summary>
-		/// Sets the collectiontype.factory_class property.
-		/// NOTE: NHibernate 2.1 only
-		/// </summary>
-		/// <param name="collectionTypeFactoryClass">factory class</param>
-		/// <returns>Configuration</returns>
-		public TThisConfiguration CollectionTypeFactory(string collectionTypeFactoryClass)
-		{
-			values[CollectionTypeFactoryClassKey] = collectionTypeFactoryClass;
-			return (TThisConfiguration)this;
-		}
-
-		/// <summary>
-		/// Sets the collectiontype.factory_class property.
-		/// NOTE: NHibernate 2.1 only
-		/// </summary>
-		/// <param name="collectionTypeFactoryClass">factory class</param>
-		/// <returns>Configuration</returns>
-		public TThisConfiguration CollectionTypeFactory(Type collectionTypeFactoryClass)
-		{
-			values[CollectionTypeFactoryClassKey] = collectionTypeFactoryClass.AssemblyQualifiedName;
-			return (TThisConfiguration)this;
-		}
-
-		/// <summary>
-		/// Sets the collectiontype.factory_class property.
-		/// NOTE: NHibernate 2.1 only
-		/// </summary>
-		/// <typeparam name="TCollectionTypeFactory">factory class</typeparam>
-		/// <returns>Configuration</returns>
-		public TThisConfiguration CollectionTypeFactory<TCollectionTypeFactory>() where TCollectionTypeFactory : ICollectionTypeFactory
-		{
-			return CollectionTypeFactory(typeof(TCollectionTypeFactory));
-		}
-
-        /// <summary>
-        /// Sets the proxyfactory.factory_class property.
-        /// NOTE: NHibernate 2.1 only
-        /// </summary>
-        /// <param name="proxyFactoryFactoryClass">factory class</param>
-        /// <returns>Configuration</returns>
-        public TThisConfiguration ProxyFactoryFactory(string proxyFactoryFactoryClass)
-        {
-            values[ProxyFactoryFactoryClassKey] = proxyFactoryFactoryClass;
-            return (TThisConfiguration)this;
-        }
-
-        /// <summary>
-        /// Sets the proxyfactory.factory_class property.
-        /// NOTE: NHibernate 2.1 only
-        /// </summary>
-        /// <param name="proxyFactoryFactory">factory class</param>
-        /// <returns>Configuration</returns>
-        public TThisConfiguration ProxyFactoryFactory(Type proxyFactoryFactory)
-        {
-            values[ProxyFactoryFactoryClassKey] = proxyFactoryFactory.AssemblyQualifiedName;
-            return (TThisConfiguration)this;
-        }
-
-        /// <summary>
-        /// Sets the proxyfactory.factory_class property.
-        /// NOTE: NHibernate 2.1 only
-        /// </summary>
-        /// <typeparam name="TProxyFactoryFactory">factory class</typeparam>
-        /// <returns>Configuration</returns>
-        public TThisConfiguration ProxyFactoryFactory<TProxyFactoryFactory>() where TProxyFactoryFactory : IProxyFactoryFactory
-        {
-            return ProxyFactoryFactory(typeof(TProxyFactoryFactory));
-        }
-
         /// <summary>
         /// Sets the adonet.batch_size property.
         /// </summary>
@@ -388,27 +287,6 @@ public TThisConfiguration AdoNetBatchSize(int size)
             return (TThisConfiguration)this;
         }
 
-        /// <summary>
-        /// Sets the current_session_context_class property.
-        /// </summary>
-        /// <param name="currentSessionContextClass">current session context class</param>
-        /// <returns>Configuration</returns>
-        public TThisConfiguration CurrentSessionContext(string currentSessionContextClass)
-        {
-            values[CurrentSessionContextClassKey] = currentSessionContextClass;
-            return (TThisConfiguration)this;
-        }
-
-        /// <summary>
-        /// Sets the current_session_context_class property.
-        /// </summary>
-        /// <typeparam name="TSessionContext">Implementation of ICurrentSessionContext to use</typeparam>
-        /// <returns>Configuration</returns>
-        public TThisConfiguration CurrentSessionContext<TSessionContext>() where TSessionContext : NHibernate.Context.ICurrentSessionContext
-        {
-            return CurrentSessionContext(typeof(TSessionContext).AssemblyQualifiedName);
-        }
-
         /// <summary>
         /// Sets the connection isolation level. NHibernate setting: connection.isolation
         /// </summary>