Menu
▾
▴
[Nhibernate-commit] SF.net SVN: nhibernate:[5636] trunk/nhibernate/src/NHibernate
|
From: <fab...@us...> - 2011-04-08 05:11:40
|
Revision: 5636
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=5636&view=rev
Author: fabiomaulo
Date: 2011-04-08 05:11:33 +0000 (Fri, 08 Apr 2011)
Log Message:
-----------
Fix NH-2612
Modified Paths:
--------------
trunk/nhibernate/src/NHibernate/NHibernate.csproj
trunk/nhibernate/src/NHibernate.Test/GhostProperty/GhostPropertyFixture.cs
trunk/nhibernate/src/NHibernate.Test/HQL/Ast/QuerySubstitutionTest.cs
trunk/nhibernate/src/NHibernate.Test/Linq/CustomExtensionsExample.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2228/Fixture.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2527/FixtureWithNoBatcher.cs
Added Paths:
-----------
trunk/nhibernate/src/NHibernate/Cfg/ConfigurationExtensions.cs
Removed Paths:
-------------
trunk/nhibernate/src/NHibernate/Cfg/Loquacious/ConfigurationExtensions.cs
Copied: trunk/nhibernate/src/NHibernate/Cfg/ConfigurationExtensions.cs (from rev 5634, trunk/nhibernate/src/NHibernate/Cfg/Loquacious/ConfigurationExtensions.cs)
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/ConfigurationExtensions.cs (rev 0)
+++ trunk/nhibernate/src/NHibernate/Cfg/ConfigurationExtensions.cs 2011-04-08 05:11:33 UTC (rev 5636)
@@ -0,0 +1,145 @@
+using System;
+using NHibernate.Cfg.Loquacious;
+using NHibernate.Context;
+using NHibernate.Hql;
+using NHibernate.Linq.Functions;
+using NHibernate.Util;
+
+namespace NHibernate.Cfg
+{
+ public static class ConfigurationExtensions
+ {
+ public static IFluentSessionFactoryConfiguration SessionFactory(this Configuration configuration)
+ {
+ return new FluentSessionFactoryConfiguration(configuration);
+ }
+
+ public static Configuration SessionFactoryName(this Configuration configuration, string sessionFactoryName)
+ {
+ configuration.SetProperty(Environment.SessionFactoryName, sessionFactoryName);
+ return configuration;
+ }
+
+ public static Configuration Cache(this Configuration configuration, Action<ICacheConfigurationProperties> cacheProperties)
+ {
+ cacheProperties(new CacheConfigurationProperties(configuration));
+ return configuration;
+ }
+
+ public static Configuration CollectionTypeFactory<TCollecionsFactory>(this Configuration configuration)
+ {
+ configuration.SetProperty(Environment.CollectionTypeFactoryClass,
+ typeof(TCollecionsFactory).AssemblyQualifiedName);
+ return configuration;
+ }
+
+ public static Configuration Proxy(this Configuration configuration, Action<IProxyConfigurationProperties> proxyProperties)
+ {
+ proxyProperties(new ProxyConfigurationProperties(configuration));
+ return configuration;
+ }
+
+ public static Configuration HqlQueryTranslator<TQueryTranslator>(this Configuration configuration) where TQueryTranslator : IQueryTranslatorFactory
+ {
+ configuration.SetProperty(Environment.QueryTranslator, typeof(TQueryTranslator).AssemblyQualifiedName);
+ return configuration;
+ }
+
+ public static Configuration LinqToHqlGeneratorsRegistry<TLinqToHqlGeneratorsRegistry>(this Configuration configuration) where TLinqToHqlGeneratorsRegistry : ILinqToHqlGeneratorsRegistry
+ {
+ configuration.SetProperty(Environment.LinqToHqlGeneratorsRegistry, typeof(TLinqToHqlGeneratorsRegistry).AssemblyQualifiedName);
+ return configuration;
+ }
+
+ public static Configuration CurrentSessionContext<TCurrentSessionContext>(this Configuration configuration) where TCurrentSessionContext : ICurrentSessionContext
+ {
+ configuration.SetProperty(Environment.CurrentSessionContextClass, typeof(TCurrentSessionContext).AssemblyQualifiedName);
+ return configuration;
+ }
+
+ public static Configuration Mappings(this Configuration configuration, Action<IMappingsConfigurationProperties> mappingsProperties)
+ {
+ mappingsProperties(new MappingsConfigurationProperties(configuration));
+ return configuration;
+ }
+
+ public static Configuration DataBaseIntegration(this Configuration configuration, Action<IDbIntegrationConfigurationProperties> dataBaseIntegration)
+ {
+ dataBaseIntegration(new DbIntegrationConfigurationProperties(configuration));
+ return configuration;
+ }
+
+ public static Configuration EntityCache<TEntity>(this Configuration configuration, Action<IEntityCacheConfigurationProperties<TEntity>> entityCacheConfiguration)
+ where TEntity : class
+ {
+ var ecc = new EntityCacheConfigurationProperties<TEntity>();
+ entityCacheConfiguration(ecc);
+ if (ecc.Strategy.HasValue)
+ {
+ configuration.SetCacheConcurrencyStrategy(typeof(TEntity).FullName, EntityCacheUsageParser.ToString(ecc.Strategy.Value),
+ ecc.RegionName);
+ }
+ foreach (var collection in ecc.Collections)
+ {
+ configuration.SetCollectionCacheConcurrencyStrategy(collection.Key,
+ EntityCacheUsageParser.ToString(collection.Value.Strategy),
+ collection.Value.RegionName);
+ }
+ return configuration;
+ }
+
+ /// <summary>
+ /// Add a type-definition for mappings.
+ /// </summary>
+ /// <typeparam name="TDef">The peristent type.</typeparam>
+ /// <param name="configuration">The <see cref="Configuration"/> where add the type-definition.</param>
+ /// <param name="typeDefConfiguration">The custom configuration action.</param>
+ /// <returns>The <see cref="Configuration"/>.</returns>
+ /// <remarks>
+ /// <para>
+ /// <list type="bullet">
+ /// <listheader>
+ /// <description>Depending on where you will use the type-definition in the mapping the
+ /// <typeparamref name="TDef"/> can be :
+ /// </description>
+ ///</listheader>
+ ///<item>
+ /// <term><see cref="NHibernate.UserTypes.IUserType"/></term>
+ ///</item>
+ ///<item>
+ /// <term><see cref="NHibernate.UserTypes.IUserCollectionType"/></term>
+ ///</item>
+ ///<item>
+ /// <term><see cref="NHibernate.UserTypes.IUserVersionType"/></term>
+ ///</item>
+ ///<item>
+ /// <term><see cref="NHibernate.Id.IPersistentIdentifierGenerator"/> </term>
+ ///</item>
+ ///</list>
+ /// </para>
+ /// </remarks>
+ public static Configuration TypeDefinition<TDef>(this Configuration configuration, Action<ITypeDefConfigurationProperties> typeDefConfiguration)
+ where TDef : class
+ {
+ if (typeDefConfiguration == null)
+ {
+ return configuration;
+ }
+ var tdConfiguration = new TypeDefConfigurationProperties<TDef>();
+ typeDefConfiguration(tdConfiguration);
+ if(string.IsNullOrEmpty(tdConfiguration.Alias))
+ {
+ return configuration;
+ }
+ var mappings = GetMappings(configuration);
+ mappings.AddTypeDef(tdConfiguration.Alias, typeof(TDef).AssemblyQualifiedName, tdConfiguration.Properties.ToTypeParameters());
+ return configuration;
+ }
+
+ private static Mappings GetMappings(Configuration configuration)
+ {
+ Dialect.Dialect dialect = Dialect.Dialect.GetDialect(configuration.Properties);
+ return configuration.CreateMappings(dialect);
+ }
+ }
+}
\ No newline at end of file
Deleted: trunk/nhibernate/src/NHibernate/Cfg/Loquacious/ConfigurationExtensions.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/Loquacious/ConfigurationExtensions.cs 2011-04-08 05:00:29 UTC (rev 5635)
+++ trunk/nhibernate/src/NHibernate/Cfg/Loquacious/ConfigurationExtensions.cs 2011-04-08 05:11:33 UTC (rev 5636)
@@ -1,144 +0,0 @@
-using System;
-using NHibernate.Context;
-using NHibernate.Hql;
-using NHibernate.Linq.Functions;
-using NHibernate.Util;
-
-namespace NHibernate.Cfg.Loquacious
-{
- public static class ConfigurationExtensions
- {
- public static IFluentSessionFactoryConfiguration SessionFactory(this Configuration configuration)
- {
- return new FluentSessionFactoryConfiguration(configuration);
- }
-
- public static Configuration SessionFactoryName(this Configuration configuration, string sessionFactoryName)
- {
- configuration.SetProperty(Environment.SessionFactoryName, sessionFactoryName);
- return configuration;
- }
-
- public static Configuration Cache(this Configuration configuration, Action<ICacheConfigurationProperties> cacheProperties)
- {
- cacheProperties(new CacheConfigurationProperties(configuration));
- return configuration;
- }
-
- public static Configuration CollectionTypeFactory<TCollecionsFactory>(this Configuration configuration)
- {
- configuration.SetProperty(Environment.CollectionTypeFactoryClass,
- typeof(TCollecionsFactory).AssemblyQualifiedName);
- return configuration;
- }
-
- public static Configuration Proxy(this Configuration configuration, Action<IProxyConfigurationProperties> proxyProperties)
- {
- proxyProperties(new ProxyConfigurationProperties(configuration));
- return configuration;
- }
-
- public static Configuration HqlQueryTranslator<TQueryTranslator>(this Configuration configuration) where TQueryTranslator : IQueryTranslatorFactory
- {
- configuration.SetProperty(Environment.QueryTranslator, typeof(TQueryTranslator).AssemblyQualifiedName);
- return configuration;
- }
-
- public static Configuration LinqToHqlGeneratorsRegistry<TLinqToHqlGeneratorsRegistry>(this Configuration configuration) where TLinqToHqlGeneratorsRegistry : ILinqToHqlGeneratorsRegistry
- {
- configuration.SetProperty(Environment.LinqToHqlGeneratorsRegistry, typeof(TLinqToHqlGeneratorsRegistry).AssemblyQualifiedName);
- return configuration;
- }
-
- public static Configuration CurrentSessionContext<TCurrentSessionContext>(this Configuration configuration) where TCurrentSessionContext : ICurrentSessionContext
- {
- configuration.SetProperty(Environment.CurrentSessionContextClass, typeof(TCurrentSessionContext).AssemblyQualifiedName);
- return configuration;
- }
-
- public static Configuration Mappings(this Configuration configuration, Action<IMappingsConfigurationProperties> mappingsProperties)
- {
- mappingsProperties(new MappingsConfigurationProperties(configuration));
- return configuration;
- }
-
- public static Configuration DataBaseIntegration(this Configuration configuration, Action<IDbIntegrationConfigurationProperties> dataBaseIntegration)
- {
- dataBaseIntegration(new DbIntegrationConfigurationProperties(configuration));
- return configuration;
- }
-
- public static Configuration EntityCache<TEntity>(this Configuration configuration, Action<IEntityCacheConfigurationProperties<TEntity>> entityCacheConfiguration)
- where TEntity : class
- {
- var ecc = new EntityCacheConfigurationProperties<TEntity>();
- entityCacheConfiguration(ecc);
- if (ecc.Strategy.HasValue)
- {
- configuration.SetCacheConcurrencyStrategy(typeof(TEntity).FullName, EntityCacheUsageParser.ToString(ecc.Strategy.Value),
- ecc.RegionName);
- }
- foreach (var collection in ecc.Collections)
- {
- configuration.SetCollectionCacheConcurrencyStrategy(collection.Key,
- EntityCacheUsageParser.ToString(collection.Value.Strategy),
- collection.Value.RegionName);
- }
- return configuration;
- }
-
- /// <summary>
- /// Add a type-definition for mappings.
- /// </summary>
- /// <typeparam name="TDef">The peristent type.</typeparam>
- /// <param name="configuration">The <see cref="Configuration"/> where add the type-definition.</param>
- /// <param name="typeDefConfiguration">The custom configuration action.</param>
- /// <returns>The <see cref="Configuration"/>.</returns>
- /// <remarks>
- /// <para>
- /// <list type="bullet">
- /// <listheader>
- /// <description>Depending on where you will use the type-definition in the mapping the
- /// <typeparamref name="TDef"/> can be :
- /// </description>
- ///</listheader>
- ///<item>
- /// <term><see cref="NHibernate.UserTypes.IUserType"/></term>
- ///</item>
- ///<item>
- /// <term><see cref="NHibernate.UserTypes.IUserCollectionType"/></term>
- ///</item>
- ///<item>
- /// <term><see cref="NHibernate.UserTypes.IUserVersionType"/></term>
- ///</item>
- ///<item>
- /// <term><see cref="NHibernate.Id.IPersistentIdentifierGenerator"/> </term>
- ///</item>
- ///</list>
- /// </para>
- /// </remarks>
- public static Configuration TypeDefinition<TDef>(this Configuration configuration, Action<ITypeDefConfigurationProperties> typeDefConfiguration)
- where TDef : class
- {
- if (typeDefConfiguration == null)
- {
- return configuration;
- }
- var tdConfiguration = new TypeDefConfigurationProperties<TDef>();
- typeDefConfiguration(tdConfiguration);
- if(string.IsNullOrEmpty(tdConfiguration.Alias))
- {
- return configuration;
- }
- var mappings = GetMappings(configuration);
- mappings.AddTypeDef(tdConfiguration.Alias, typeof(TDef).AssemblyQualifiedName, tdConfiguration.Properties.ToTypeParameters());
- return configuration;
- }
-
- private static Mappings GetMappings(Configuration configuration)
- {
- Dialect.Dialect dialect = Dialect.Dialect.GetDialect(configuration.Properties);
- return configuration.CreateMappings(dialect);
- }
- }
-}
\ No newline at end of file
Modified: trunk/nhibernate/src/NHibernate/NHibernate.csproj
===================================================================
--- trunk/nhibernate/src/NHibernate/NHibernate.csproj 2011-04-08 05:00:29 UTC (rev 5635)
+++ trunk/nhibernate/src/NHibernate/NHibernate.csproj 2011-04-08 05:11:33 UTC (rev 5636)
@@ -676,7 +676,7 @@
<Compile Include="Cfg\FilterSecondPassArgs.cs" />
<Compile Include="Cfg\Hbm2ddlKeyWords.cs" />
<Compile Include="Cfg\Loquacious\CacheConfiguration.cs" />
- <Compile Include="Cfg\Loquacious\ConfigurationExtensions.cs" />
+ <Compile Include="Cfg\ConfigurationExtensions.cs" />
<Compile Include="Cfg\Loquacious\DbIntegrationConfiguration.cs" />
<Compile Include="Cfg\Loquacious\EntityCacheConfigurationProperties.cs" />
<Compile Include="Cfg\Loquacious\FluentSessionFactoryConfiguration.cs" />
Modified: trunk/nhibernate/src/NHibernate.Test/GhostProperty/GhostPropertyFixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/GhostProperty/GhostPropertyFixture.cs 2011-04-08 05:00:29 UTC (rev 5635)
+++ trunk/nhibernate/src/NHibernate.Test/GhostProperty/GhostPropertyFixture.cs 2011-04-08 05:11:33 UTC (rev 5636)
@@ -1,4 +1,5 @@
using System.Collections;
+using NHibernate.Cfg;
using NHibernate.Cfg.Loquacious;
using NHibernate.Tuple.Entity;
using NUnit.Framework;
Modified: trunk/nhibernate/src/NHibernate.Test/HQL/Ast/QuerySubstitutionTest.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/HQL/Ast/QuerySubstitutionTest.cs 2011-04-08 05:00:29 UTC (rev 5635)
+++ trunk/nhibernate/src/NHibernate.Test/HQL/Ast/QuerySubstitutionTest.cs 2011-04-08 05:11:33 UTC (rev 5636)
@@ -1,4 +1,5 @@
using System.Collections.Generic;
+using NHibernate.Cfg;
using NUnit.Framework;
using NHibernate.Cfg.Loquacious;
using SharpTestsEx;
Modified: trunk/nhibernate/src/NHibernate.Test/Linq/CustomExtensionsExample.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/Linq/CustomExtensionsExample.cs 2011-04-08 05:00:29 UTC (rev 5635)
+++ trunk/nhibernate/src/NHibernate.Test/Linq/CustomExtensionsExample.cs 2011-04-08 05:11:33 UTC (rev 5636)
@@ -3,6 +3,7 @@
using System.Linq.Expressions;
using System.Reflection;
using System.Text.RegularExpressions;
+using NHibernate.Cfg;
using NHibernate.Cfg.Loquacious;
using NHibernate.Hql.Ast;
using NHibernate.Linq;
Modified: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2228/Fixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2228/Fixture.cs 2011-04-08 05:00:29 UTC (rev 5635)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2228/Fixture.cs 2011-04-08 05:11:33 UTC (rev 5636)
@@ -1,4 +1,5 @@
using System;
+using NHibernate.Cfg;
using NUnit.Framework;
using NHibernate.Cfg.Loquacious;
using SharpTestsEx;
Modified: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2527/FixtureWithNoBatcher.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2527/FixtureWithNoBatcher.cs 2011-04-08 05:00:29 UTC (rev 5635)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2527/FixtureWithNoBatcher.cs 2011-04-08 05:11:33 UTC (rev 5636)
@@ -1,4 +1,5 @@
using NHibernate.AdoNet;
+using NHibernate.Cfg;
using NHibernate.Cfg.Loquacious;
using NUnit.Framework;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
