You are viewing a plain text version of this content. The canonical link for it is here.
Posted to log4net-dev@logging.apache.org by ni...@apache.org on 2004/05/22 00:15:33 UTC
cvs commit: logging-log4net/src/Util/PatternStringConverters EnvironmentPatternConverter.cs
nicko 2004/05/21 15:15:33
Modified: . log4net.build
src AssemblyInfo.cs LogManager.cs
src/Appender AdoNetAppender.cs AspNetTraceAppender.cs
ColoredConsoleAppender.cs EventLogAppender.cs
NetSendAppender.cs OutputDebugStringAppender.cs
RemotingAppender.cs SmtpAppender.cs
src/Config AliasDomainAttribute.cs
AliasRepositoryAttribute.cs
ConfiguratorAttribute.cs DOMConfigurator.cs
DOMConfiguratorAttribute.cs DomainAttribute.cs
Log4NetConfigurationSectionHandler.cs
PluginAttribute.cs RepositoryAttribute.cs
XmlConfiguratorAttribute.cs
src/Core DefaultRepositorySelector.cs LoggerManager.cs
src/Plugin RemoteLoggingServerPlugin.cs
src/Util NativeError.cs
src/Util/PatternStringConverters
EnvironmentPatternConverter.cs
Log:
Updated log4net.build to not specify file excludes for specific platforms.
Updated code files to use C# preprocessor defines to conditionaly exclude the contents of some files from some of the builds.
This improves the visability of the exclusions and reduces the maintanence of the nant build file.
Revision Changes Path
1.3 +0 -70 logging-log4net/log4net.build
Index: log4net.build
===================================================================
RCS file: /home/cvs/logging-log4net/log4net.build,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- log4net.build 16 Feb 2004 02:25:50 -0000 1.2
+++ log4net.build 21 May 2004 22:15:32 -0000 1.3
@@ -260,42 +260,6 @@
<csc warnaserror="true" target="library" debug="${current.build.debug}" define="${current.build.defines.csc}" output="${current.bin.dir}/log4net.dll" doc="${current.bin.dir}/log4net.xml">
<sources basedir="${log4net.basedir}/src">
<includes name="**/*.cs" />
- <!-- .NET Compact Framework 1.0 has no support for ASP.NET -->
- <excludes name="Appender/AspNetTraceAppender.cs" />
- <!-- .NET Compact Framework 1.0 has no support for Win32 API's -->
- <excludes name="Appender/ColoredConsoleAppender.cs" />
- <!-- .NET Compact Framework 1.0 has no support for System.Diagnostics.EventLog -->
- <excludes name="Appender/EventLogAppender.cs" />
- <!-- .NET Compact Framework 1.0 has no support for Win32 NetMessageBufferSend function -->
- <excludes name="Appender/NetSendAppender.cs" />
- <!-- .NET Compact Framework 1.0 has no support for System.Runtime.Remoting -->
- <excludes name="Appender/RemotingAppender.cs" />
- <!-- .NET Compact Framework 1.0 has no support for System.Web.Mail -->
- <excludes name="Appender/SmtpAppender.cs" />
- <!--
- do not include attributes in the .NET Compact Framework 1.0 version
- because reading attributes is not supported anyway
-
- including these attributes would confuse developers and would possible
- cause issues when reading these attribute would eventually become
- available
- -->
- <excludes name="Config/AliasDomainAttribute.cs" />
- <excludes name="Config/AliasRepositoryAttribute.cs" />
- <excludes name="Config/ConfiguratorAttribute.cs" />
- <excludes name="Config/DomainAttribute.cs" />
- <excludes name="Config/RepositoryAttribute.cs" />
- <excludes name="Config/DOMConfiguratorAttribute.cs" />
- <excludes name="Config/XmlConfiguratorAttribute.cs" />
- <excludes name="Config/PluginAttribute.cs" />
- <!-- .NET Compact Framework 1.0 has no support for application configuration files -->
- <excludes name="Config/Log4NetConfigurationSectionHandler.cs" />
- <!-- .NET Compact Framework 1.0 has no support for Environment.GetEnvironmentVariable() -->
- <excludes name="Util/PatternStringConverters/EnvironmentPatternConverter.cs" />
- <!-- .NET Compact Framework 1.0 has no support for System.Runtime.Remoting -->
- <excludes name="Plugin/RemoteLoggingServerPlugin.cs" />
- <!-- .NET Compact Framework 1.0 uses the CompactRepositorySelector implementation of IRepositorySelector -->
- <excludes name="Core/DefaultRepositorySelector.cs" />
</sources>
<references>
<includes name="mscorlib.dll" />
@@ -334,8 +298,6 @@
<csc nostdlib="true" noconfig="true" warnaserror="true" target="library" debug="${current.build.debug}" define="${current.build.defines.csc}" output="${current.bin.dir}/log4net.dll" doc="${current.bin.dir}/log4net.xml">
<sources basedir="${log4net.basedir}/src">
<includes name="**/*.cs" />
- <!-- .NET Framework 1.0 uses the DefaultRepositorSelector implementation of IRepositorySelector -->
- <excludes name="spi/CompactRepositorySelector.cs" />
</sources>
<references>
<includes name="mscorlib.dll" />
@@ -375,8 +337,6 @@
<csc nostdlib="true" noconfig="true" warnaserror="true" target="library" debug="${current.build.debug}" define="${current.build.defines.csc}" output="${current.bin.dir}/log4net.dll" doc="${current.bin.dir}/log4net.xml">
<sources basedir="${log4net.basedir}/src">
<includes name="**/*.cs" />
- <!-- .NET Framework 1.0 uses the DefaultRepositorSelector implementation of IRepositorySelector -->
- <excludes name="spi/CompactRepositorySelector.cs" />
</sources>
<references>
<includes name="mscorlib.dll" />
@@ -416,18 +376,6 @@
<csc nostdlib="false" noconfig="true" warnaserror="true" target="library" debug="${current.build.debug}" define="${current.build.defines.csc}" output="${current.bin.dir}/log4net.dll">
<sources basedir="${log4net.basedir}/src">
<includes name="**/*.cs" />
- <!-- Mono 1.0 has no support for Win32 API's -->
- <excludes name="Appender/ColoredConsoleAppender.cs" />
- <!-- Mono 1.0 has no full support for System.Diagnostics.EventLog -->
- <excludes name="Appender/EventLogAppender.cs" />
- <!-- Mono 1.0 has no support for Win32 NetMessageBufferSend function -->
- <excludes name="Appender/NetSendAppender.cs" />
- <!-- Mono 1.0 has no support for Win32 OutputDebugString function -->
- <excludes name="Appender/OutputDebugStringAppender.cs" />
- <!-- Mono 1.0 uses no native Win32 functions -->
- <excludes name="helpers/NativeError.cs" />
- <!-- Mono 1.0 uses the DefaultRepositorSelector implementation of IRepositorySelector -->
- <excludes name="spi/CompactRepositorySelector.cs" />
</sources>
<references>
<includes name="System.dll" />
@@ -467,24 +415,6 @@
define="${current.build.defines.csc}" output="${current.bin.dir}/log4net.dll">
<sources basedir="${log4net.basedir}/src">
<includes name="**/*.cs" />
- <!-- SSCLI 1.0 has no support for ADO.NET -->
- <excludes name="Appender/ADONetAppender.cs" />
- <!-- SSCLI 1.0 has no support for ASP.NET -->
- <excludes name="Appender/ASPNetTraceAppender.cs" />
- <!-- SSCLI 1.0 has no support for Win32 API's -->
- <excludes name="Appender/ColoredConsoleAppender.cs" />
- <!-- SSCLI 1.0 has no support for System.Diagnostics.EventLog -->
- <excludes name="Appender/EventLogAppender.cs" />
- <!-- SSCLI 1.0 has no support for Win32 NetMessageBufferSend function -->
- <excludes name="Appender/NetSendAppender.cs" />
- <!-- SSCLI 1.0 has no support for Win32 OutputDebugString function -->
- <excludes name="Appender/OutputDebugStringAppender.cs" />
- <!-- SSCLI 1.0 has no support for System.Web.Mail -->
- <excludes name="Appender/SMTPAppender.cs" />
- <!-- SSCLI uses no native Win32 functions -->
- <excludes name="helpers/NativeError.cs" />
- <!-- SSCLI 1.0 uses the DefaultRepositorSelector implementation of IRepositorySelector -->
- <excludes name="spi/CompactRepositorySelector.cs" />
</sources>
<references>
<includes name="mscorlib.dll" />
1.3 +4 -0 logging-log4net/src/AssemblyInfo.cs
Index: AssemblyInfo.cs
===================================================================
RCS file: /home/cvs/logging-log4net/src/AssemblyInfo.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AssemblyInfo.cs 16 Feb 2004 02:10:51 -0000 1.2
+++ AssemblyInfo.cs 21 May 2004 22:15:32 -0000 1.3
@@ -26,10 +26,14 @@
[assembly: System.Runtime.InteropServices.ComVisible(false)]
#endif
+// TODO: Reinstate CLS compliant attribute for mono
+// MONO 1.0 Beta seems to have an issue with CLSCompliance
+#if (!MONO)
//
// log4net is CLS compliant
//
[assembly: System.CLSCompliant(true)]
+#endif
#if (!NETCF)
//
1.4 +4 -4 logging-log4net/src/LogManager.cs
Index: LogManager.cs
===================================================================
RCS file: /home/cvs/logging-log4net/src/LogManager.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- LogManager.cs 26 Feb 2004 21:02:57 -0000 1.3
+++ LogManager.cs 21 May 2004 22:15:32 -0000 1.4
@@ -538,7 +538,7 @@
/// </para>
/// <para>
/// The <see cref="ILoggerRepository"/> created will be associated with the repository
- /// specified such that a call to <see cref="GetLoggerRepository()"/> will return
+ /// specified such that a call to <see cref="GetRepository()"/> will return
/// the same repository instance.
/// </para>
/// </remarks>
@@ -562,7 +562,7 @@
/// <remarks>
/// <para>
/// The <see cref="ILoggerRepository"/> created will be associated with the repository
- /// specified such that a call to <see cref="GetLoggerRepository()"/> will return
+ /// specified such that a call to <see cref="GetRepository()"/> will return
/// the same repository instance.
/// </para>
/// </remarks>
@@ -670,7 +670,7 @@
/// </para>
/// <para>
/// The <see cref="ILoggerRepository"/> created will be associated with the repository
- /// specified such that a call to <see cref="GetLoggerRepository(Assembly)"/> with the
+ /// specified such that a call to <see cref="GetRepository(Assembly)"/> with the
/// same assembly specified will return the same repository instance.
/// </para>
/// <param name="repositoryAssembly">The assembly to use to get the name of the repository.</param>
@@ -691,7 +691,7 @@
/// <remarks>
/// <para>
/// The <see cref="ILoggerRepository"/> created will be associated with the repository
- /// specified such that a call to <see cref="GetLoggerRepository(Assembly)"/> with the
+ /// specified such that a call to <see cref="GetRepository(Assembly)"/> with the
/// same assembly specified will return the same repository instance.
/// </para>
/// <param name="repositoryAssembly">The assembly to use to get the name of the repository.</param>
1.4 +5 -0 logging-log4net/src/Appender/AdoNetAppender.cs
Index: AdoNetAppender.cs
===================================================================
RCS file: /home/cvs/logging-log4net/src/Appender/AdoNetAppender.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AdoNetAppender.cs 23 Feb 2004 03:18:02 -0000 1.3
+++ AdoNetAppender.cs 21 May 2004 22:15:32 -0000 1.4
@@ -16,6 +16,9 @@
//
#endregion
+// SSCLI 1.0 has no support for ADO.NET
+#if !SSCLI
+
using System;
using System.Collections;
using System.Data;
@@ -891,3 +894,5 @@
#endregion // Private Instance Fields
}
}
+
+#endif // !SSCLI
\ No newline at end of file
1.3 +8 -2 logging-log4net/src/Appender/AspNetTraceAppender.cs
Index: AspNetTraceAppender.cs
===================================================================
RCS file: /home/cvs/logging-log4net/src/Appender/AspNetTraceAppender.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AspNetTraceAppender.cs 16 Feb 2004 02:10:51 -0000 1.2
+++ AspNetTraceAppender.cs 21 May 2004 22:15:32 -0000 1.3
@@ -16,6 +16,10 @@
//
#endregion
+// .NET Compact Framework 1.0 has no support for ASP.NET
+// SSCLI 1.0 has no support for ASP.NET
+#if !NETCF && !SSCLI
+
using System.Web;
using log4net.Layout;
@@ -57,7 +61,7 @@
{
}
- #endregion Public Instances Constructors
+ #endregion // Public Instances Constructors
#region Override implementation of AppenderSkeleton
@@ -96,6 +100,8 @@
get { return true; }
}
- #endregion Override implementation of AppenderSkeleton
+ #endregion // Override implementation of AppenderSkeleton
}
}
+
+#endif // !NETCF && !SSCLI
\ No newline at end of file
1.4 +18 -6 logging-log4net/src/Appender/ColoredConsoleAppender.cs
Index: ColoredConsoleAppender.cs
===================================================================
RCS file: /home/cvs/logging-log4net/src/Appender/ColoredConsoleAppender.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ColoredConsoleAppender.cs 23 Feb 2004 03:18:02 -0000 1.3
+++ ColoredConsoleAppender.cs 21 May 2004 22:15:32 -0000 1.4
@@ -16,6 +16,15 @@
//
#endregion
+// MONO 1.0 Beta mcs does not like #if !A && !B && !C syntax
+
+// .NET Compact Framework 1.0 has no support for Win32 Console API's
+#if !NETCF
+// .Mono 1.0 has no support for Win32 Console API's
+#if !MONO
+// SSCLI 1.0 has no support for Win32 Console API's
+#if !SSCLI
+
using System;
using System.Globalization;
using System.Runtime.InteropServices;
@@ -130,7 +139,6 @@
HighIntensity = 0x0008,
}
-
#endregion
#region Public Instance Constructors
@@ -176,7 +184,7 @@
m_writeToErrorStream = writeToErrorStream;
}
- #endregion Public Instance Constructors
+ #endregion // Public Instance Constructors
#region Public Instance Properties
@@ -254,7 +262,7 @@
}
}
- #endregion Public Instance Properties
+ #endregion // Public Instance Properties
#region Override implementation of AppenderSkeleton
@@ -325,7 +333,7 @@
get { return true; }
}
- #endregion Override implementation of AppenderSkeleton
+ #endregion // Override implementation of AppenderSkeleton
#region Public Static Fields
@@ -341,7 +349,7 @@
/// </summary>
public const string ConsoleError = "Console.Error";
- #endregion Public Static Fields
+ #endregion // Public Static Fields
#region Private Instances Fields
@@ -355,7 +363,7 @@
/// </summary>
private System.Collections.Hashtable m_Level2ColorMap = new System.Collections.Hashtable();
- #endregion Private Instances Fields
+ #endregion // Private Instances Fields
#region Win32 Methods
@@ -414,3 +422,7 @@
#endregion
}
}
+
+#endif // !SSCLI
+#endif // !MONO
+#endif // !NETCF
\ No newline at end of file
1.5 +13 -0 logging-log4net/src/Appender/EventLogAppender.cs
Index: EventLogAppender.cs
===================================================================
RCS file: /home/cvs/logging-log4net/src/Appender/EventLogAppender.cs,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- EventLogAppender.cs 23 Feb 2004 03:18:02 -0000 1.4
+++ EventLogAppender.cs 21 May 2004 22:15:32 -0000 1.5
@@ -16,6 +16,15 @@
//
#endregion
+// MONO 1.0 Beta mcs does not like #if !A && !B && !C syntax
+
+// .NET Compact Framework 1.0 has no support for System.Diagnostics.EventLog
+#if !NETCF
+// .Mono 1.0 has no support for System.Diagnostics.EventLog
+#if !MONO
+// SSCLI 1.0 has no support for System.Diagnostics.EventLog
+#if !SSCLI
+
using System;
using System.Diagnostics;
using System.Globalization;
@@ -295,3 +304,7 @@
#endregion // Private Instance Fields
}
}
+
+#endif // !SSCLI
+#endif // !MONO
+#endif // !NETCF
\ No newline at end of file
1.4 +15 -1 logging-log4net/src/Appender/NetSendAppender.cs
Index: NetSendAppender.cs
===================================================================
RCS file: /home/cvs/logging-log4net/src/Appender/NetSendAppender.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- NetSendAppender.cs 23 Feb 2004 03:18:02 -0000 1.3
+++ NetSendAppender.cs 21 May 2004 22:15:32 -0000 1.4
@@ -16,6 +16,16 @@
//
#endregion
+// MONO 1.0 Beta mcs does not like #if !A && !B && !C syntax
+
+// .NET Compact Framework 1.0 has no support for Win32 NetMessageBufferSend API
+#if !NETCF
+// MONO 1.0 has no support for Win32 NetMessageBufferSend API
+#if !MONO
+// SSCLI 1.0 has no support for Win32 NetMessageBufferSend API
+#if !SSCLI
+
+
using System;
using System.Globalization;
using System.Runtime.InteropServices;
@@ -348,4 +358,8 @@
#endregion
}
-}
\ No newline at end of file
+}
+
+#endif // !SSCLI
+#endif // !MONO
+#endif // !NETCF
\ No newline at end of file
1.3 +9 -3 logging-log4net/src/Appender/OutputDebugStringAppender.cs
Index: OutputDebugStringAppender.cs
===================================================================
RCS file: /home/cvs/logging-log4net/src/Appender/OutputDebugStringAppender.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- OutputDebugStringAppender.cs 16 Feb 2004 02:10:51 -0000 1.2
+++ OutputDebugStringAppender.cs 21 May 2004 22:15:32 -0000 1.3
@@ -16,6 +16,10 @@
//
#endregion
+// MONO 1.0 has no support for Win32 OutputDebugString API
+// SSCLI 1.0 has no support for Win32 OutputDebugString API
+#if !MONO && !SSCLI
+
using System.Runtime.InteropServices;
using log4net.Layout;
@@ -49,7 +53,7 @@
{
}
- #endregion Public Instance Constructors
+ #endregion // Public Instance Constructors
#region Override implementation of AppenderSkeleton
@@ -72,7 +76,7 @@
get { return true; }
}
- #endregion Override implementation of AppenderSkeleton
+ #endregion // Override implementation of AppenderSkeleton
#region Protected Static Methods
@@ -87,6 +91,8 @@
#endif
protected static extern void OutputDebugString(string message);
- #endregion Protected Static Methods
+ #endregion // Protected Static Methods
}
}
+
+#endif // !MONO && !SSCLI
\ No newline at end of file
1.4 +5 -0 logging-log4net/src/Appender/RemotingAppender.cs
Index: RemotingAppender.cs
===================================================================
RCS file: /home/cvs/logging-log4net/src/Appender/RemotingAppender.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- RemotingAppender.cs 23 Feb 2004 03:18:02 -0000 1.3
+++ RemotingAppender.cs 21 May 2004 22:15:32 -0000 1.4
@@ -16,6 +16,9 @@
//
#endregion
+// .NET Compact Framework 1.0 has no support for System.Runtime.Remoting
+#if !NETCF
+
using System;
using System.Collections;
using System.Threading;
@@ -304,3 +307,5 @@
}
}
}
+
+#endif // !NETCF
\ No newline at end of file
1.4 +11 -5 logging-log4net/src/Appender/SmtpAppender.cs
Index: SmtpAppender.cs
===================================================================
RCS file: /home/cvs/logging-log4net/src/Appender/SmtpAppender.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SmtpAppender.cs 23 Feb 2004 03:18:02 -0000 1.3
+++ SmtpAppender.cs 21 May 2004 22:15:32 -0000 1.4
@@ -16,6 +16,10 @@
//
#endregion
+// .NET Compact Framework 1.0 has no support for System.Web.Mail
+// SSCLI 1.0 has no support for System.Web.Mail
+#if !NETCF && !SSCLI
+
using System;
using System.IO;
using System.Web.Mail;
@@ -57,7 +61,7 @@
{
}
- #endregion Public Instance Constructors
+ #endregion // Public Instance Constructors
#region Public Instance Properties
@@ -124,7 +128,7 @@
set { ; }
}
- #endregion Public Instance Properties
+ #endregion // Public Instance Properties
#region Override implementation of BufferingAppenderSkeleton
@@ -186,7 +190,7 @@
}
}
- #endregion Override implementation of BufferingAppenderSkeleton
+ #endregion // Override implementation of BufferingAppenderSkeleton
#region Override implementation of AppenderSkeleton
@@ -199,7 +203,7 @@
get { return true; }
}
- #endregion Override implementation of AppenderSkeleton
+ #endregion // Override implementation of AppenderSkeleton
#region Private Instance Fields
@@ -208,6 +212,8 @@
private string m_subject;
private string m_smtpHost;
- #endregion Private Instance Fields
+ #endregion // Private Instance Fields
}
}
+
+#endif // !NETCF && !SSCLI
\ No newline at end of file
1.4 +5 -0 logging-log4net/src/Config/AliasDomainAttribute.cs
Index: AliasDomainAttribute.cs
===================================================================
RCS file: /home/cvs/logging-log4net/src/Config/AliasDomainAttribute.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AliasDomainAttribute.cs 23 Feb 2004 03:18:03 -0000 1.3
+++ AliasDomainAttribute.cs 21 May 2004 22:15:32 -0000 1.4
@@ -16,6 +16,9 @@
//
#endregion
+// .NET Compact Framework 1.0 has no support for reading assembly attributes
+#if !NETCF
+
using System;
namespace log4net.Config
@@ -61,3 +64,5 @@
#endregion Public Instance Constructors
}
}
+
+#endif // !NETCF
\ No newline at end of file
1.4 +5 -0 logging-log4net/src/Config/AliasRepositoryAttribute.cs
Index: AliasRepositoryAttribute.cs
===================================================================
RCS file: /home/cvs/logging-log4net/src/Config/AliasRepositoryAttribute.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AliasRepositoryAttribute.cs 23 Feb 2004 03:18:03 -0000 1.3
+++ AliasRepositoryAttribute.cs 21 May 2004 22:15:32 -0000 1.4
@@ -16,6 +16,9 @@
//
#endregion
+// .NET Compact Framework 1.0 has no support for reading assembly attributes
+#if !NETCF
+
using System;
namespace log4net.Config
@@ -84,3 +87,5 @@
#endregion Private Instance Fields
}
}
+
+#endif // !NETCF
\ No newline at end of file
1.4 +5 -0 logging-log4net/src/Config/ConfiguratorAttribute.cs
Index: ConfiguratorAttribute.cs
===================================================================
RCS file: /home/cvs/logging-log4net/src/Config/ConfiguratorAttribute.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ConfiguratorAttribute.cs 23 Feb 2004 03:18:03 -0000 1.3
+++ ConfiguratorAttribute.cs 21 May 2004 22:15:32 -0000 1.4
@@ -16,6 +16,9 @@
//
#endregion
+// .NET Compact Framework 1.0 has no support for reading assembly attributes
+#if !NETCF
+
using System;
using System.Reflection;
@@ -45,3 +48,5 @@
public abstract void Configure(Assembly assembly, ILoggerRepository repository);
}
}
+
+#endif //!NETCF
\ No newline at end of file
1.4 +5 -5 logging-log4net/src/Config/DOMConfigurator.cs
Index: DOMConfigurator.cs
===================================================================
RCS file: /home/cvs/logging-log4net/src/Config/DOMConfigurator.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DOMConfigurator.cs 23 Feb 2004 03:18:03 -0000 1.3
+++ DOMConfigurator.cs 21 May 2004 22:15:32 -0000 1.4
@@ -75,7 +75,7 @@
[Obsolete("Use XmlConfigurator.Configure instead of DOMConfigurator.Configure")]
static public void Configure()
{
- XmlConfigurator.Configure(LogManager.GetLoggerRepository(Assembly.GetCallingAssembly()));
+ XmlConfigurator.Configure(LogManager.GetRepository(Assembly.GetCallingAssembly()));
}
/// <summary>
@@ -113,7 +113,7 @@
[Obsolete("Use XmlConfigurator.Configure instead of DOMConfigurator.Configure")]
static public void Configure(XmlElement element)
{
- XmlConfigurator.Configure(LogManager.GetLoggerRepository(Assembly.GetCallingAssembly()), element);
+ XmlConfigurator.Configure(LogManager.GetRepository(Assembly.GetCallingAssembly()), element);
}
/// <summary>
@@ -180,7 +180,7 @@
[Obsolete("Use XmlConfigurator.Configure instead of DOMConfigurator.Configure")]
static public void Configure(FileInfo configFile)
{
- XmlConfigurator.Configure(LogManager.GetLoggerRepository(Assembly.GetCallingAssembly()), configFile);
+ XmlConfigurator.Configure(LogManager.GetRepository(Assembly.GetCallingAssembly()), configFile);
}
/// <summary>
@@ -203,7 +203,7 @@
[Obsolete("Use XmlConfigurator.Configure instead of DOMConfigurator.Configure")]
static public void Configure(Stream configStream)
{
- XmlConfigurator.Configure(LogManager.GetLoggerRepository(Assembly.GetCallingAssembly()), configStream);
+ XmlConfigurator.Configure(LogManager.GetRepository(Assembly.GetCallingAssembly()), configStream);
}
/// <summary>
@@ -315,7 +315,7 @@
[Obsolete("Use XmlConfigurator.ConfigureAndWatch instead of DOMConfigurator.ConfigureAndWatch")]
static public void ConfigureAndWatch(FileInfo configFile)
{
- XmlConfigurator.ConfigureAndWatch(LogManager.GetLoggerRepository(Assembly.GetCallingAssembly()), configFile);
+ XmlConfigurator.ConfigureAndWatch(LogManager.GetRepository(Assembly.GetCallingAssembly()), configFile);
}
/// <summary>
1.3 +5 -0 logging-log4net/src/Config/DOMConfiguratorAttribute.cs
Index: DOMConfiguratorAttribute.cs
===================================================================
RCS file: /home/cvs/logging-log4net/src/Config/DOMConfiguratorAttribute.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DOMConfiguratorAttribute.cs 16 Feb 2004 02:10:52 -0000 1.2
+++ DOMConfiguratorAttribute.cs 21 May 2004 22:15:32 -0000 1.3
@@ -16,6 +16,9 @@
//
#endregion
+// .NET Compact Framework 1.0 has no support for reading assembly attributes
+#if !NETCF
+
using System;
using System.Reflection;
using System.IO;
@@ -52,3 +55,5 @@
{
}
}
+
+#endif // !NETCF
\ No newline at end of file
1.4 +5 -0 logging-log4net/src/Config/DomainAttribute.cs
Index: DomainAttribute.cs
===================================================================
RCS file: /home/cvs/logging-log4net/src/Config/DomainAttribute.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DomainAttribute.cs 23 Feb 2004 03:18:03 -0000 1.3
+++ DomainAttribute.cs 21 May 2004 22:15:32 -0000 1.4
@@ -16,6 +16,9 @@
//
#endregion
+// .NET Compact Framework 1.0 has no support for reading assembly attributes
+#if !NETCF
+
using System;
namespace log4net.Config
@@ -69,3 +72,5 @@
#endregion Public Instance Constructors
}
}
+
+#endif // !NETCF
\ No newline at end of file
1.3 +5 -0 logging-log4net/src/Config/Log4NetConfigurationSectionHandler.cs
Index: Log4NetConfigurationSectionHandler.cs
===================================================================
RCS file: /home/cvs/logging-log4net/src/Config/Log4NetConfigurationSectionHandler.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Log4NetConfigurationSectionHandler.cs 16 Feb 2004 02:10:52 -0000 1.2
+++ Log4NetConfigurationSectionHandler.cs 21 May 2004 22:15:32 -0000 1.3
@@ -16,6 +16,9 @@
//
#endregion
+// .NET Compact Framework 1.0 has no support for application .config files
+#if !NETCF
+
using System.Configuration;
using System.Xml;
@@ -75,3 +78,5 @@
#endregion Implementation of IConfigurationSectionHandler
}
}
+
+#endif // !NETCF
\ No newline at end of file
1.3 +5 -0 logging-log4net/src/Config/PluginAttribute.cs
Index: PluginAttribute.cs
===================================================================
RCS file: /home/cvs/logging-log4net/src/Config/PluginAttribute.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PluginAttribute.cs 16 Feb 2004 02:10:52 -0000 1.2
+++ PluginAttribute.cs 21 May 2004 22:15:32 -0000 1.3
@@ -16,6 +16,9 @@
//
#endregion
+// .NET Compact Framework 1.0 has no support for reading assembly attributes
+#if !NETCF
+
using System;
using System.Globalization;
using System.Reflection;
@@ -119,3 +122,5 @@
#endregion Private Instance Fields
}
}
+
+#endif // !NETCF
\ No newline at end of file
1.4 +5 -0 logging-log4net/src/Config/RepositoryAttribute.cs
Index: RepositoryAttribute.cs
===================================================================
RCS file: /home/cvs/logging-log4net/src/Config/RepositoryAttribute.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- RepositoryAttribute.cs 23 Feb 2004 03:18:03 -0000 1.3
+++ RepositoryAttribute.cs 21 May 2004 22:15:32 -0000 1.4
@@ -16,6 +16,9 @@
//
#endregion
+// .NET Compact Framework 1.0 has no support for reading assembly attributes
+#if !NETCF
+
using System;
namespace log4net.Config
@@ -124,3 +127,5 @@
#endregion Private Instance Fields
}
}
+
+#endif // !NETCF
\ No newline at end of file
1.4 +5 -0 logging-log4net/src/Config/XmlConfiguratorAttribute.cs
Index: XmlConfiguratorAttribute.cs
===================================================================
RCS file: /home/cvs/logging-log4net/src/Config/XmlConfiguratorAttribute.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XmlConfiguratorAttribute.cs 23 Feb 2004 03:18:03 -0000 1.3
+++ XmlConfiguratorAttribute.cs 21 May 2004 22:15:32 -0000 1.4
@@ -16,6 +16,9 @@
//
#endregion
+// .NET Compact Framework 1.0 has no support for reading assembly attributes
+#if !NETCF
+
using System;
using System.Reflection;
using System.IO;
@@ -189,3 +192,5 @@
#endregion Private Instance Fields
}
}
+
+#endif // !NETCF
\ No newline at end of file
1.4 +6 -0 logging-log4net/src/Core/DefaultRepositorySelector.cs
Index: DefaultRepositorySelector.cs
===================================================================
RCS file: /home/cvs/logging-log4net/src/Core/DefaultRepositorySelector.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DefaultRepositorySelector.cs 23 Feb 2004 03:18:03 -0000 1.3
+++ DefaultRepositorySelector.cs 21 May 2004 22:15:32 -0000 1.4
@@ -16,6 +16,10 @@
//
#endregion
+// .NET Compact Framework 1.0 has no support for reading assembly attributes
+// and uses the CompactRepositorySelector instead
+#if !NETCF
+
using System;
using System.Collections;
using System.Globalization;
@@ -672,3 +676,5 @@
#endregion Private Instance Fields
}
}
+
+#endif // !NETCF
\ No newline at end of file
1.5 +2 -2 logging-log4net/src/Core/LoggerManager.cs
Index: LoggerManager.cs
===================================================================
RCS file: /home/cvs/logging-log4net/src/Core/LoggerManager.cs,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- LoggerManager.cs 26 Feb 2004 21:02:58 -0000 1.4
+++ LoggerManager.cs 21 May 2004 22:15:32 -0000 1.5
@@ -618,7 +618,7 @@
/// </para>
/// <para>
/// The <see cref="ILoggerRepository"/> created will be associated with the repository
- /// specified such that a call to <see cref="GetLoggerRepository(Assembly)"/> with the
+ /// specified such that a call to <see cref="GetRepository(Assembly)"/> with the
/// same assembly specified will return the same repository instance.
/// </para>
/// </remarks>
@@ -639,7 +639,7 @@
/// <remarks>
/// <para>
/// The <see cref="ILoggerRepository"/> created will be associated with the repository
- /// specified such that a call to <see cref="GetLoggerRepository(Assembly)"/> with the
+ /// specified such that a call to <see cref="GetRepository(Assembly)"/> with the
/// same assembly specified will return the same repository instance.
/// </para>
/// </remarks>
1.3 +5 -0 logging-log4net/src/Plugin/RemoteLoggingServerPlugin.cs
Index: RemoteLoggingServerPlugin.cs
===================================================================
RCS file: /home/cvs/logging-log4net/src/Plugin/RemoteLoggingServerPlugin.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RemoteLoggingServerPlugin.cs 16 Feb 2004 02:10:54 -0000 1.2
+++ RemoteLoggingServerPlugin.cs 21 May 2004 22:15:33 -0000 1.3
@@ -16,6 +16,9 @@
//
#endregion
+// .NET Compact Framework 1.0 has no support for System.Runtime.Remoting
+#if !NETCF
+
using System;
using System.Runtime.Remoting;
@@ -215,3 +218,5 @@
}
}
}
+
+#endif // !NETCF
\ No newline at end of file
1.4 +12 -6 logging-log4net/src/Util/NativeError.cs
Index: NativeError.cs
===================================================================
RCS file: /home/cvs/logging-log4net/src/Util/NativeError.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- NativeError.cs 23 Feb 2004 03:18:04 -0000 1.3
+++ NativeError.cs 21 May 2004 22:15:33 -0000 1.4
@@ -16,6 +16,10 @@
//
#endregion
+// MONO 1.0 has no support for Win32 Error APIs
+// SSCLI 1.0 has no support for Win32 Error APIs
+#if !MONO && !SSCLI
+
using System;
using System.Globalization;
using System.Runtime.InteropServices;
@@ -43,7 +47,7 @@
m_message = message;
}
- #endregion Protected Instance Constructors
+ #endregion // Protected Instance Constructors
#region Public Instance Properties
@@ -69,7 +73,7 @@
get { return m_message; }
}
- #endregion Public Instance Properties
+ #endregion // Public Instance Properties
#region Public Static Methods
@@ -145,7 +149,7 @@
return msgBuf;
}
- #endregion Public Static Methods
+ #endregion // Public Static Methods
#region Override Object Implementation
@@ -158,7 +162,7 @@
return string.Format(CultureInfo.InvariantCulture, "0x{0:x8}", this.Number) + (this.Message != null ? ": " + this.Message : "");
}
- #endregion Override Object Implementation
+ #endregion // Override Object Implementation
#region Stubs For Native Function Calls
@@ -210,13 +214,15 @@
int nSize,
IntPtr Arguments);
- #endregion Stubs For Native Function Calls
+ #endregion // Stubs For Native Function Calls
#region Private Instance Fields
private int m_number;
private string m_message;
- #endregion Member Variables
+ #endregion
}
}
+
+#endif // !MONO && !SSCLI
\ No newline at end of file
1.4 +5 -0 logging-log4net/src/Util/PatternStringConverters/EnvironmentPatternConverter.cs
Index: EnvironmentPatternConverter.cs
===================================================================
RCS file: /home/cvs/logging-log4net/src/Util/PatternStringConverters/EnvironmentPatternConverter.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- EnvironmentPatternConverter.cs 23 Feb 2004 03:18:05 -0000 1.3
+++ EnvironmentPatternConverter.cs 21 May 2004 22:15:33 -0000 1.4
@@ -16,6 +16,9 @@
//
#endregion
+// .NET Compact Framework 1.0 has no support for Environment.GetEnvironmentVariable()
+#if !NETCF
+
using System;
using System.Text;
using System.IO;
@@ -65,3 +68,5 @@
}
}
}
+
+#endif // !NETCF
\ No newline at end of file