From: <fab...@us...> - 2010-08-08 21:40:53
|
Revision: 5127 http://nhibernate.svn.sourceforge.net/nhibernate/?rev=5127&view=rev Author: fabiomaulo Date: 2010-08-08 21:40:41 +0000 (Sun, 08 Aug 2010) Log Message: ----------- Isolated Log4Net stuff (first step to fix NH-1554 and NH-2263) Modified Paths: -------------- trunk/nhibernate/src/NHibernate/AdoNet/AbstractBatcher.cs trunk/nhibernate/src/NHibernate/AdoNet/ConnectionManager.cs trunk/nhibernate/src/NHibernate/AdoNet/Util/SqlStatementLogger.cs trunk/nhibernate/src/NHibernate/AssertionFailure.cs trunk/nhibernate/src/NHibernate/Bytecode/CodeDom/BytecodeProviderImpl.cs trunk/nhibernate/src/NHibernate/Cache/CacheFactory.cs trunk/nhibernate/src/NHibernate/Cache/NoCacheProvider.cs trunk/nhibernate/src/NHibernate/Cache/NonstrictReadWriteCache.cs trunk/nhibernate/src/NHibernate/Cache/ReadOnlyCache.cs trunk/nhibernate/src/NHibernate/Cache/ReadWriteCache.cs trunk/nhibernate/src/NHibernate/Cache/StandardQueryCache.cs trunk/nhibernate/src/NHibernate/Cache/UpdateTimestampsCache.cs trunk/nhibernate/src/NHibernate/Cfg/Configuration.cs trunk/nhibernate/src/NHibernate/Cfg/ConfigurationSchema/HibernateConfiguration.cs trunk/nhibernate/src/NHibernate/Cfg/ConfigurationSchema/SessionFactoryConfiguration.cs trunk/nhibernate/src/NHibernate/Cfg/Environment.cs trunk/nhibernate/src/NHibernate/Cfg/Mappings.cs trunk/nhibernate/src/NHibernate/Cfg/SettingsFactory.cs trunk/nhibernate/src/NHibernate/Cfg/XmlHbmBinding/Binder.cs trunk/nhibernate/src/NHibernate/Cfg/XmlHbmBinding/FilterDefinitionFactory.cs trunk/nhibernate/src/NHibernate/Cfg/XmlHbmBinding/MappingLogExtensions.cs trunk/nhibernate/src/NHibernate/Collection/PersistentArrayHolder.cs trunk/nhibernate/src/NHibernate/Connection/ConnectionProvider.cs trunk/nhibernate/src/NHibernate/Connection/ConnectionProviderFactory.cs trunk/nhibernate/src/NHibernate/Connection/DriverConnectionProvider.cs trunk/nhibernate/src/NHibernate/Connection/UserSuppliedConnectionProvider.cs trunk/nhibernate/src/NHibernate/Context/ThreadLocalSessionContext.cs trunk/nhibernate/src/NHibernate/Dialect/Dialect.cs trunk/nhibernate/src/NHibernate/Dialect/Lock/UpdateLockingStrategy.cs trunk/nhibernate/src/NHibernate/Dialect/Schema/AbstractTableMetadata.cs trunk/nhibernate/src/NHibernate/Driver/DriverBase.cs trunk/nhibernate/src/NHibernate/Driver/NHybridDataReader.cs trunk/nhibernate/src/NHibernate/Engine/ActionQueue.cs trunk/nhibernate/src/NHibernate/Engine/Cascade.cs trunk/nhibernate/src/NHibernate/Engine/CascadingAction.cs trunk/nhibernate/src/NHibernate/Engine/CollectionEntry.cs trunk/nhibernate/src/NHibernate/Engine/Collections.cs trunk/nhibernate/src/NHibernate/Engine/ForeignKeys.cs trunk/nhibernate/src/NHibernate/Engine/IdentifierValue.cs trunk/nhibernate/src/NHibernate/Engine/Loading/CollectionLoadContext.cs trunk/nhibernate/src/NHibernate/Engine/Loading/LoadContexts.cs trunk/nhibernate/src/NHibernate/Engine/Query/HQLQueryPlan.cs trunk/nhibernate/src/NHibernate/Engine/Query/NativeSQLQueryPlan.cs trunk/nhibernate/src/NHibernate/Engine/Query/QueryPlanCache.cs trunk/nhibernate/src/NHibernate/Engine/QueryParameters.cs trunk/nhibernate/src/NHibernate/Engine/StatefulPersistenceContext.cs trunk/nhibernate/src/NHibernate/Engine/Transaction/Isolater.cs trunk/nhibernate/src/NHibernate/Engine/TwoPhaseLoad.cs trunk/nhibernate/src/NHibernate/Engine/VersionValue.cs trunk/nhibernate/src/NHibernate/Engine/Versioning.cs trunk/nhibernate/src/NHibernate/Event/Default/AbstractFlushingEventListener.cs trunk/nhibernate/src/NHibernate/Event/Default/AbstractLockUpgradeEventListener.cs trunk/nhibernate/src/NHibernate/Event/Default/AbstractReassociateEventListener.cs trunk/nhibernate/src/NHibernate/Event/Default/AbstractSaveEventListener.cs trunk/nhibernate/src/NHibernate/Event/Default/DefaultAutoFlushEventListener.cs trunk/nhibernate/src/NHibernate/Event/Default/DefaultDeleteEventListener.cs trunk/nhibernate/src/NHibernate/Event/Default/DefaultDirtyCheckEventListener.cs trunk/nhibernate/src/NHibernate/Event/Default/DefaultEvictEventListener.cs trunk/nhibernate/src/NHibernate/Event/Default/DefaultFlushEntityEventListener.cs trunk/nhibernate/src/NHibernate/Event/Default/DefaultInitializeCollectionEventListener.cs trunk/nhibernate/src/NHibernate/Event/Default/DefaultLoadEventListener.cs trunk/nhibernate/src/NHibernate/Event/Default/DefaultMergeEventListener.cs trunk/nhibernate/src/NHibernate/Event/Default/DefaultPersistEventListener.cs trunk/nhibernate/src/NHibernate/Event/Default/DefaultRefreshEventListener.cs trunk/nhibernate/src/NHibernate/Event/Default/DefaultReplicateEventListener.cs trunk/nhibernate/src/NHibernate/Event/Default/DefaultSaveOrUpdateEventListener.cs trunk/nhibernate/src/NHibernate/Event/Default/EvictVisitor.cs trunk/nhibernate/src/NHibernate/Event/Default/ReattachVisitor.cs trunk/nhibernate/src/NHibernate/Event/Default/WrapVisitor.cs trunk/nhibernate/src/NHibernate/Exceptions/SQLExceptionConverterFactory.cs trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/ErrorCounter.cs trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Exec/AbstractStatementExecutor.cs trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Exec/BasicExecutor.cs trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Exec/MultiTableDeleteExecutor.cs trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Exec/MultiTableUpdateExecutor.cs trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlParser.cs trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.cs trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/QueryTranslatorImpl.cs trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Tree/AbstractRestrictableStatement.cs trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Tree/DeleteStatement.cs trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Tree/DotNode.cs trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Tree/FromClause.cs trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Tree/FromElement.cs trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Tree/FromElementFactory.cs trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Tree/FromElementType.cs trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Tree/FromReferenceNode.cs trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Tree/IndexNode.cs trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Tree/MethodNode.cs trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Tree/QueryNode.cs trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Tree/UpdateStatement.cs trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Util/JoinProcessor.cs trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Util/LiteralProcessor.cs trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Util/PathHelper.cs trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Util/SyntheticAndFactory.cs trunk/nhibernate/src/NHibernate/Hql/Classic/QueryTranslator.cs trunk/nhibernate/src/NHibernate/Hql/QuerySplitter.cs trunk/nhibernate/src/NHibernate/Id/Enhanced/OptimizerFactory.cs trunk/nhibernate/src/NHibernate/Id/Enhanced/SequenceStructure.cs trunk/nhibernate/src/NHibernate/Id/Enhanced/SequenceStyleGenerator.cs trunk/nhibernate/src/NHibernate/Id/Enhanced/TableStructure.cs trunk/nhibernate/src/NHibernate/Id/IdentifierGeneratorFactory.cs trunk/nhibernate/src/NHibernate/Id/IncrementGenerator.cs trunk/nhibernate/src/NHibernate/Id/NativeGuidGenerator.cs trunk/nhibernate/src/NHibernate/Id/SequenceGenerator.cs trunk/nhibernate/src/NHibernate/Id/SequenceHiLoGenerator.cs trunk/nhibernate/src/NHibernate/Id/TableGenerator.cs trunk/nhibernate/src/NHibernate/Id/TableHiLoGenerator.cs trunk/nhibernate/src/NHibernate/Impl/AbstractSessionImpl.cs trunk/nhibernate/src/NHibernate/Impl/EnumerableImpl.cs trunk/nhibernate/src/NHibernate/Impl/MultiCriteriaImpl.cs trunk/nhibernate/src/NHibernate/Impl/MultiQueryImpl.cs trunk/nhibernate/src/NHibernate/Impl/Printer.cs trunk/nhibernate/src/NHibernate/Impl/SessionFactoryImpl.cs trunk/nhibernate/src/NHibernate/Impl/SessionFactoryObjectFactory.cs trunk/nhibernate/src/NHibernate/Impl/SessionImpl.cs trunk/nhibernate/src/NHibernate/Impl/StatelessSessionImpl.cs trunk/nhibernate/src/NHibernate/LazyInitializationException.cs trunk/nhibernate/src/NHibernate/Linq/Functions/LinqToHqlGeneratorsRegistryFactory.cs trunk/nhibernate/src/NHibernate/Loader/Collection/BasicCollectionLoader.cs trunk/nhibernate/src/NHibernate/Loader/Collection/OneToManyLoader.cs trunk/nhibernate/src/NHibernate/Loader/Criteria/CriteriaJoinWalker.cs trunk/nhibernate/src/NHibernate/Loader/Criteria/CriteriaQueryTranslator.cs trunk/nhibernate/src/NHibernate/Loader/Custom/Sql/SQLCustomQuery.cs trunk/nhibernate/src/NHibernate/Loader/Custom/Sql/SQLQueryReturnProcessor.cs trunk/nhibernate/src/NHibernate/Loader/Entity/AbstractEntityLoader.cs trunk/nhibernate/src/NHibernate/Loader/Entity/CollectionElementLoader.cs trunk/nhibernate/src/NHibernate/Loader/Loader.cs trunk/nhibernate/src/NHibernate/Mapping/RootClass.cs trunk/nhibernate/src/NHibernate/NHibernate.csproj trunk/nhibernate/src/NHibernate/NonUniqueResultException.cs trunk/nhibernate/src/NHibernate/Persister/Collection/AbstractCollectionPersister.cs trunk/nhibernate/src/NHibernate/Persister/Collection/NamedQueryCollectionInitializer.cs trunk/nhibernate/src/NHibernate/Persister/Entity/AbstractEntityPersister.cs trunk/nhibernate/src/NHibernate/Persister/Entity/NamedQueryLoader.cs trunk/nhibernate/src/NHibernate/SqlCommand/InsertSelect.cs trunk/nhibernate/src/NHibernate/SqlCommand/SqlDeleteBuilder.cs trunk/nhibernate/src/NHibernate/SqlCommand/SqlInsertBuilder.cs trunk/nhibernate/src/NHibernate/SqlCommand/SqlSelectBuilder.cs trunk/nhibernate/src/NHibernate/SqlCommand/SqlUpdateBuilder.cs trunk/nhibernate/src/NHibernate/Stat/StatisticsImpl.cs trunk/nhibernate/src/NHibernate/Tool/hbm2ddl/DatabaseMetadata.cs trunk/nhibernate/src/NHibernate/Tool/hbm2ddl/SchemaExport.cs trunk/nhibernate/src/NHibernate/Tool/hbm2ddl/SchemaUpdate.cs trunk/nhibernate/src/NHibernate/Tool/hbm2ddl/SchemaValidator.cs trunk/nhibernate/src/NHibernate/Transaction/AdoNetTransactionFactory.cs trunk/nhibernate/src/NHibernate/Transaction/AdoNetWithDistributedTransactionFactory.cs trunk/nhibernate/src/NHibernate/Transaction/AdoTransaction.cs trunk/nhibernate/src/NHibernate/Transform/DistinctRootEntityResultTransformer.cs trunk/nhibernate/src/NHibernate/Tuple/Component/AbstractComponentTuplizer.cs trunk/nhibernate/src/NHibernate/Tuple/Entity/AbstractEntityTuplizer.cs trunk/nhibernate/src/NHibernate/Tuple/Entity/DynamicMapEntityTuplizer.cs trunk/nhibernate/src/NHibernate/Tuple/Entity/EntityMetamodel.cs trunk/nhibernate/src/NHibernate/Tuple/Entity/PocoEntityTuplizer.cs trunk/nhibernate/src/NHibernate/Tuple/PocoInstantiator.cs trunk/nhibernate/src/NHibernate/Type/CompositeCustomType.cs trunk/nhibernate/src/NHibernate/Type/CustomType.cs trunk/nhibernate/src/NHibernate/Type/DbTimestampType.cs trunk/nhibernate/src/NHibernate/Type/NullableType.cs trunk/nhibernate/src/NHibernate/Util/ADOExceptionReporter.cs trunk/nhibernate/src/NHibernate/Util/IdentityMap.cs trunk/nhibernate/src/NHibernate/Util/JoinedEnumerable.cs trunk/nhibernate/src/NHibernate/Util/ReflectHelper.cs trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj Added Paths: ----------- trunk/nhibernate/src/NHibernate/Logging.cs trunk/nhibernate/src/NHibernate.Test/Logging/ trunk/nhibernate/src/NHibernate.Test/Logging/Log4NetLoggerTest.cs trunk/nhibernate/src/NHibernate.Test/Logging/LogggerProviderTest.cs Modified: trunk/nhibernate/src/NHibernate/AdoNet/AbstractBatcher.cs =================================================================== --- trunk/nhibernate/src/NHibernate/AdoNet/AbstractBatcher.cs 2010-08-07 17:35:36 UTC (rev 5126) +++ trunk/nhibernate/src/NHibernate/AdoNet/AbstractBatcher.cs 2010-08-08 21:40:41 UTC (rev 5127) @@ -1,7 +1,7 @@ using System; using System.Data; using Iesi.Collections.Generic; -using log4net; + using NHibernate.Driver; using NHibernate.Engine; using NHibernate.Exceptions; @@ -21,7 +21,7 @@ /// </summary> public abstract class AbstractBatcher : IBatcher { - protected static readonly ILog log = LogManager.GetLogger(typeof(AbstractBatcher)); + protected static readonly ILogger log = LogggerProvider.LoggerFor(typeof(AbstractBatcher)); private static int openCommandCount; private static int openReaderCount; Modified: trunk/nhibernate/src/NHibernate/AdoNet/ConnectionManager.cs =================================================================== --- trunk/nhibernate/src/NHibernate/AdoNet/ConnectionManager.cs 2010-08-07 17:35:36 UTC (rev 5126) +++ trunk/nhibernate/src/NHibernate/AdoNet/ConnectionManager.cs 2010-08-08 21:40:41 UTC (rev 5127) @@ -2,7 +2,7 @@ using System.Data; using System.Runtime.Serialization; using System.Security.Permissions; -using log4net; + using NHibernate.Engine; namespace NHibernate.AdoNet @@ -17,7 +17,7 @@ [Serializable] public class ConnectionManager : ISerializable, IDeserializationCallback { - private static readonly ILog log = LogManager.GetLogger(typeof(ConnectionManager)); + private static readonly ILogger log = LogggerProvider.LoggerFor(typeof(ConnectionManager)); public interface Callback { Modified: trunk/nhibernate/src/NHibernate/AdoNet/Util/SqlStatementLogger.cs =================================================================== --- trunk/nhibernate/src/NHibernate/AdoNet/Util/SqlStatementLogger.cs 2010-08-07 17:35:36 UTC (rev 5126) +++ trunk/nhibernate/src/NHibernate/AdoNet/Util/SqlStatementLogger.cs 2010-08-08 21:40:41 UTC (rev 5127) @@ -1,14 +1,14 @@ using System; using System.Data; using System.Text; -using log4net; + namespace NHibernate.AdoNet.Util { /// <summary> Centralize logging handling for SQL statements. </summary> public class SqlStatementLogger { - private static readonly ILog log = LogManager.GetLogger("NHibernate.SQL"); + private static readonly ILogger log = LogggerProvider.LoggerFor("NHibernate.SQL"); /// <summary> Constructs a new SqlStatementLogger instance.</summary> public SqlStatementLogger() : this(false, false) { } Modified: trunk/nhibernate/src/NHibernate/AssertionFailure.cs =================================================================== --- trunk/nhibernate/src/NHibernate/AssertionFailure.cs 2010-08-07 17:35:36 UTC (rev 5126) +++ trunk/nhibernate/src/NHibernate/AssertionFailure.cs 2010-08-08 21:40:41 UTC (rev 5127) @@ -1,7 +1,7 @@ using System; using System.Runtime.Serialization; -using log4net; + namespace NHibernate { /// <summary> @@ -17,7 +17,7 @@ /// </summary> public AssertionFailure() : base(String.Empty) { - LogManager.GetLogger(typeof(AssertionFailure)).Error(DefaultMessage); + LogggerProvider.LoggerFor(typeof(AssertionFailure)).Error(DefaultMessage); } /// <summary> @@ -26,7 +26,7 @@ /// <param name="message">The message that describes the error. </param> public AssertionFailure(string message) : base(message) { - LogManager.GetLogger(typeof(AssertionFailure)).Error(DefaultMessage, this); + LogggerProvider.LoggerFor(typeof(AssertionFailure)).Error(DefaultMessage, this); } /// <summary> @@ -40,7 +40,7 @@ /// </param> public AssertionFailure(string message, Exception innerException) : base(message, innerException) { - LogManager.GetLogger(typeof(AssertionFailure)).Error(DefaultMessage, innerException); + LogggerProvider.LoggerFor(typeof(AssertionFailure)).Error(DefaultMessage, innerException); } /// <summary> Modified: trunk/nhibernate/src/NHibernate/Bytecode/CodeDom/BytecodeProviderImpl.cs =================================================================== --- trunk/nhibernate/src/NHibernate/Bytecode/CodeDom/BytecodeProviderImpl.cs 2010-08-07 17:35:36 UTC (rev 5126) +++ trunk/nhibernate/src/NHibernate/Bytecode/CodeDom/BytecodeProviderImpl.cs 2010-08-08 21:40:41 UTC (rev 5127) @@ -2,7 +2,7 @@ using System.CodeDom.Compiler; using System.Reflection; using System.Text; -using log4net; + using Microsoft.CSharp; using NHibernate.Properties; @@ -13,7 +13,7 @@ /// </summary> public class BytecodeProviderImpl : AbstractBytecodeProvider { - private static readonly ILog log = LogManager.GetLogger(typeof (BytecodeProviderImpl)); + private static readonly ILogger log = LogggerProvider.LoggerFor(typeof (BytecodeProviderImpl)); #region IBytecodeProvider Members Modified: trunk/nhibernate/src/NHibernate/Cache/CacheFactory.cs =================================================================== --- trunk/nhibernate/src/NHibernate/Cache/CacheFactory.cs 2010-08-07 17:35:36 UTC (rev 5126) +++ trunk/nhibernate/src/NHibernate/Cache/CacheFactory.cs 2010-08-08 21:40:41 UTC (rev 5127) @@ -1,4 +1,4 @@ -using log4net; + using NHibernate.Cfg; using System.Collections.Generic; @@ -9,7 +9,7 @@ /// </summary> public static class CacheFactory { - private static readonly ILog log = LogManager.GetLogger(typeof(CacheFactory)); + private static readonly ILogger log = LogggerProvider.LoggerFor(typeof(CacheFactory)); public const string ReadOnly = "read-only"; public const string ReadWrite = "read-write"; Modified: trunk/nhibernate/src/NHibernate/Cache/NoCacheProvider.cs =================================================================== --- trunk/nhibernate/src/NHibernate/Cache/NoCacheProvider.cs 2010-08-07 17:35:36 UTC (rev 5126) +++ trunk/nhibernate/src/NHibernate/Cache/NoCacheProvider.cs 2010-08-08 21:40:41 UTC (rev 5127) @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -using log4net; + namespace NHibernate.Cache { /// <summary> @@ -9,7 +9,7 @@ /// </summary> public class NoCacheProvider : ICacheProvider { - private static readonly ILog log = LogManager.GetLogger(typeof(NoCacheProvider)); + private static readonly ILogger log = LogggerProvider.LoggerFor(typeof(NoCacheProvider)); public const string WarnMessage = "Second-level cache is enabled in a class, but no cache provider was selected. Fake cache used."; Modified: trunk/nhibernate/src/NHibernate/Cache/NonstrictReadWriteCache.cs =================================================================== --- trunk/nhibernate/src/NHibernate/Cache/NonstrictReadWriteCache.cs 2010-08-07 17:35:36 UTC (rev 5126) +++ trunk/nhibernate/src/NHibernate/Cache/NonstrictReadWriteCache.cs 2010-08-08 21:40:41 UTC (rev 5127) @@ -1,7 +1,7 @@ using System; using System.Collections; -using log4net; + namespace NHibernate.Cache { /// <summary> @@ -16,7 +16,7 @@ { private ICache cache; - private static readonly ILog log = LogManager.GetLogger(typeof(NonstrictReadWriteCache)); + private static readonly ILogger log = LogggerProvider.LoggerFor(typeof(NonstrictReadWriteCache)); /// <summary> /// Gets the cache region name. Modified: trunk/nhibernate/src/NHibernate/Cache/ReadOnlyCache.cs =================================================================== --- trunk/nhibernate/src/NHibernate/Cache/ReadOnlyCache.cs 2010-08-07 17:35:36 UTC (rev 5126) +++ trunk/nhibernate/src/NHibernate/Cache/ReadOnlyCache.cs 2010-08-08 21:40:41 UTC (rev 5127) @@ -1,7 +1,7 @@ using System; using System.Collections; -using log4net; + namespace NHibernate.Cache { /// <summary> @@ -10,7 +10,7 @@ public class ReadOnlyCache : ICacheConcurrencyStrategy { private ICache cache; - private static readonly ILog log = LogManager.GetLogger(typeof(ReadOnlyCache)); + private static readonly ILogger log = LogggerProvider.LoggerFor(typeof(ReadOnlyCache)); /// <summary> /// Gets the cache region name. Modified: trunk/nhibernate/src/NHibernate/Cache/ReadWriteCache.cs =================================================================== --- trunk/nhibernate/src/NHibernate/Cache/ReadWriteCache.cs 2010-08-07 17:35:36 UTC (rev 5126) +++ trunk/nhibernate/src/NHibernate/Cache/ReadWriteCache.cs 2010-08-08 21:40:41 UTC (rev 5127) @@ -1,7 +1,7 @@ using System; using System.Collections; -using log4net; + namespace NHibernate.Cache { /// <summary> @@ -30,7 +30,7 @@ bool IsPuttable(long txTimestamp, object newVersion, IComparer comparator); } - private static readonly ILog log = LogManager.GetLogger(typeof(ReadWriteCache)); + private static readonly ILogger log = LogggerProvider.LoggerFor(typeof(ReadWriteCache)); private readonly object _lockObject = new object(); private ICache cache; Modified: trunk/nhibernate/src/NHibernate/Cache/StandardQueryCache.cs =================================================================== --- trunk/nhibernate/src/NHibernate/Cache/StandardQueryCache.cs 2010-08-07 17:35:36 UTC (rev 5126) +++ trunk/nhibernate/src/NHibernate/Cache/StandardQueryCache.cs 2010-08-08 21:40:41 UTC (rev 5127) @@ -2,7 +2,7 @@ using System.Collections; using System.Collections.Generic; using Iesi.Collections.Generic; -using log4net; + using NHibernate.Cfg; using NHibernate.Engine; using NHibernate.Type; @@ -18,7 +18,7 @@ /// </summary> public class StandardQueryCache : IQueryCache { - private static readonly ILog log = LogManager.GetLogger(typeof (StandardQueryCache)); + private static readonly ILogger log = LogggerProvider.LoggerFor(typeof (StandardQueryCache)); private readonly ICache queryCache; private readonly string regionName; private readonly UpdateTimestampsCache updateTimestampsCache; Modified: trunk/nhibernate/src/NHibernate/Cache/UpdateTimestampsCache.cs =================================================================== --- trunk/nhibernate/src/NHibernate/Cache/UpdateTimestampsCache.cs 2010-08-07 17:35:36 UTC (rev 5126) +++ trunk/nhibernate/src/NHibernate/Cache/UpdateTimestampsCache.cs 2010-08-08 21:40:41 UTC (rev 5127) @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Runtime.CompilerServices; using Iesi.Collections.Generic; -using log4net; + using NHibernate.Cfg; namespace NHibernate.Cache @@ -16,7 +16,7 @@ /// </summary> public class UpdateTimestampsCache { - private static readonly ILog log = LogManager.GetLogger(typeof(UpdateTimestampsCache)); + private static readonly ILogger log = LogggerProvider.LoggerFor(typeof(UpdateTimestampsCache)); private ICache updateTimestamps; private readonly string regionName = typeof(UpdateTimestampsCache).Name; Modified: trunk/nhibernate/src/NHibernate/Cfg/Configuration.cs =================================================================== --- trunk/nhibernate/src/NHibernate/Cfg/Configuration.cs 2010-08-07 17:35:36 UTC (rev 5126) +++ trunk/nhibernate/src/NHibernate/Cfg/Configuration.cs 2010-08-08 21:40:41 UTC (rev 5127) @@ -10,7 +10,7 @@ using System.Xml.Schema; using Iesi.Collections; using Iesi.Collections.Generic; -using log4net; + using NHibernate.Bytecode; using NHibernate.Cfg.ConfigurationSchema; using NHibernate.Cfg.MappingSchema; @@ -75,7 +75,7 @@ protected IDictionary<string, Mappings.TableDescription> tableNameBinding; protected IDictionary<Table, Mappings.ColumnNames> columnNameBindingPerTable; - private static readonly ILog log = LogManager.GetLogger(typeof(Configuration)); + private static readonly ILogger log = LogggerProvider.LoggerFor(typeof(Configuration)); protected internal SettingsFactory settingsFactory; Modified: trunk/nhibernate/src/NHibernate/Cfg/ConfigurationSchema/HibernateConfiguration.cs =================================================================== --- trunk/nhibernate/src/NHibernate/Cfg/ConfigurationSchema/HibernateConfiguration.cs 2010-08-07 17:35:36 UTC (rev 5126) +++ trunk/nhibernate/src/NHibernate/Cfg/ConfigurationSchema/HibernateConfiguration.cs 2010-08-08 21:40:41 UTC (rev 5127) @@ -1,8 +1,8 @@ using System; using System.Xml; using System.Xml.XPath; -using log4net; + namespace NHibernate.Cfg.ConfigurationSchema { /// <summary> @@ -23,7 +23,7 @@ /// </summary> public class HibernateConfiguration : IHibernateConfiguration { - private static readonly ILog log = LogManager.GetLogger(typeof(HibernateConfiguration)); + private static readonly ILogger log = LogggerProvider.LoggerFor(typeof(HibernateConfiguration)); /// <summary> /// Initializes a new instance of the <see cref="HibernateConfiguration"/> class. Modified: trunk/nhibernate/src/NHibernate/Cfg/ConfigurationSchema/SessionFactoryConfiguration.cs =================================================================== --- trunk/nhibernate/src/NHibernate/Cfg/ConfigurationSchema/SessionFactoryConfiguration.cs 2010-08-07 17:35:36 UTC (rev 5126) +++ trunk/nhibernate/src/NHibernate/Cfg/ConfigurationSchema/SessionFactoryConfiguration.cs 2010-08-08 21:40:41 UTC (rev 5127) @@ -8,7 +8,7 @@ /// </summary> public class SessionFactoryConfiguration : SessionFactoryConfigurationBase { - //private static readonly ILog log = LogManager.GetLogger(typeof(SessionFactoryConfiguration)); + //private static readonly ILogger log = LogggerProvider.LoggerFor(typeof(SessionFactoryConfiguration)); internal SessionFactoryConfiguration(XPathNavigator hbConfigurationSection) { Modified: trunk/nhibernate/src/NHibernate/Cfg/Environment.cs =================================================================== --- trunk/nhibernate/src/NHibernate/Cfg/Environment.cs 2010-08-07 17:35:36 UTC (rev 5126) +++ trunk/nhibernate/src/NHibernate/Cfg/Environment.cs 2010-08-08 21:40:41 UTC (rev 5127) @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Configuration; using System.Reflection; -using log4net; + using NHibernate.Bytecode; using NHibernate.Cfg.ConfigurationSchema; using NHibernate.Util; @@ -167,7 +167,7 @@ private static IBytecodeProvider BytecodeProviderInstance; private static bool EnableReflectionOptimizer; - private static readonly ILog log = LogManager.GetLogger(typeof (Environment)); + private static readonly ILogger log = LogggerProvider.LoggerFor(typeof (Environment)); /// <summary> /// Issue warnings to user when any obsolete property names are used. Modified: trunk/nhibernate/src/NHibernate/Cfg/Mappings.cs =================================================================== --- trunk/nhibernate/src/NHibernate/Cfg/Mappings.cs 2010-08-07 17:35:36 UTC (rev 5126) +++ trunk/nhibernate/src/NHibernate/Cfg/Mappings.cs 2010-08-08 21:40:41 UTC (rev 5127) @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; using Iesi.Collections.Generic; -using log4net; + using NHibernate.Engine; using NHibernate.Mapping; @@ -47,7 +47,7 @@ #endregion - private static readonly ILog log = LogManager.GetLogger(typeof(Mappings)); + private static readonly ILogger log = LogggerProvider.LoggerFor(typeof(Mappings)); private readonly IDictionary<string, PersistentClass> classes; private readonly IDictionary<string, Mapping.Collection> collections; Modified: trunk/nhibernate/src/NHibernate/Cfg/SettingsFactory.cs =================================================================== --- trunk/nhibernate/src/NHibernate/Cfg/SettingsFactory.cs 2010-08-07 17:35:36 UTC (rev 5126) +++ trunk/nhibernate/src/NHibernate/Cfg/SettingsFactory.cs 2010-08-08 21:40:41 UTC (rev 5127) @@ -2,7 +2,7 @@ using System.Collections; using System.Collections.Generic; using System.Data; -using log4net; + using NHibernate.AdoNet; using NHibernate.AdoNet.Util; using NHibernate.Cache; @@ -22,7 +22,7 @@ [Serializable] public sealed class SettingsFactory { - private static readonly ILog log = LogManager.GetLogger(typeof(SettingsFactory)); + private static readonly ILogger log = LogggerProvider.LoggerFor(typeof(SettingsFactory)); private static readonly string DefaultCacheProvider = typeof(NoCacheProvider).AssemblyQualifiedName; public Settings BuildSettings(IDictionary<string, string> properties) Modified: trunk/nhibernate/src/NHibernate/Cfg/XmlHbmBinding/Binder.cs =================================================================== --- trunk/nhibernate/src/NHibernate/Cfg/XmlHbmBinding/Binder.cs 2010-08-07 17:35:36 UTC (rev 5126) +++ trunk/nhibernate/src/NHibernate/Cfg/XmlHbmBinding/Binder.cs 2010-08-08 21:40:41 UTC (rev 5127) @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using log4net; + using NHibernate.Mapping; using NHibernate.Type; using NHibernate.Util; @@ -10,7 +10,7 @@ { public abstract class Binder { - protected static readonly ILog log = LogManager.GetLogger(typeof (Binder)); + protected static readonly ILogger log = LogggerProvider.LoggerFor(typeof (Binder)); protected static readonly IDictionary<string, MetaAttribute> EmptyMeta = new CollectionHelper.EmptyMapClass<string, MetaAttribute>(); Modified: trunk/nhibernate/src/NHibernate/Cfg/XmlHbmBinding/FilterDefinitionFactory.cs =================================================================== --- trunk/nhibernate/src/NHibernate/Cfg/XmlHbmBinding/FilterDefinitionFactory.cs 2010-08-07 17:35:36 UTC (rev 5126) +++ trunk/nhibernate/src/NHibernate/Cfg/XmlHbmBinding/FilterDefinitionFactory.cs 2010-08-08 21:40:41 UTC (rev 5127) @@ -1,5 +1,5 @@ using System.Collections.Generic; -using log4net; + using NHibernate.Cfg.MappingSchema; using NHibernate.Engine; using NHibernate.Type; @@ -8,7 +8,7 @@ { public class FilterDefinitionFactory { - private static readonly ILog log = LogManager.GetLogger(typeof (FilterDefinitionFactory)); + private static readonly ILogger log = LogggerProvider.LoggerFor(typeof (FilterDefinitionFactory)); public static FilterDefinition CreateFilterDefinition(HbmFilterDef filterDefSchema) { Modified: trunk/nhibernate/src/NHibernate/Cfg/XmlHbmBinding/MappingLogExtensions.cs =================================================================== --- trunk/nhibernate/src/NHibernate/Cfg/XmlHbmBinding/MappingLogExtensions.cs 2010-08-07 17:35:36 UTC (rev 5126) +++ trunk/nhibernate/src/NHibernate/Cfg/XmlHbmBinding/MappingLogExtensions.cs 2010-08-08 21:40:41 UTC (rev 5127) @@ -1,11 +1,11 @@ using System.Linq; -using log4net; + namespace NHibernate.Cfg.XmlHbmBinding { public static class MappingLogExtensions { - public static void LogMapped(this Mapping.Property property, ILog log) + public static void LogMapped(this Mapping.Property property, ILogger log) { if (log.IsDebugEnabled) { Modified: trunk/nhibernate/src/NHibernate/Collection/PersistentArrayHolder.cs =================================================================== --- trunk/nhibernate/src/NHibernate/Collection/PersistentArrayHolder.cs 2010-08-07 17:35:36 UTC (rev 5126) +++ trunk/nhibernate/src/NHibernate/Collection/PersistentArrayHolder.cs 2010-08-08 21:40:41 UTC (rev 5127) @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Data; using System.Diagnostics; -using log4net; + using NHibernate.DebugHelpers; using NHibernate.Engine; using NHibernate.Loader; @@ -20,7 +20,7 @@ [DebuggerTypeProxy(typeof (CollectionProxy))] public class PersistentArrayHolder : AbstractPersistentCollection, ICollection { - private static readonly ILog log = LogManager.GetLogger(typeof (PersistentArrayHolder)); + private static readonly ILogger log = LogggerProvider.LoggerFor(typeof (PersistentArrayHolder)); private Array array; Modified: trunk/nhibernate/src/NHibernate/Connection/ConnectionProvider.cs =================================================================== --- trunk/nhibernate/src/NHibernate/Connection/ConnectionProvider.cs 2010-08-07 17:35:36 UTC (rev 5126) +++ trunk/nhibernate/src/NHibernate/Connection/ConnectionProvider.cs 2010-08-08 21:40:41 UTC (rev 5127) @@ -2,7 +2,7 @@ using System.Collections; using System.Configuration; using System.Data; -using log4net; + using NHibernate.Driver; using NHibernate.Util; using Environment=NHibernate.Cfg.Environment; @@ -15,7 +15,7 @@ /// </summary> public abstract class ConnectionProvider : IConnectionProvider { - private static readonly ILog log = LogManager.GetLogger(typeof(ConnectionProvider)); + private static readonly ILogger log = LogggerProvider.LoggerFor(typeof(ConnectionProvider)); private string connString; private IDriver driver; Modified: trunk/nhibernate/src/NHibernate/Connection/ConnectionProviderFactory.cs =================================================================== --- trunk/nhibernate/src/NHibernate/Connection/ConnectionProviderFactory.cs 2010-08-07 17:35:36 UTC (rev 5126) +++ trunk/nhibernate/src/NHibernate/Connection/ConnectionProviderFactory.cs 2010-08-08 21:40:41 UTC (rev 5127) @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using log4net; + using NHibernate.Util; using Environment=NHibernate.Cfg.Environment; @@ -11,7 +11,7 @@ /// </summary> public sealed class ConnectionProviderFactory { - private static readonly ILog log = LogManager.GetLogger(typeof(ConnectionProviderFactory)); + private static readonly ILogger log = LogggerProvider.LoggerFor(typeof(ConnectionProviderFactory)); // cannot be instantiated private ConnectionProviderFactory() Modified: trunk/nhibernate/src/NHibernate/Connection/DriverConnectionProvider.cs =================================================================== --- trunk/nhibernate/src/NHibernate/Connection/DriverConnectionProvider.cs 2010-08-07 17:35:36 UTC (rev 5126) +++ trunk/nhibernate/src/NHibernate/Connection/DriverConnectionProvider.cs 2010-08-08 21:40:41 UTC (rev 5127) @@ -1,7 +1,7 @@ using System; using System.Data; -using log4net; + namespace NHibernate.Connection { /// <summary> @@ -9,7 +9,7 @@ /// </summary> public class DriverConnectionProvider : ConnectionProvider { - private static readonly ILog log = LogManager.GetLogger(typeof(DriverConnectionProvider)); + private static readonly ILogger log = LogggerProvider.LoggerFor(typeof(DriverConnectionProvider)); /// <summary> /// Closes and Disposes of the <see cref="IDbConnection"/>. Modified: trunk/nhibernate/src/NHibernate/Connection/UserSuppliedConnectionProvider.cs =================================================================== --- trunk/nhibernate/src/NHibernate/Connection/UserSuppliedConnectionProvider.cs 2010-08-07 17:35:36 UTC (rev 5126) +++ trunk/nhibernate/src/NHibernate/Connection/UserSuppliedConnectionProvider.cs 2010-08-08 21:40:41 UTC (rev 5127) @@ -1,8 +1,8 @@ using System; using System.Collections.Generic; using System.Data; -using log4net; + namespace NHibernate.Connection { /// <summary> @@ -14,7 +14,7 @@ /// </remarks> public class UserSuppliedConnectionProvider : ConnectionProvider { - private static readonly ILog log = LogManager.GetLogger(typeof(UserSuppliedConnectionProvider)); + private static readonly ILogger log = LogggerProvider.LoggerFor(typeof(UserSuppliedConnectionProvider)); /// <summary> /// Throws an <see cref="InvalidOperationException"/> if this method is called Modified: trunk/nhibernate/src/NHibernate/Context/ThreadLocalSessionContext.cs =================================================================== --- trunk/nhibernate/src/NHibernate/Context/ThreadLocalSessionContext.cs 2010-08-07 17:35:36 UTC (rev 5126) +++ trunk/nhibernate/src/NHibernate/Context/ThreadLocalSessionContext.cs 2010-08-08 21:40:41 UTC (rev 5127) @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using log4net; + using NHibernate; using NHibernate.Engine; @@ -30,7 +30,7 @@ [Serializable] public class ThreadLocalSessionContext : ICurrentSessionContext { - private static readonly ILog log = LogManager.GetLogger(typeof(ThreadLocalSessionContext)); + private static readonly ILogger log = LogggerProvider.LoggerFor(typeof(ThreadLocalSessionContext)); [ThreadStatic] protected static IDictionary<ISessionFactory, ISession> context; Modified: trunk/nhibernate/src/NHibernate/Dialect/Dialect.cs =================================================================== --- trunk/nhibernate/src/NHibernate/Dialect/Dialect.cs 2010-08-07 17:35:36 UTC (rev 5126) +++ trunk/nhibernate/src/NHibernate/Dialect/Dialect.cs 2010-08-08 21:40:41 UTC (rev 5127) @@ -4,7 +4,7 @@ using System.Data.Common; using System.Text; using Iesi.Collections.Generic; -using log4net; + using NHibernate.Dialect.Function; using NHibernate.Dialect.Lock; using NHibernate.Dialect.Schema; @@ -31,7 +31,7 @@ /// </remarks> public abstract class Dialect { - private static readonly ILog log = LogManager.GetLogger(typeof(Dialect)); + private static readonly ILogger log = LogggerProvider.LoggerFor(typeof(Dialect)); private readonly TypeNames typeNames = new TypeNames(); private readonly TypeNames hibernateTypeNames = new TypeNames(); Modified: trunk/nhibernate/src/NHibernate/Dialect/Lock/UpdateLockingStrategy.cs =================================================================== --- trunk/nhibernate/src/NHibernate/Dialect/Lock/UpdateLockingStrategy.cs 2010-08-07 17:35:36 UTC (rev 5126) +++ trunk/nhibernate/src/NHibernate/Dialect/Lock/UpdateLockingStrategy.cs 2010-08-08 21:40:41 UTC (rev 5127) @@ -1,6 +1,6 @@ using System; using System.Data; -using log4net; + using NHibernate.Engine; using NHibernate.Exceptions; using NHibernate.Impl; @@ -15,7 +15,7 @@ /// <remarks> This strategy is not valid for read style locks. </remarks> public class UpdateLockingStrategy : ILockingStrategy { - private static readonly ILog log = LogManager.GetLogger(typeof(UpdateLockingStrategy)); + private static readonly ILogger log = LogggerProvider.LoggerFor(typeof(UpdateLockingStrategy)); private readonly ILockable lockable; private readonly LockMode lockMode; private readonly SqlString sql; Modified: trunk/nhibernate/src/NHibernate/Dialect/Schema/AbstractTableMetadata.cs =================================================================== --- trunk/nhibernate/src/NHibernate/Dialect/Schema/AbstractTableMetadata.cs 2010-08-07 17:35:36 UTC (rev 5126) +++ trunk/nhibernate/src/NHibernate/Dialect/Schema/AbstractTableMetadata.cs 2010-08-08 21:40:41 UTC (rev 5127) @@ -1,13 +1,13 @@ using System.Collections.Generic; using System.Data; -using log4net; + using NHibernate.Util; namespace NHibernate.Dialect.Schema { public abstract class AbstractTableMetadata : ITableMetadata { - private static readonly ILog log = LogManager.GetLogger(typeof(ITableMetadata)); + private static readonly ILogger log = LogggerProvider.LoggerFor(typeof(ITableMetadata)); private string catalog; private string schema; private string name; Modified: trunk/nhibernate/src/NHibernate/Driver/DriverBase.cs =================================================================== --- trunk/nhibernate/src/NHibernate/Driver/DriverBase.cs 2010-08-07 17:35:36 UTC (rev 5126) +++ trunk/nhibernate/src/NHibernate/Driver/DriverBase.cs 2010-08-08 21:40:41 UTC (rev 5127) @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using System.Data; -using log4net; + using NHibernate.SqlCommand; using NHibernate.SqlTypes; using NHibernate.Util; @@ -14,7 +14,7 @@ /// </summary> public abstract class DriverBase : IDriver, ISqlParameterFormatter { - private static readonly ILog log = LogManager.GetLogger(typeof(DriverBase)); + private static readonly ILogger log = LogggerProvider.LoggerFor(typeof(DriverBase)); private int commandTimeout; private bool prepareSql; Modified: trunk/nhibernate/src/NHibernate/Driver/NHybridDataReader.cs =================================================================== --- trunk/nhibernate/src/NHibernate/Driver/NHybridDataReader.cs 2010-08-07 17:35:36 UTC (rev 5126) +++ trunk/nhibernate/src/NHibernate/Driver/NHybridDataReader.cs 2010-08-08 21:40:41 UTC (rev 5127) @@ -1,7 +1,7 @@ using System; using System.Data; -using log4net; + namespace NHibernate.Driver { /// <summary> @@ -22,7 +22,7 @@ /// </remarks> public class NHybridDataReader : IDataReader { - private ILog log = LogManager.GetLogger(typeof(NHybridDataReader)); + private ILogger log = LogggerProvider.LoggerFor(typeof(NHybridDataReader)); private IDataReader _reader; private bool _isMidstream = false; Modified: trunk/nhibernate/src/NHibernate/Engine/ActionQueue.cs =================================================================== --- trunk/nhibernate/src/NHibernate/Engine/ActionQueue.cs 2010-08-07 17:35:36 UTC (rev 5126) +++ trunk/nhibernate/src/NHibernate/Engine/ActionQueue.cs 2010-08-08 21:40:41 UTC (rev 5127) @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Text; using Iesi.Collections.Generic; -using log4net; + using NHibernate.Action; using NHibernate.Cache; @@ -20,7 +20,7 @@ [Serializable] public class ActionQueue { - private static readonly ILog log = LogManager.GetLogger(typeof(ActionQueue)); + private static readonly ILogger log = LogggerProvider.LoggerFor(typeof(ActionQueue)); private const int InitQueueListSize = 5; private ISessionImplementor session; Modified: trunk/nhibernate/src/NHibernate/Engine/Cascade.cs =================================================================== --- trunk/nhibernate/src/NHibernate/Engine/Cascade.cs 2010-08-07 17:35:36 UTC (rev 5126) +++ trunk/nhibernate/src/NHibernate/Engine/Cascade.cs 2010-08-08 21:40:41 UTC (rev 5127) @@ -1,5 +1,5 @@ using System.Collections; -using log4net; + using NHibernate.Collection; using NHibernate.Event; using NHibernate.Persister.Collection; @@ -70,7 +70,7 @@ /// </summary> public sealed class Cascade { - private static readonly ILog log = LogManager.GetLogger(typeof(Cascade)); + private static readonly ILogger log = LogggerProvider.LoggerFor(typeof(Cascade)); private CascadePoint point; private readonly IEventSource eventSource; Modified: trunk/nhibernate/src/NHibernate/Engine/CascadingAction.cs =================================================================== --- trunk/nhibernate/src/NHibernate/Engine/CascadingAction.cs 2010-08-07 17:35:36 UTC (rev 5126) +++ trunk/nhibernate/src/NHibernate/Engine/CascadingAction.cs 2010-08-08 21:40:41 UTC (rev 5127) @@ -1,6 +1,6 @@ using System.Collections; using Iesi.Collections; -using log4net; + using NHibernate.Collection; using NHibernate.Event; using NHibernate.Persister.Entity; @@ -14,7 +14,7 @@ /// </summary> public abstract class CascadingAction { - private static readonly ILog log = LogManager.GetLogger(typeof(CascadingAction)); + private static readonly ILogger log = LogggerProvider.LoggerFor(typeof(CascadingAction)); #region The CascadingAction contract Modified: trunk/nhibernate/src/NHibernate/Engine/CollectionEntry.cs =================================================================== --- trunk/nhibernate/src/NHibernate/Engine/CollectionEntry.cs 2010-08-07 17:35:36 UTC (rev 5126) +++ trunk/nhibernate/src/NHibernate/Engine/CollectionEntry.cs 2010-08-08 21:40:41 UTC (rev 5127) @@ -1,6 +1,6 @@ using System; using System.Collections; -using log4net; + using NHibernate.Collection; using NHibernate.Impl; using NHibernate.Persister.Collection; @@ -14,7 +14,7 @@ [Serializable] public class CollectionEntry { - private static readonly ILog log = LogManager.GetLogger(typeof (CollectionEntry)); + private static readonly ILogger log = LogggerProvider.LoggerFor(typeof (CollectionEntry)); /// <summary>session-start/post-flush persistent state</summary> private object snapshot; Modified: trunk/nhibernate/src/NHibernate/Engine/Collections.cs =================================================================== --- trunk/nhibernate/src/NHibernate/Engine/Collections.cs 2010-08-07 17:35:36 UTC (rev 5126) +++ trunk/nhibernate/src/NHibernate/Engine/Collections.cs 2010-08-08 21:40:41 UTC (rev 5127) @@ -1,4 +1,4 @@ -using log4net; + using NHibernate.Collection; using NHibernate.Impl; using NHibernate.Persister.Collection; @@ -8,7 +8,7 @@ { public static class Collections { - private static readonly ILog log = LogManager.GetLogger(typeof(Collections)); + private static readonly ILogger log = LogggerProvider.LoggerFor(typeof(Collections)); /// <summary> /// Record the fact that this collection was dereferenced Modified: trunk/nhibernate/src/NHibernate/Engine/ForeignKeys.cs =================================================================== --- trunk/nhibernate/src/NHibernate/Engine/ForeignKeys.cs 2010-08-07 17:35:36 UTC (rev 5126) +++ trunk/nhibernate/src/NHibernate/Engine/ForeignKeys.cs 2010-08-08 21:40:41 UTC (rev 5127) @@ -1,4 +1,4 @@ -using log4net; + using NHibernate.Id; using NHibernate.Persister.Entity; using NHibernate.Proxy; @@ -9,7 +9,7 @@ /// <summary> Algorithms related to foreign key constraint transparency </summary> public static class ForeignKeys { - private static readonly ILog log = LogManager.GetLogger(typeof(ForeignKeys)); + private static readonly ILogger log = LogggerProvider.LoggerFor(typeof(ForeignKeys)); public class Nullifier { Modified: trunk/nhibernate/src/NHibernate/Engine/IdentifierValue.cs =================================================================== --- trunk/nhibernate/src/NHibernate/Engine/IdentifierValue.cs 2010-08-07 17:35:36 UTC (rev 5126) +++ trunk/nhibernate/src/NHibernate/Engine/IdentifierValue.cs 2010-08-08 21:40:41 UTC (rev 5127) @@ -1,5 +1,5 @@ -using log4net; + namespace NHibernate.Engine { /// <summary> @@ -9,7 +9,7 @@ /// </summary> public class IdentifierValue { - private static readonly ILog log = LogManager.GetLogger(typeof(IdentifierValue)); + private static readonly ILogger log = LogggerProvider.LoggerFor(typeof(IdentifierValue)); private readonly object value; Modified: trunk/nhibernate/src/NHibernate/Engine/Loading/CollectionLoadContext.cs =================================================================== --- trunk/nhibernate/src/NHibernate/Engine/Loading/CollectionLoadContext.cs 2010-08-07 17:35:36 UTC (rev 5126) +++ trunk/nhibernate/src/NHibernate/Engine/Loading/CollectionLoadContext.cs 2010-08-08 21:40:41 UTC (rev 5127) @@ -3,7 +3,7 @@ using System.Data; using System.Diagnostics; using Iesi.Collections.Generic; -using log4net; + using NHibernate.Cache; using NHibernate.Cache.Entry; using NHibernate.Collection; @@ -22,7 +22,7 @@ /// </remarks> public class CollectionLoadContext { - private static readonly ILog log = LogManager.GetLogger(typeof(CollectionLoadContext)); + private static readonly ILogger log = LogggerProvider.LoggerFor(typeof(CollectionLoadContext)); private readonly LoadContexts loadContexts; private readonly IDataReader resultSet; private readonly ISet<CollectionKey> localLoadingCollectionKeys = new HashedSet<CollectionKey>(); Modified: trunk/nhibernate/src/NHibernate/Engine/Loading/LoadContexts.cs =================================================================== --- trunk/nhibernate/src/NHibernate/Engine/Loading/LoadContexts.cs 2010-08-07 17:35:36 UTC (rev 5126) +++ trunk/nhibernate/src/NHibernate/Engine/Loading/LoadContexts.cs 2010-08-08 21:40:41 UTC (rev 5127) @@ -2,7 +2,7 @@ using System.Collections; using System.Collections.Generic; using System.Data; -using log4net; + using NHibernate.Collection; using NHibernate.Impl; using NHibernate.Persister.Collection; @@ -26,7 +26,7 @@ /// </remarks> public class LoadContexts { - private static readonly ILog log = LogManager.GetLogger(typeof(LoadContexts)); + private static readonly ILogger log = LogggerProvider.LoggerFor(typeof(LoadContexts)); [NonSerialized] private readonly IPersistenceContext persistenceContext; Modified: trunk/nhibernate/src/NHibernate/Engine/Query/HQLQueryPlan.cs =================================================================== --- trunk/nhibernate/src/NHibernate/Engine/Query/HQLQueryPlan.cs 2010-08-07 17:35:36 UTC (rev 5126) +++ trunk/nhibernate/src/NHibernate/Engine/Query/HQLQueryPlan.cs 2010-08-08 21:40:41 UTC (rev 5127) @@ -2,7 +2,7 @@ using System.Collections; using System.Collections.Generic; using Iesi.Collections.Generic; -using log4net; + using NHibernate.Event; using NHibernate.Hql; using NHibernate.Type; @@ -31,7 +31,7 @@ [Serializable] public class HQLQueryPlan : IQueryPlan { - protected static readonly ILog Log = LogManager.GetLogger(typeof(HQLQueryPlan)); + protected static readonly ILogger Log = LogggerProvider.LoggerFor(typeof(HQLQueryPlan)); private readonly string _sourceQuery; Modified: trunk/nhibernate/src/NHibernate/Engine/Query/NativeSQLQueryPlan.cs =================================================================== --- trunk/nhibernate/src/NHibernate/Engine/Query/NativeSQLQueryPlan.cs 2010-08-07 17:35:36 UTC (rev 5126) +++ trunk/nhibernate/src/NHibernate/Engine/Query/NativeSQLQueryPlan.cs 2010-08-08 21:40:41 UTC (rev 5127) @@ -2,7 +2,7 @@ using System.Collections; using System.Collections.Generic; using System.Data; -using log4net; + using NHibernate.Action; using NHibernate.Engine.Query.Sql; using NHibernate.Event; @@ -19,7 +19,7 @@ [Serializable] public class NativeSQLQueryPlan { - private static readonly ILog log = LogManager.GetLogger(typeof(NativeSQLQueryPlan)); + private static readonly ILogger log = LogggerProvider.LoggerFor(typeof(NativeSQLQueryPlan)); private readonly string sourceQuery; private readonly SQLCustomQuery customQuery; Modified: trunk/nhibernate/src/NHibernate/Engine/Query/QueryPlanCache.cs =================================================================== --- trunk/nhibernate/src/NHibernate/Engine/Query/QueryPlanCache.cs 2010-08-07 17:35:36 UTC (rev 5126) +++ trunk/nhibernate/src/NHibernate/Engine/Query/QueryPlanCache.cs 2010-08-08 21:40:41 UTC (rev 5127) @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using Iesi.Collections.Generic; -using log4net; + using NHibernate.Engine.Query.Sql; using NHibernate.Util; @@ -11,7 +11,7 @@ [Serializable] public class QueryPlanCache { - private static readonly ILog log = LogManager.GetLogger(typeof(QueryPlanCache)); + private static readonly ILogger log = LogggerProvider.LoggerFor(typeof(QueryPlanCache)); private readonly ISessionFactoryImplementor factory; Modified: trunk/nhibernate/src/NHibernate/Engine/QueryParameters.cs =================================================================== --- trunk/nhibernate/src/NHibernate/Engine/QueryParameters.cs 2010-08-07 17:35:36 UTC (rev 5126) +++ trunk/nhibernate/src/NHibernate/Engine/QueryParameters.cs 2010-08-08 21:40:41 UTC (rev 5127) @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Data; using System.Linq; -using log4net; + using NHibernate.Hql.Classic; using NHibernate.Impl; using NHibernate.SqlCommand; @@ -22,7 +22,7 @@ { public delegate int[] GetNamedParameterLocations(string parameterName); - private static readonly ILog log = LogManager.GetLogger(typeof (QueryParameters)); + private static readonly ILogger log = LogggerProvider.LoggerFor(typeof (QueryParameters)); private IType[] _positionalParameterTypes; private object[] _positionalParameterValues; Modified: trunk/nhibernate/src/NHibernate/Engine/StatefulPersistenceContext.cs =================================================================== --- trunk/nhibernate/src/NHibernate/Engine/StatefulPersistenceContext.cs 2010-08-07 17:35:36 UTC (rev 5126) +++ trunk/nhibernate/src/NHibernate/Engine/StatefulPersistenceContext.cs 2010-08-08 21:40:41 UTC (rev 5127) @@ -6,7 +6,7 @@ using System.Text; using Iesi.Collections; using Iesi.Collections.Generic; -using log4net; + using NHibernate.Collection; using NHibernate.Engine.Loading; using NHibernate.Impl; @@ -32,8 +32,8 @@ public class StatefulPersistenceContext : IPersistenceContext, ISerializable, IDeserializationCallback { private const int InitCollectionSize = 8; - private static readonly ILog log = LogManager.GetLogger(typeof(StatefulPersistenceContext)); - private static readonly ILog ProxyWarnLog = LogManager.GetLogger(typeof(StatefulPersistenceContext).FullName + ".ProxyWarnLog"); + private static readonly ILogger log = LogggerProvider.LoggerFor(typeof(StatefulPersistenceContext)); + private static readonly ILogger ProxyWarnLog = LogggerProvider.LoggerFor(typeof(StatefulPersistenceContext).FullName + ".ProxyWarnLog"); public static readonly object NoRow = new object(); Modified: trunk/nhibernate/src/NHibernate/Engine/Transaction/Isolater.cs =================================================================== --- trunk/nhibernate/src/NHibernate/Engine/Transaction/Isolater.cs 2010-08-07 17:35:36 UTC (rev 5126) +++ trunk/nhibernate/src/NHibernate/Engine/Transaction/Isolater.cs 2010-08-08 21:40:41 UTC (rev 5127) @@ -1,7 +1,7 @@ using System; using System.Data; using System.Data.Common; -using log4net; + using NHibernate.Dialect; using NHibernate.Exceptions; @@ -28,7 +28,7 @@ /// </remarks> public class Isolater { - private static readonly ILog log = LogManager.GetLogger(typeof(Isolater)); + private static readonly ILogger log = LogggerProvider.LoggerFor(typeof(Isolater)); /// <summary> /// Ensures that all processing actually performed by the given work will Modified: trunk/nhibernate/src/NHibernate/Engine/TwoPhaseLoad.cs =================================================================== --- trunk/nhibernate/src/NHibernate/Engine/TwoPhaseLoad.cs 2010-08-07 17:35:36 UTC (rev 5126) +++ trunk/nhibernate/src/NHibernate/Engine/TwoPhaseLoad.cs 2010-08-08 21:40:41 UTC (rev 5127) @@ -1,5 +1,5 @@ using System.Diagnostics; -using log4net; + using NHibernate.Cache; using NHibernate.Cache.Entry; using NHibernate.Event; @@ -18,7 +18,7 @@ /// </summary> public static class TwoPhaseLoad { - private static readonly ILog log = LogManager.GetLogger(typeof(TwoPhaseLoad)); + private static readonly ILogger log = LogggerProvider.LoggerFor(typeof(TwoPhaseLoad)); /// <summary> /// Register the "hydrated" state of an entity instance, after the first step of 2-phase loading. Modified: trunk/nhibernate/src/NHibernate/Engine/VersionValue.cs =================================================================== --- trunk/nhibernate/src/NHibernate/Engine/VersionValue.cs 2010-08-07 17:35:36 UTC (rev 5126) +++ trunk/nhibernate/src/NHibernate/Engine/VersionValue.cs 2010-08-08 21:40:41 UTC (rev 5127) @@ -1,5 +1,5 @@ using System; -using log4net; + using NHibernate.Id; namespace NHibernate.Engine @@ -11,7 +11,7 @@ /// </summary> public class VersionValue { - private static readonly ILog log = LogManager.GetLogger(typeof(VersionValue)); + private static readonly ILogger log = LogggerProvider.LoggerFor(typeof(VersionValue)); private readonly object value; Modified: trunk/nhibernate/src/NHibernate/Engine/Versioning.cs =================================================================== --- trunk/nhibernate/src/NHibernate/Engine/Versioning.cs 2010-08-07 17:35:36 UTC (rev 5126) +++ trunk/nhibernate/src/NHibernate/Engine/Versioning.cs 2010-08-08 21:40:41 UTC (rev 5127) @@ -1,4 +1,4 @@ -using log4net; + using NHibernate.Persister.Entity; using NHibernate.Type; @@ -17,7 +17,7 @@ All = 2 } - private static readonly ILog log = LogManager.GetLogger(typeof(Versioning)); + private static readonly ILogger log = LogggerProvider.LoggerFor(typeof(Versioning)); /// <summary> /// Increment the given version number Modified: trunk/nhibernate/src/NHibernate/Event/Default/AbstractFlushingEventListener.cs =================================================================== --- trunk/nhibernate/src/NHibernate/Event/Default/AbstractFlushingEventListener.cs 2010-08-07 17:35:36 UTC (rev 5126) +++ trunk/nhibernate/src/NHibernate/Event/Default/AbstractFlushingEventListener.cs 2010-08-08 21:40:41 UTC (rev 5127) @@ -2,7 +2,7 @@ using System.Collections; using System.Collections.Generic; using System.Text; -using log4net; + using NHibernate.Action; using NHibernate.Collection; using NHibernate.Engine; @@ -18,7 +18,7 @@ [Serializable] public abstract class AbstractFlushingEventListener { - private static readonly ILog log = LogManager.GetLogger(typeof (AbstractFlushingEventListener)); + private static readonly ILogger log = LogggerProvider.LoggerFor(typeof (AbstractFlushingEventListener)); protected virtual object Anything { Modified: trunk/nhibernate/src/NHibernate/Event/Default/AbstractLockUpgradeEventListener.cs =================================================================== --- trunk/nhibernate/src/NHibernate/Event/Default/AbstractLockUpgradeEventListener.cs 2010-08-07 17:35:36 UTC (rev 5126) +++ trunk/nhibernate/src/NHibernate/Event/Default/AbstractLockUpgradeEventListener.cs 2010-08-08 21:40:41 UTC (rev 5127) @@ -1,5 +1,5 @@ using System; -using log4net; + using NHibernate.Cache; using NHibernate.Engine; using NHibernate.Impl; @@ -15,7 +15,7 @@ [Serializable] public class AbstractLockUpgradeEventListener : AbstractReassociateEventListener { - private static readonly ILog log = LogManager.GetLogger(typeof(AbstractLockUpgradeEventListener)); + private static readonly ILogger log = LogggerProvider.LoggerFor(typeof(AbstractLockUpgradeEventListener)); /// <summary> /// Performs a pessimistic lock upgrade on a given entity, if needed. Modified: trunk/nhibernate/src/NHibernate/Event/Default/AbstractReassociateEventListener.cs =================================================================== --- trunk/nhibernate/src/NHibernate/Event/Default/AbstractReassociateEventListener.cs 2010-08-07 17:35:36 UTC (rev 5126) +++ trunk/nhibernate/src/NHibernate/Event/Default/AbstractReassociateEventListener.cs 2010-08-08 21:40:41 UTC (rev 5127) @@ -1,5 +1,5 @@ using System; -using log4net; + using NHibernate.Engine; using NHibernate.Impl; using NHibernate.Persister.Entity; @@ -15,7 +15,7 @@ [Serializable] public class AbstractReassociateEventListener { - private static readonly ILog log = LogManager.GetLogger(typeof(AbstractReassociateEventListener)); + private static readonly ILogger log = LogggerProvider.LoggerFor(typeof(AbstractReassociateEventListener)); /// <summary> /// Associates a given entity (either transient or associated with another session) to the given session. Modified: trunk/nhibernate/src/NHibernate/Event/Default/AbstractSaveEventListener.cs =================================================================== --- trunk/nhibernate/src/NHibernate/Event/Default/AbstractSaveEventListener.cs 2010-08-07 17:35:36 UTC (rev 5126) +++ trunk/nhibernate/src/NHibernate/Event/Default/AbstractSaveEventListener.cs 2010-08-08 21:40:41 UTC (rev 5127) @@ -1,6 +1,6 @@ using System; using System.Collections; -using log4net; + using NHibernate.Action; using NHibernate.Classic; using NHibernate.Engine; @@ -28,7 +28,7 @@ [Serializable] public abstract class AbstractSaveEventListener : AbstractReassociateEventListener { - private static readonly ILog log = LogManager.GetLogger(typeof(AbstractSaveEventListener)); + private static readonly ILogger log = LogggerProvider.LoggerFor(typeof(AbstractSaveEventListener)); protected virtual bool? AssumedUnsaved { Modified: trunk/nhibernate/src/NHibernate/Event/Default/DefaultAutoFlushEventListener.cs =================================================================== --- trunk/nhibernate/src/NHibernate/Event/Default/DefaultAutoFlushEventListener.cs 2010-08-07 17:35:36 UTC (rev 5126) +++ trunk/nhibernate/src/NHibernate/Event/Default/DefaultAutoFlushEventListener.cs 2010-08-08 21:40:41 UTC (rev 5127) @@ -1,5 +1,5 @@ using System; -using log4net; + using NHibernate.Engine; namespace NHibernate.Event.Default @@ -11,7 +11,7 @@ [Serializable] public class DefaultAutoFlushEventListener : AbstractFlushingEventListener, IAutoFlushEventListener { - private static readonly ILog log = LogManager.GetLogger(typeof(DefaultAutoFlushEventListener)); + private static readonly ILogger log = LogggerProvider.LoggerFor(typeof(DefaultAutoFlushEventListener)); #region IAutoFlushEventListener Members Modified: trunk/nhibernate/src/NHibernate/Event/Default/DefaultDeleteEventListener.cs =================================================================== --- trunk/nhibernate/src/NHibernate/Event/Default/DefaultDeleteEventListener.cs 2010-08-07 17:35:36 UTC (rev 5126) +++ trunk/nhibernate/src/NHibernate/Event/Default/DefaultDeleteEventListener.cs 2010-08-08 21:40:41 UTC (rev 5127) @@ -1,6 +1,6 @@ using System; using Iesi.Collections; -using log4net; + using NHibernate.Action; using NHibernate.Classic; using NHibernate.Engine; @@ -19,7 +19,7 @@ [Serializable] ... [truncated message content] |