Author: gbayon
Date: Wed Sep 21 13:14:21 2005
New Revision: 290818
URL: http://svn.apache.org/viewcvs?rev=290818&view=rev
Log:
- Remove dependency on log4NET (Added a new project
IBatisNet.Common.Logging.Log4Net)
To allow logging with log4net use
<logFactoryAdapter type="IBatisNet.Common.Logging.Impl.Log4NetLoggerFA,
IBatisNet.Common.Logging.Log4Net">
in config file
Added:
ibatis/trunk/cs/mapper/IBatisNet.Common.Logging.Log4Net/
ibatis/trunk/cs/mapper/IBatisNet.Common.Logging.Log4Net/AssemblyInfo.cs
ibatis/trunk/cs/mapper/IBatisNet.Common.Logging.Log4Net/IBatisNet.Common.Logging.Log4Net.csproj
ibatis/trunk/cs/mapper/IBatisNet.Common.Logging.Log4Net/Log4NetLogger.cs
ibatis/trunk/cs/mapper/IBatisNet.Common.Logging.Log4Net/Log4NetLoggerFA.cs
Removed:
ibatis/trunk/cs/mapper/IBatisNet.Common/Logging/Impl/Log4NetLogger.cs
ibatis/trunk/cs/mapper/IBatisNet.Common/Logging/Impl/Log4NetLoggerFA.cs
Modified:
ibatis/trunk/cs/mapper/DataMapper.sln
ibatis/trunk/cs/mapper/IBatisNet.Common/IBatisNet.Common.csproj
ibatis/trunk/cs/mapper/IBatisNet.Common/Logging/IDbConnectionProxy.cs
ibatis/trunk/cs/mapper/IBatisNet.Common/Transaction/TransactionScope.cs
ibatis/trunk/cs/mapper/IBatisNet.Common/Utilities/ConfigWatcherHandler.cs
ibatis/trunk/cs/mapper/IBatisNet.Common/Utilities/Resources.cs
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/IBatisNet.DataMapper.Test.csproj
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/IBatisNet.DataMapper.Test.dll.config
ibatis/trunk/cs/mapper/IBatisNet.DataMapper/ChangeLog.txt
Modified: ibatis/trunk/cs/mapper/DataMapper.sln
URL:
http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/DataMapper.sln?rev=290818&r1=290817&r2=290818&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/DataMapper.sln (original)
+++ ibatis/trunk/cs/mapper/DataMapper.sln Wed Sep 21 13:14:21 2005
@@ -11,6 +11,10 @@
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") =
"IBatisNet.Common.Logging.Log4Net",
"IBatisNet.Common.Logging.Log4Net\IBatisNet.Common.Logging.Log4Net.csproj",
"{023FE8D7-7E1A-4DDF-A0EA-8FB0E1B3122B}"
+ ProjectSection(ProjectDependencies) = postProject
+ EndProjectSection
+EndProject
Global
GlobalSection(SolutionConfiguration) = preSolution
Debug = Debug
@@ -29,6 +33,10 @@
{998B79D9-800F-493F-A263-306F06906E2F}.Debug.Build.0 =
Debug|.NET
{998B79D9-800F-493F-A263-306F06906E2F}.Release.ActiveCfg =
Release|.NET
{998B79D9-800F-493F-A263-306F06906E2F}.Release.Build.0 =
Release|.NET
+ {023FE8D7-7E1A-4DDF-A0EA-8FB0E1B3122B}.Debug.ActiveCfg =
Debug|.NET
+ {023FE8D7-7E1A-4DDF-A0EA-8FB0E1B3122B}.Debug.Build.0 =
Debug|.NET
+ {023FE8D7-7E1A-4DDF-A0EA-8FB0E1B3122B}.Release.ActiveCfg =
Release|.NET
+ {023FE8D7-7E1A-4DDF-A0EA-8FB0E1B3122B}.Release.Build.0 =
Release|.NET
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
EndGlobalSection
Added: ibatis/trunk/cs/mapper/IBatisNet.Common.Logging.Log4Net/AssemblyInfo.cs
URL:
http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.Common.Logging.Log4Net/AssemblyInfo.cs?rev=290818&view=auto
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.Common.Logging.Log4Net/AssemblyInfo.cs
(added)
+++ ibatis/trunk/cs/mapper/IBatisNet.Common.Logging.Log4Net/AssemblyInfo.cs Wed
Sep 21 13:14:21 2005
@@ -0,0 +1,61 @@
+using System;
+using System.Reflection;
+using System.Runtime.CompilerServices;
+
+//
+// General Information about an assembly is controlled through the following
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+//
+[assembly: AssemblyTitle("IBatisNet.Common.Logging.Log4Net")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("iBATIS.NET")]
+[assembly: AssemblyCopyright("Copyright 2004,2005 The Apache Software
Foundation")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+[assembly: CLSCompliant(true)]
+
+//
+// Version information for an assembly consists of the following four values:
+//
+// Major Version
+// Minor Version
+// Build Number
+// Revision
+//
+// You can specify all the values or you can default the Revision and Build
Numbers
+// by using the '*' as shown below:
+
+[assembly: AssemblyVersion("1.0.0")]
+
+//
+// In order to sign your assembly you must specify a key to use. Refer to the
+// Microsoft .NET Framework documentation for more information on assembly
signing.
+//
+// Use the attributes below to control which key is used for signing.
+//
+// Notes:
+// (*) If no key is specified, the assembly is not signed.
+// (*) KeyName refers to a key that has been installed in the Crypto Service
+// Provider (CSP) on your machine. KeyFile refers to a file which
contains
+// a key.
+// (*) If the KeyFile and the KeyName values are both specified, the
+// following processing occurs:
+// (1) If the KeyName can be found in the CSP, that key is used.
+// (2) If the KeyName does not exist and the KeyFile does exist, the key
+// in the KeyFile is installed into the CSP and used.
+// (*) In order to create a KeyFile, you can use the sn.exe (Strong Name)
utility.
+// When specifying the KeyFile, the location of the KeyFile should be
+// relative to the project output directory which is
+// %Project Directory%\obj\<configuration>. For example, if your KeyFile
is
+// located in the project directory, you would specify the
AssemblyKeyFile
+// attribute as [assembly: AssemblyKeyFile("..\\..\\mykey.snk")]
+// (*) Delay Signing is an advanced option - see the Microsoft .NET Framework
+// documentation for more information on this.
+//
+[assembly: AssemblyDelaySign(false)]
+[assembly: AssemblyKeyFile("")]
+[assembly: AssemblyKeyName("")]
Added:
ibatis/trunk/cs/mapper/IBatisNet.Common.Logging.Log4Net/IBatisNet.Common.Logging.Log4Net.csproj
URL:
http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.Common.Logging.Log4Net/IBatisNet.Common.Logging.Log4Net.csproj?rev=290818&view=auto
==============================================================================
---
ibatis/trunk/cs/mapper/IBatisNet.Common.Logging.Log4Net/IBatisNet.Common.Logging.Log4Net.csproj
(added)
+++
ibatis/trunk/cs/mapper/IBatisNet.Common.Logging.Log4Net/IBatisNet.Common.Logging.Log4Net.csproj
Wed Sep 21 13:14:21 2005
@@ -0,0 +1,115 @@
+<VisualStudioProject>
+ <CSHARP
+ ProjectType = "Local"
+ ProductVersion = "7.10.3077"
+ SchemaVersion = "2.0"
+ ProjectGuid = "{023FE8D7-7E1A-4DDF-A0EA-8FB0E1B3122B}"
+ >
+ <Build>
+ <Settings
+ ApplicationIcon = ""
+ AssemblyKeyContainerName = ""
+ AssemblyName = "IBatisNet.Common.Logging.Log4Net"
+ AssemblyOriginatorKeyFile = ""
+ DefaultClientScript = "JScript"
+ DefaultHTMLPageLayout = "Grid"
+ DefaultTargetSchema = "IE50"
+ DelaySign = "false"
+ OutputType = "Library"
+ PreBuildEvent = ""
+ PostBuildEvent = ""
+ RootNamespace = "IBatisNet.Common.Logging.Log4Net"
+ RunPostBuildEvent = "OnBuildSuccess"
+ StartupObject = ""
+ >
+ <Config
+ Name = "Debug"
+ AllowUnsafeBlocks = "false"
+ BaseAddress = "285212672"
+ CheckForOverflowUnderflow = "false"
+ ConfigurationOverrideFile = ""
+ DefineConstants = "DEBUG;TRACE"
+ DocumentationFile = "IBatisNet.Common.Logging.Log4Net.xml"
+ DebugSymbols = "true"
+ FileAlignment = "4096"
+ IncrementalBuild = "false"
+ NoStdLib = "false"
+ NoWarn = ""
+ Optimize = "false"
+ OutputPath = "bin\Debug\"
+ RegisterForComInterop = "false"
+ RemoveIntegerChecks = "false"
+ TreatWarningsAsErrors = "false"
+ WarningLevel = "4"
+ />
+ <Config
+ Name = "Release"
+ AllowUnsafeBlocks = "false"
+ BaseAddress = "285212672"
+ CheckForOverflowUnderflow = "false"
+ ConfigurationOverrideFile = ""
+ DefineConstants = "TRACE"
+ DocumentationFile = ""
+ DebugSymbols = "false"
+ FileAlignment = "4096"
+ IncrementalBuild = "false"
+ NoStdLib = "false"
+ NoWarn = ""
+ Optimize = "true"
+ OutputPath = "bin\Release\"
+ RegisterForComInterop = "false"
+ RemoveIntegerChecks = "false"
+ TreatWarningsAsErrors = "false"
+ WarningLevel = "4"
+ />
+ </Settings>
+ <References>
+ <Reference
+ Name = "System"
+ AssemblyName = "System"
+ HintPath =
"C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.dll"
+ />
+ <Reference
+ Name = "System.Data"
+ AssemblyName = "System.Data"
+ HintPath =
"C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Data.dll"
+ />
+ <Reference
+ Name = "System.XML"
+ AssemblyName = "System.Xml"
+ HintPath =
"C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.XML.dll"
+ />
+ <Reference
+ Name = "log4net"
+ AssemblyName = "log4net"
+ HintPath = "..\External-Bin\Net\1.1\log4net.dll"
+ />
+ <Reference
+ Name = "IBatisNet.Common"
+ Project = "{BBC8DA4A-EA88-41D9-8B93-929B8F3ADADE}"
+ Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
+ />
+ </References>
+ </Build>
+ <Files>
+ <Include>
+ <File
+ RelPath = "AssemblyInfo.cs"
+ SubType = "Code"
+ BuildAction = "Compile"
+ />
+ <File
+ RelPath = "Log4NetLogger.cs"
+ SubType = "Code"
+ BuildAction = "Compile"
+ />
+ <File
+ RelPath = "Log4NetLoggerFA.cs"
+ SubType = "Code"
+ BuildAction = "Compile"
+ />
+ </Include>
+ </Files>
+ </CSHARP>
+</VisualStudioProject>
+
Added: ibatis/trunk/cs/mapper/IBatisNet.Common.Logging.Log4Net/Log4NetLogger.cs
URL:
http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.Common.Logging.Log4Net/Log4NetLogger.cs?rev=290818&view=auto
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.Common.Logging.Log4Net/Log4NetLogger.cs
(added)
+++ ibatis/trunk/cs/mapper/IBatisNet.Common.Logging.Log4Net/Log4NetLogger.cs
Wed Sep 21 13:14:21 2005
@@ -0,0 +1,226 @@
+
+#region Apache Notice
+/*****************************************************************************
+ * $Header: $
+ * $Revision: $
+ * $Date: $
+ *
+ * iBATIS.NET Data Mapper
+ * Copyright (C) 2004 - Gilles Bayon
+ *
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+
********************************************************************************/
+#endregion
+
+#region Using
+
+using System;
+using IBatisNet.Common.Logging;
+#endregion
+
+
+
+namespace IBatisNet.Common.Logging.Impl
+{
+ /// <summary>
+ /// Summary description for Log4NetLogger.
+ /// </summary>
+ public class Log4NetLogger : ILog
+ {
+
+ #region Fields
+
+ private log4net.ILog _log = null;
+
+ #endregion
+
+ /// <summary>
+ /// Constructor
+ /// </summary>
+ /// <param name="log"></param>
+ internal Log4NetLogger( log4net.ILog log )
+ {
+ _log = log;
+ }
+
+ #region ILog Members
+
+ /// <summary>
+ ///
+ /// </summary>
+ public bool IsInfoEnabled
+ {
+ get { return _log.IsInfoEnabled; }
+ }
+
+ /// <summary>
+ ///
+ /// </summary>
+ public bool IsWarnEnabled
+ {
+ get { return _log.IsWarnEnabled; }
+ }
+
+ /// <summary>
+ ///
+ /// </summary>
+ public bool IsErrorEnabled
+ {
+ get { return _log.IsErrorEnabled; }
+ }
+
+ /// <summary>
+ ///
+ /// </summary>
+ public bool IsFatalEnabled
+ {
+ get { return _log.IsFatalEnabled; }
+ }
+
+ /// <summary>
+ ///
+ /// </summary>
+ public bool IsDebugEnabled
+ {
+ get { return _log.IsDebugEnabled; }
+ }
+
+ /// <summary>
+ ///
+ /// </summary>
+ public bool IsTraceEnabled
+ {
+ get { return _log.IsDebugEnabled; }
+ }
+
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="message"></param>
+ /// <param name="e"></param>
+ public void Info(object message, Exception e)
+ {
+ _log.Info( message, e );
+ }
+
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="message"></param>
+ public void Info(object message)
+ {
+ _log.Info( message );
+ }
+
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="message"></param>
+ /// <param name="e"></param>
+ public void Debug(object message, Exception e)
+ {
+ _log.Debug( message, e );
+ }
+
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="message"></param>
+ public void Debug(object message)
+ {
+ _log.Debug( message );
+ }
+
+
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="message"></param>
+ /// <param name="e"></param>
+ public void Warn(object message, Exception e)
+ {
+ _log.Warn( message, e );
+ }
+
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="message"></param>
+ public void Warn(object message)
+ {
+ _log.Warn( message );
+ }
+
+
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="message"></param>
+ /// <param name="e"></param>
+ public void Trace(object message, Exception e)
+ {
+ _log.Debug( message, e );
+ }
+
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="message"></param>
+ public void Trace(object message)
+ {
+ _log.Debug( message );
+ }
+
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="message"></param>
+ /// <param name="e"></param>
+ public void Fatal(object message, Exception e)
+ {
+ _log.Fatal( message, e );
+ }
+
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="message"></param>
+ public void Fatal(object message)
+ {
+ _log.Fatal( message );
+ }
+
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="message"></param>
+ /// <param name="e"></param>
+ public void Error(object message, Exception e)
+ {
+ _log.Error( message, e );
+ }
+
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="message"></param>
+ public void Error(object message)
+ {
+ _log.Error( message );
+ }
+
+ #endregion
+ }
+}
Added:
ibatis/trunk/cs/mapper/IBatisNet.Common.Logging.Log4Net/Log4NetLoggerFA.cs
URL:
http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.Common.Logging.Log4Net/Log4NetLoggerFA.cs?rev=290818&view=auto
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.Common.Logging.Log4Net/Log4NetLoggerFA.cs
(added)
+++ ibatis/trunk/cs/mapper/IBatisNet.Common.Logging.Log4Net/Log4NetLoggerFA.cs
Wed Sep 21 13:14:21 2005
@@ -0,0 +1,117 @@
+
+#region Apache Notice
+/*****************************************************************************
+ * $Header: $
+ * $Revision: $
+ * $Date: $
+ *
+ * iBATIS.NET Data Mapper
+ * Copyright (C) 2004 - Gilles Bayon
+ *
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+
********************************************************************************/
+#endregion
+
+#region Using
+
+using System;
+using System.Collections.Specialized;
+using System.Configuration;
+using System.IO;
+using log4net.Config;
+
+using IBatisNet.Common.Logging;
+#endregion
+
+namespace IBatisNet.Common.Logging.Impl
+{
+ /// <summary>
+ /// Concrete subclass of ILoggerFactoryAdapter specific to log4n.
+ /// </summary>
+ public class Log4NetLoggerFA : ILoggerFactoryAdapter
+ {
+ /// <summary>
+ /// Constructor
+ /// </summary>
+ /// <param name="properties"></param>
+ public Log4NetLoggerFA(NameValueCollection properties)
+ {
+ string configurationType = string.Empty;
+
+ if ( properties["configType"] != null )
+ {
+ configurationType =
properties["configType"].ToUpper();
+ }
+
+ string configurationFile = string.Empty;
+ if ( properties["configFile"] != null )
+ {
+ configurationFile = properties["configFile"];
+ }
+
+ if ( configurationType == "FILE" || configurationType
== "FILE-WATCH" )
+ {
+ if ( configurationFile == string.Empty )
+ throw new ConfigurationException(
"Configration property 'configurationFile' must be set for log4Net
configuration of type 'FILE'." );
+
+ if ( !File.Exists( configurationFile ) )
+ throw new ConfigurationException(
"log4net configuration file '" + configurationFile + "' does not exists" );
+ }
+
+ switch ( configurationType )
+ {
+ case "INLINE":
+ XmlConfigurator.Configure();
+ break;
+ case "FILE":
+ XmlConfigurator.Configure( new
FileInfo( configurationFile ) );
+ break;
+ case "FILE-WATCH":
+ XmlConfigurator.ConfigureAndWatch( new
FileInfo( configurationFile ) );
+ break;
+ case "EXTERNAL":
+ // Log4net will be configured outside
of IBatisNet
+ break;
+ default:
+ BasicConfigurator.Configure();
+ break;
+ }
+ }
+
+ #region ILoggerFactoryAdapter Members
+
+ /// <summary>
+ /// Get a ILog instance by type name
+ /// </summary>
+ /// <param name="name"></param>
+ /// <returns></returns>
+ public ILog GetLogger(string name)
+ {
+ return new Log4NetLogger( log4net.LogManager.GetLogger(
name ) );
+ }
+
+ /// <summary>
+ /// Get a ILog instance by type
+ /// </summary>
+ /// <param name="type"></param>
+ /// <returns></returns>
+ public ILog GetLogger(Type type)
+ {
+ return new Log4NetLogger( log4net.LogManager.GetLogger(
type ) );
+ }
+
+ #endregion
+ }
+}
Modified: ibatis/trunk/cs/mapper/IBatisNet.Common/IBatisNet.Common.csproj
URL:
http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.Common/IBatisNet.Common.csproj?rev=290818&r1=290817&r2=290818&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.Common/IBatisNet.Common.csproj (original)
+++ ibatis/trunk/cs/mapper/IBatisNet.Common/IBatisNet.Common.csproj Wed Sep 21
13:14:21 2005
@@ -90,11 +90,6 @@
HintPath =
"C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.EnterpriseServices.dll"
/>
<Reference
- Name = "log4net"
- AssemblyName = "log4net"
- HintPath = "..\External-Bin\Net\1.1\log4net.dll"
- />
- <Reference
Name = "Castle.DynamicProxy"
AssemblyName = "Castle.DynamicProxy"
HintPath =
"..\External-Bin\Net\1.1\Castle.DynamicProxy.dll"
@@ -183,11 +178,6 @@
BuildAction = "Compile"
/>
<File
- RelPath = "Logging\IDbConnectionProxy.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
RelPath = "Logging\ILog.cs"
SubType = "Code"
BuildAction = "Compile"
@@ -214,16 +204,6 @@
/>
<File
RelPath = "Logging\Impl\ConsoleOutLoggerFA.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath = "Logging\Impl\Log4NetLogger.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath = "Logging\Impl\Log4NetLoggerFA.cs"
SubType = "Code"
BuildAction = "Compile"
/>
Modified: ibatis/trunk/cs/mapper/IBatisNet.Common/Logging/IDbConnectionProxy.cs
URL:
http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.Common/Logging/IDbConnectionProxy.cs?rev=290818&r1=290817&r2=290818&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.Common/Logging/IDbConnectionProxy.cs
(original)
+++ ibatis/trunk/cs/mapper/IBatisNet.Common/Logging/IDbConnectionProxy.cs Wed
Sep 21 13:14:21 2005
@@ -25,20 +25,12 @@
#endregion
#region Using
+
using System;
-using System.Data;
using System.Collections;
-using System.Reflection;
-using System.Xml.Serialization;
-
+using System.Data;
using Castle.DynamicProxy;
-using IBatisNet.Common;
-using IBatisNet.Common.Utilities.Objects;
-
-using IBatisNet.Common.Exceptions;
-
-using log4net;
#endregion
namespace IBatisNet.Common.Logging
@@ -52,7 +44,6 @@
{
#region Fields
- private string _connectionString = string.Empty;
private IDbConnection _connection = null;
private Provider _provider = null;
private static ArrayList _passthroughMethods = new ArrayList();
Modified:
ibatis/trunk/cs/mapper/IBatisNet.Common/Transaction/TransactionScope.cs
URL:
http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.Common/Transaction/TransactionScope.cs?rev=290818&r1=290817&r2=290818&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.Common/Transaction/TransactionScope.cs
(original)
+++ ibatis/trunk/cs/mapper/IBatisNet.Common/Transaction/TransactionScope.cs Wed
Sep 21 13:14:21 2005
@@ -28,8 +28,8 @@
using System;
using System.EnterpriseServices;
using System.Runtime.Remoting.Messaging;
+using IBatisNet.Common.Logging;
-using log4net;
#endregion
namespace IBatisNet.Common.Transaction
Modified:
ibatis/trunk/cs/mapper/IBatisNet.Common/Utilities/ConfigWatcherHandler.cs
URL:
http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.Common/Utilities/ConfigWatcherHandler.cs?rev=290818&r1=290817&r2=290818&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.Common/Utilities/ConfigWatcherHandler.cs
(original)
+++ ibatis/trunk/cs/mapper/IBatisNet.Common/Utilities/ConfigWatcherHandler.cs
Wed Sep 21 13:14:21 2005
@@ -28,8 +28,7 @@
using System.Collections;
using System.IO;
using System.Threading;
-
-using log4net;
+using IBatisNet.Common.Logging;
namespace IBatisNet.Common.Utilities
{
Modified: ibatis/trunk/cs/mapper/IBatisNet.Common/Utilities/Resources.cs
URL:
http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.Common/Utilities/Resources.cs?rev=290818&r1=290817&r2=290818&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.Common/Utilities/Resources.cs (original)
+++ ibatis/trunk/cs/mapper/IBatisNet.Common/Utilities/Resources.cs Wed Sep 21
13:14:21 2005
@@ -33,9 +33,9 @@
using System.Security.Permissions;
using System.Xml;
using IBatisNet.Common.Exceptions;
+using IBatisNet.Common.Logging;
using IBatisNet.Common.Utilities.TypesResolver;
using IBatisNet.Common.Xml;
-using log4net;
#endregion
Modified:
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/IBatisNet.DataMapper.Test.csproj
URL:
http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/IBatisNet.DataMapper.Test.csproj?rev=290818&r1=290817&r2=290818&view=diff
==============================================================================
---
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/IBatisNet.DataMapper.Test.csproj
(original)
+++
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/IBatisNet.DataMapper.Test.csproj
Wed Sep 21 13:14:21 2005
@@ -105,6 +105,11 @@
HintPath = "D:\Program Files\NUnit
2.2\bin\nunit.framework.dll"
AssemblyFolderKey = "hklm\dn\nunit.framework"
/>
+ <Reference
+ Name = "IBatisNet.Common.Logging.Log4Net"
+ Project = "{023FE8D7-7E1A-4DDF-A0EA-8FB0E1B3122B}"
+ Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
+ />
</References>
</Build>
<Files>
Modified:
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/IBatisNet.DataMapper.Test.dll.config
URL:
http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/IBatisNet.DataMapper.Test.dll.config?rev=290818&r1=290817&r2=290818&view=diff
==============================================================================
---
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/IBatisNet.DataMapper.Test.dll.config
(original)
+++
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/IBatisNet.DataMapper.Test.dll.config
Wed Sep 21 13:14:21 2005
@@ -30,16 +30,16 @@
<iBATIS>
<logging>
- <!--<logFactoryAdapter
type="IBatisNet.Common.Logging.Impl.SimpleLoggerFA, IBatisNet.Common">
- <arg property="showLogName" value="true" />
- <arg property="showDataTime" value="true" />
- <arg property="level" value="ALL" />
- <arg property="dateTimeFormat"
value="yyyy/MM/dd HH:mm:ss:SSS" />
- </logFactoryAdapter> -->
+ <!--<logFactoryAdapter
type="IBatisNet.Common.Logging.Impl.ConsoleOutLoggerFA, IBatisNet.Common">
+ <arg key="showLogName" value="true" />
+ <arg key="showDataTime" value="true" />
+ <arg key="level" value="ALL" />
+ <arg key="dateTimeFormat" value="yyyy/MM/dd
HH:mm:ss:SSS" />
+ </logFactoryAdapter> -->
- <logFactoryAdapter
type="IBatisNet.Common.Logging.Impl.Log4NetLoggerFA, IBatisNet.Common">
+ <logFactoryAdapter
type="IBatisNet.Common.Logging.Impl.Log4NetLoggerFA,
IBatisNet.Common.Logging.Log4Net">
<arg key="configType" value="inline" />
- </logFactoryAdapter>
+ </logFactoryAdapter>
</logging>
</iBATIS>
Modified: ibatis/trunk/cs/mapper/IBatisNet.DataMapper/ChangeLog.txt
URL:
http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/ChangeLog.txt?rev=290818&r1=290817&r2=290818&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.DataMapper/ChangeLog.txt (original)
+++ ibatis/trunk/cs/mapper/IBatisNet.DataMapper/ChangeLog.txt Wed Sep 21
13:14:21 2005
@@ -6,7 +6,7 @@
- Updated to log4net V1.2.9
- Updated to Castle.DynamicProxy V1.1.5.0
- Re-add signing on assembly
-- Added custom logger support, IBATIS now need a custom section in your
application config file
+- Added custom logger support (remove dependcy on log4net), IBATIS now need a
custom section in your application config file
Exemple (for log4NET) :
<configSections>
<sectionGroup name="iBATIS">
@@ -17,7 +17,7 @@
<iBATIS>
<logging>
- <logFactoryAdapter
type="IBatisNet.Common.Logging.Impl.Log4NetLoggerFA, IBatisNet.Common">
+ <logFactoryAdapter
type="IBatisNet.Common.Logging.Impl.Log4NetLoggerFA,
IBatisNet.Common.Logging.Log4Net">
<arg key="configType" value="inline" />
</logFactoryAdapter>
</logging>
