svn commit: r1711736 - /logging/log4net/trunk/src/Appender/AdoNetAppender.cs
Author: dpsenner Date: Sun Nov 1 11:50:44 2015 New Revision: 1711736 URL: http://svn.apache.org/viewvc?rev=1711736&view=rev Log: LOG4NET-461: refactored the AdoNetAppender The AdoNetAppender suffered several issues. One was that a database command was created and stored for the appenders lifetime. This caused trouble with some database servers because those cleaned up cached prepared statements from time to time and thus caused the appender to fail without the capability to recover. I solved this problem by creating a database command whenever the buffer is sent, well knowing that this costs a little more performance but is much more stable. At this point I further took the chance to cleanup the source by replacing all references to private member attributes with their public property mapping. Further I added and fixed some of the documentation. This overall cleanup is not yet complete, meaning that there is still a connection that is being kept alive while it would be wiser to rely on proper connection pooling and just open/close the database connection when sending the buffer. I will raise this topic on the dev list. Modified: logging/log4net/trunk/src/Appender/AdoNetAppender.cs Modified: logging/log4net/trunk/src/Appender/AdoNetAppender.cs URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/Appender/AdoNetAppender.cs?rev=1711736&r1=1711735&r2=1711736&view=diff == --- logging/log4net/trunk/src/Appender/AdoNetAppender.cs (original) +++ logging/log4net/trunk/src/Appender/AdoNetAppender.cs Sun Nov 1 11:50:44 2015 @@ -1,1257 +1,1146 @@ -#region Apache License -// -// Licensed to the Apache Software Foundation (ASF) under one or more -// contributor license agreements. See the NOTICE file distributed with -// this work for additional information regarding copyright ownership. -// The ASF licenses this file to you 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 - -// SSCLI 1.0 has no support for ADO.NET -#if !SSCLI - -using System; -using System.Collections; -using System.Configuration; -using System.Data; -using System.IO; - -using log4net.Util; -using log4net.Layout; -using log4net.Core; - -namespace log4net.Appender -{ - /// - /// Appender that logs to a database. - /// - /// - /// - /// appends logging events to a table within a - /// database. The appender can be configured to specify the connection - /// string by setting the property. - /// The connection type (provider) can be specified by setting the - /// property. For more information on database connection strings for - /// your specific database see http://www.connectionstrings.com/";>http://www.connectionstrings.com/. - /// - /// - /// Records are written into the database either using a prepared - /// statement or a stored procedure. The property - /// is set to (System.Data.CommandType.Text) to specify a prepared statement - /// or to (System.Data.CommandType.StoredProcedure) to specify a stored - /// procedure. - /// - /// - /// The prepared statement text or the name of the stored procedure - /// must be set in the property. - /// - /// - /// The prepared statement or stored procedure can take a number - /// of parameters. Parameters are added using the - /// method. This adds a single to the - /// ordered list of parameters. The - /// type may be subclassed if required to provide database specific - /// functionality. The specifies - /// the parameter name, database type, size, and how the value should - /// be generated using a . - /// - /// - /// - /// An example of a SQL Server table that could be logged to: - /// - /// CREATE TABLE [dbo].[Log] ( - /// [ID] [int] IDENTITY (1, 1) NOT NULL , - /// [Date] [datetime] NOT NULL , - /// [Thread] [varchar] (255) NOT NULL , - /// [Level] [varchar] (20) NOT NULL , - /// [Logger] [varchar] (255) NOT NULL , - /// [Message] [varchar] (4000) NOT NULL - /// ) ON [PRIMARY] - /// - /// - /// - /// An exa
svn commit: r1711821 - /logging/log4net/trunk/src/Appender/AdoNetAppender.cs
Author: dpsenner Date: Sun Nov 1 16:02:12 2015 New Revision: 1711821 URL: http://svn.apache.org/viewvc?rev=1711821&view=rev Log: LOG4NET-461: fix for ancient .NET frameworks Modified: logging/log4net/trunk/src/Appender/AdoNetAppender.cs Modified: logging/log4net/trunk/src/Appender/AdoNetAppender.cs URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/Appender/AdoNetAppender.cs?rev=1711821&r1=1711820&r2=1711821&view=diff == --- logging/log4net/trunk/src/Appender/AdoNetAppender.cs (original) +++ logging/log4net/trunk/src/Appender/AdoNetAppender.cs Sun Nov 1 16:02:12 2015 @@ -535,7 +535,8 @@ namespace log4net.Appender /// virtual protected void SendBuffer(IDbTransaction dbTran, LoggingEvent[] events) { - if (!string.IsNullOrWhiteSpace(CommandText)) + // string.IsNotNullOrWhiteSpace() does not exist in ancient .NET frameworks + if (CommandText != null && CommandText.Trim() != "") { using (IDbCommand dbCmd = Connection.CreateCommand()) {
svn commit: r1711829 - in /logging/log4net/trunk: src/Appender/FileAppender.cs tests/src/Appender/RollingFileAppenderTest.cs
Author: dpsenner Date: Sun Nov 1 16:29:57 2015 New Revision: 1711829 URL: http://svn.apache.org/viewvc?rev=1711829&view=rev Log: LOG4NET-484: fix object disposed exception This is a modified version of the patch supplied by nn1436401 at gmail dot com. Modified: logging/log4net/trunk/src/Appender/FileAppender.cs logging/log4net/trunk/tests/src/Appender/RollingFileAppenderTest.cs Modified: logging/log4net/trunk/src/Appender/FileAppender.cs URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/Appender/FileAppender.cs?rev=1711829&r1=1711828&r2=1711829&view=diff == --- logging/log4net/trunk/src/Appender/FileAppender.cs (original) +++ logging/log4net/trunk/src/Appender/FileAppender.cs Sun Nov 1 16:29:57 2015 @@ -1,1360 +1,1366 @@ -#region Apache License -// -// Licensed to the Apache Software Foundation (ASF) under one or more -// contributor license agreements. See the NOTICE file distributed with -// this work for additional information regarding copyright ownership. -// The ASF licenses this file to you 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 - -using System; -using System.IO; -using System.Text; -using System.Threading; -using log4net.Util; -using log4net.Layout; -using log4net.Core; - -namespace log4net.Appender -{ -#if !NETCF - /// - /// Appends logging events to a file. - /// - /// - /// - /// Logging events are sent to the file specified by - /// the property. - /// - /// - /// The file can be opened in either append or overwrite mode - /// by specifying the property. - /// If the file path is relative it is taken as relative from - /// the application base directory. The file encoding can be - /// specified by setting the property. - /// - /// - /// The layout's and - /// values will be written each time the file is opened and closed - /// respectively. If the property is - /// then the file may contain multiple copies of the header and footer. - /// - /// - /// This appender will first try to open the file for writing when - /// is called. This will typically be during configuration. - /// If the file cannot be opened for writing the appender will attempt - /// to open the file again each time a message is logged to the appender. - /// If the file cannot be opened for writing when a message is logged then - /// the message will be discarded by this appender. - /// -/// -/// The supports pluggable file locking models via -/// the property. -/// The default behavior, implemented by -/// is to obtain an exclusive write lock on the file until this appender is closed. -/// The alternative models only hold a -/// write lock while the appender is writing a logging event () -/// or synchronize by using a named system wide Mutex (). -/// -/// -/// All locking strategies have issues and you should seriously consider using a different strategy that -/// avoids having multiple processes logging to the same file. -/// - /// - /// Nicko Cadell - /// Gert Driesen - /// Rodrigo B. de Oliveira - /// Douglas de la Torre - /// Niall Daley -#else - /// - /// Appends logging events to a file. - /// - /// - /// - /// Logging events are sent to the file specified by - /// the property. - /// - /// - /// The file can be opened in either append or overwrite mode - /// by specifying the property. - /// If the file path is relative it is taken as relative from - /// the application base directory. The file encoding can be - /// specified by setting the property. - /// - /// - /// The layout's and - /// values will be written each time the file is opened and closed - /// respectively. If the property is - /// then the file may contain multiple copies of the header and footer. - /// - /// - /// This appender will first try to open the file for writing when - /// is called. This will typically be during configuration. - /// If the file cannot be opened for writing the appender will attempt - /// to open t
svn commit: r1711830 - /logging/log4net/trunk/src/Appender/FileAppender.cs
Author: dpsenner Date: Sun Nov 1 16:30:06 2015 New Revision: 1711830 URL: http://svn.apache.org/viewvc?rev=1711830&view=rev Log: Refactoring Reformatted the entire document to fix indentations and others. Modified: logging/log4net/trunk/src/Appender/FileAppender.cs Modified: logging/log4net/trunk/src/Appender/FileAppender.cs URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/Appender/FileAppender.cs?rev=1711830&r1=1711829&r2=1711830&view=diff == --- logging/log4net/trunk/src/Appender/FileAppender.cs (original) +++ logging/log4net/trunk/src/Appender/FileAppender.cs Sun Nov 1 16:30:06 2015 @@ -57,19 +57,19 @@ namespace log4net.Appender /// If the file cannot be opened for writing when a message is logged then /// the message will be discarded by this appender. /// -/// -/// The supports pluggable file locking models via -/// the property. -/// The default behavior, implemented by -/// is to obtain an exclusive write lock on the file until this appender is closed. -/// The alternative models only hold a -/// write lock while the appender is writing a logging event () -/// or synchronize by using a named system wide Mutex (). -/// -/// -/// All locking strategies have issues and you should seriously consider using a different strategy that -/// avoids having multiple processes logging to the same file. -/// + /// + /// The supports pluggable file locking models via + /// the property. + /// The default behavior, implemented by + /// is to obtain an exclusive write lock on the file until this appender is closed. + /// The alternative models only hold a + /// write lock while the appender is writing a logging event () + /// or synchronize by using a named system wide Mutex (). + /// + /// + /// All locking strategies have issues and you should seriously consider using a different strategy that + /// avoids having multiple processes logging to the same file. + /// /// /// Nicko Cadell /// Gert Driesen @@ -125,7 +125,7 @@ namespace log4net.Appender /// Douglas de la Torre /// Niall Daley #endif -public class FileAppender : TextWriterAppender + public class FileAppender : TextWriterAppender { #region LockingStream Inner Class @@ -137,23 +137,25 @@ namespace log4net.Appender { public sealed class LockStateException : LogException { - public LockStateException(string message): base(message) + public LockStateException(string message) + : base(message) { } } - private Stream m_realStream=null; - private LockingModelBase m_lockingModel=null; - private int m_readTotal=-1; - private int m_lockLevel=0; + private Stream m_realStream = null; + private LockingModelBase m_lockingModel = null; + private int m_readTotal = -1; + private int m_lockLevel = 0; - public LockingStream(LockingModelBase locking) : base() + public LockingStream(LockingModelBase locking) + : base() { - if (locking==null) + if (locking == null) { - throw new ArgumentException("Locking model may not be null","locking"); + throw new ArgumentException("Locking model may not be null", "locking"); } - m_lockingModel=locking; + m_lockingModel = locking; } #region Override Implementation of Stream @@ -162,8 +164,8 @@ namespace log4net.Appender public override IAsyncResult BeginRead(byte[] buffer, int offset, int count, AsyncCallback callback, object state) { AssertLocked(); - IAsyncResult ret=m_realStream.BeginRead(buffer,offset,count,callback,state); - m_readTotal=EndRead(ret); + IAsyncResult ret = m_realStream.BeginRead(buffer, offset, count, callback, state); + m_readTotal = EndRead(ret); retu
svn commit: r1711831 - in /logging/log4net/trunk/tests/src: Appender/SmtpPickupDirAppenderTest.cs log4net.Tests.vs2008.csproj log4net.Tests.vs2010.csproj log4net.Tests.vs2012.csproj
Author: dpsenner Date: Sun Nov 1 17:44:48 2015 New Revision: 1711831 URL: http://svn.apache.org/viewvc?rev=1711831&view=rev Log: Added a basic SmtpPickupDirAppenderTest (closes #17) Added: logging/log4net/trunk/tests/src/Appender/SmtpPickupDirAppenderTest.cs Modified: logging/log4net/trunk/tests/src/log4net.Tests.vs2008.csproj logging/log4net/trunk/tests/src/log4net.Tests.vs2010.csproj logging/log4net/trunk/tests/src/log4net.Tests.vs2012.csproj Added: logging/log4net/trunk/tests/src/Appender/SmtpPickupDirAppenderTest.cs URL: http://svn.apache.org/viewvc/logging/log4net/trunk/tests/src/Appender/SmtpPickupDirAppenderTest.cs?rev=1711831&view=auto == --- logging/log4net/trunk/tests/src/Appender/SmtpPickupDirAppenderTest.cs (added) +++ logging/log4net/trunk/tests/src/Appender/SmtpPickupDirAppenderTest.cs Sun Nov 1 17:44:48 2015 @@ -0,0 +1,194 @@ +#region Apache License +// +// Licensed to the Apache Software Foundation (ASF) under one or more +// contributor license agreements. See the NOTICE file distributed with +// this work for additional information regarding copyright ownership. +// The ASF licenses this file to you 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 + +using System; +using System.Collections; +using System.Diagnostics; +using System.IO; +using System.Text; + +using log4net.Appender; +using log4net.Core; +using log4net.Layout; + +using NUnit.Framework; + +namespace log4net.Tests.Appender +{ + /// + /// Used for internal unit testing the class. + /// + [TestFixture] + public class SmtpPickupDirAppenderTest + { + private readonly string _testPickupDir; + + private class SilentErrorHandler : IErrorHandler + { + private StringBuilder m_buffer = new StringBuilder(); + + public string Message + { + get { return m_buffer.ToString(); } + } + + public void Error(string message) + { + m_buffer.Append(message + "\n"); + } + + public void Error(string message, Exception e) + { + m_buffer.Append(message + "\n" + e.Message + "\n"); + } + + public void Error(string message, Exception e, ErrorCode errorCode) + { + m_buffer.Append(message + "\n" + e.Message + "\n"); + } + } + + public SmtpPickupDirAppenderTest() + { + _testPickupDir = Path.Combine(Directory.GetCurrentDirectory(), "SmtpPickupDirAppenderTest_PickupDir"); + } + /// + /// Sets up variables used for the tests + /// + private void InitializePickupDir() + { + Directory.CreateDirectory(_testPickupDir); + } + + /// + /// Shuts down any loggers in the hierarchy, along + /// with all appenders, and deletes any test files used + /// for logging. + /// + private void ResetLogger() + { + // Regular users should not use the clear method lightly! + LogManager.GetRepository().ResetConfiguration(); + LogManager.GetRepository().Shutdown(); + ((Repository.Hierarchy.Hierarchy)LogManager.GetRepository()).Clear(); + } + + /// + /// Any initialization that happens before each test can + /// go here + /// + [SetUp] + public void SetUp() + { + ResetLogger(); + DeleteTestFiles(); + InitializePickupDir(); + } + + /// + /// Any steps that happen after each test go here + /// + [TearDown] + public void TearDown() +
svn commit: r1711832 - in /logging/log4net/trunk: src/Appender/SmtpPickupDirAppender.cs tests/src/Appender/SmtpPickupDirAppenderTest.cs
Author: dpsenner Date: Sun Nov 1 17:54:47 2015 New Revision: 1711832 URL: http://svn.apache.org/viewvc?rev=1711832&view=rev Log: Added date header in SmtpPickupDirAppender (closes #18) Modified: logging/log4net/trunk/src/Appender/SmtpPickupDirAppender.cs logging/log4net/trunk/tests/src/Appender/SmtpPickupDirAppenderTest.cs Modified: logging/log4net/trunk/src/Appender/SmtpPickupDirAppender.cs URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/Appender/SmtpPickupDirAppender.cs?rev=1711832&r1=1711831&r2=1711832&view=diff == --- logging/log4net/trunk/src/Appender/SmtpPickupDirAppender.cs (original) +++ logging/log4net/trunk/src/Appender/SmtpPickupDirAppender.cs Sun Nov 1 17:54:47 2015 @@ -195,7 +195,8 @@ namespace log4net.Appender { writer.WriteLine("To: " + m_to); writer.WriteLine("From: " + m_from); - writer.WriteLine("Subject: " + m_subject); + writer.WriteLine("Subject: " + m_subject); + writer.WriteLine("Date: " + DateTime.UtcNow.ToString("r")); writer.WriteLine(""); string t = Layout.Header; Modified: logging/log4net/trunk/tests/src/Appender/SmtpPickupDirAppenderTest.cs URL: http://svn.apache.org/viewvc/logging/log4net/trunk/tests/src/Appender/SmtpPickupDirAppenderTest.cs?rev=1711832&r1=1711831&r2=1711832&view=diff == --- logging/log4net/trunk/tests/src/Appender/SmtpPickupDirAppenderTest.cs (original) +++ logging/log4net/trunk/tests/src/Appender/SmtpPickupDirAppenderTest.cs Sun Nov 1 17:54:47 2015 @@ -167,6 +167,39 @@ namespace log4net.Tests.Appender h.ResetConfiguration(); //Replace the repository selector so that we can recreate the hierarchy with the same name if necessary LoggerManager.RepositorySelector = new DefaultRepositorySelector(typeof(log4net.Repository.Hierarchy.Hierarchy)); + } + + /// + /// Tests if the sent message contained the date header. + /// + [Test] + public void TestOutputContainsSentDate() + { + SilentErrorHandler sh = new SilentErrorHandler(); + SmtpPickupDirAppender appender = CreateSmtpPickupDirAppender(sh); + ILogger log = CreateLogger(appender); + log.Log(GetType(), Level.Info, "This is a message", null); + log.Log(GetType(), Level.Info, "This is a message 2", null); + DestroyLogger(); + + Assert.AreEqual(1, Directory.GetFiles(_testPickupDir).Length); + string[] fileContent = File.ReadAllLines((Directory.GetFiles(_testPickupDir)[0])); + bool hasDateHeader = false; + const string dateHeaderStart = "Date: "; + foreach (string line in fileContent) + { + if(line.StartsWith(dateHeaderStart)) + { + var datePart = line.Substring(dateHeaderStart.Length); + var date = DateTime.ParseExact(datePart, "r", System.Globalization.CultureInfo.InvariantCulture); + var diff = Math.Abs( (DateTime.UtcNow - date).TotalMilliseconds); + Assert.LessOrEqual(diff, 1000, "Times should be equal, allowing a diff of one second to make test robust"); + hasDateHeader = true; + } + } + Assert.IsTrue(hasDateHeader, "Output must contains a date header"); + + Assert.AreEqual("", sh.Message, "Unexpected error message"); } ///
svn commit: r1711836 - in /logging/log4net/trunk: src/Appender/SmtpPickupDirAppender.cs tests/src/Appender/SmtpPickupDirAppenderTest.cs
Author: dpsenner Date: Sun Nov 1 18:00:02 2015 New Revision: 1711836 URL: http://svn.apache.org/viewvc?rev=1711836&view=rev Log: LOG4NET-473: Added file extension attribute in SmtpPickupDirAppender (closes #19) Modified: logging/log4net/trunk/src/Appender/SmtpPickupDirAppender.cs logging/log4net/trunk/tests/src/Appender/SmtpPickupDirAppenderTest.cs Modified: logging/log4net/trunk/src/Appender/SmtpPickupDirAppender.cs URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/Appender/SmtpPickupDirAppender.cs?rev=1711836&r1=1711835&r2=1711836&view=diff == --- logging/log4net/trunk/src/Appender/SmtpPickupDirAppender.cs (original) +++ logging/log4net/trunk/src/Appender/SmtpPickupDirAppender.cs Sun Nov 1 18:00:02 2015 @@ -62,8 +62,9 @@ namespace log4net.Appender /// Default constructor /// /// - public SmtpPickupDirAppender() - { + public SmtpPickupDirAppender() + { + m_fileExtension = string.Empty; // Default to empty string, not null } #endregion Public Instance Constructors @@ -136,6 +137,35 @@ namespace log4net.Appender set { m_pickupDir = value; } } + /// + /// Gets or sets the file extension for the generated files + /// + /// + /// The file extension for the generated files + /// + /// + /// + /// The file extension for the generated files + /// + /// + public string FileExtension + { + get { return m_fileExtension; } + set + { + m_fileExtension = value; + if (m_fileExtension == null) + { + m_fileExtension = string.Empty; + } + // Make sure any non empty extension starts with a dot + if (!string.IsNullOrEmpty(m_fileExtension) && !m_fileExtension.StartsWith(".")) + { + m_fileExtension = "." + m_fileExtension; + } + } + } + /// /// Gets or sets the used to write to the pickup directory. /// @@ -181,7 +211,7 @@ namespace log4net.Appender // Impersonate to open the file using(SecurityContext.Impersonate(this)) { - filePath = Path.Combine(m_pickupDir, SystemInfo.NewGuid().ToString("N")); + filePath = Path.Combine(m_pickupDir, SystemInfo.NewGuid().ToString("N") + m_fileExtension); writer = File.CreateText(filePath); } @@ -306,7 +336,8 @@ namespace log4net.Appender private string m_to; private string m_from; private string m_subject; - private string m_pickupDir; + private string m_pickupDir; + private string m_fileExtension; /// /// The security context to use for privileged calls Modified: logging/log4net/trunk/tests/src/Appender/SmtpPickupDirAppenderTest.cs URL: http://svn.apache.org/viewvc/logging/log4net/trunk/tests/src/Appender/SmtpPickupDirAppenderTest.cs?rev=1711836&r1=1711835&r2=1711836&view=diff == --- logging/log4net/trunk/tests/src/Appender/SmtpPickupDirAppenderTest.cs (original) +++ logging/log4net/trunk/tests/src/Appender/SmtpPickupDirAppenderTest.cs Sun Nov 1 18:00:02 2015 @@ -1,172 +1,172 @@ -#region Apache License -// -// Licensed to the Apache Software Foundation (ASF) under one or more -// contributor license agreements. See the NOTICE file distributed with -// this work for additional information regarding copyright ownership. -// The ASF licenses this file to you 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. -
svn commit: r1711838 - /logging/log4net/trunk/src/Appender/RollingFileAppender.cs
Author: dpsenner Date: Sun Nov 1 18:52:25 2015 New Revision: 1711838 URL: http://svn.apache.org/viewvc?rev=1711838&view=rev Log: LOG4NET-485: implemented a mutex that locks rolling across multiple processes on the same computer However, this does not solve issues where multiple processes from different computers try to roll over files that are located on a network share. Modified: logging/log4net/trunk/src/Appender/RollingFileAppender.cs Modified: logging/log4net/trunk/src/Appender/RollingFileAppender.cs URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/Appender/RollingFileAppender.cs?rev=1711838&r1=1711837&r2=1711838&view=diff == --- logging/log4net/trunk/src/Appender/RollingFileAppender.cs (original) +++ logging/log4net/trunk/src/Appender/RollingFileAppender.cs Sun Nov 1 18:52:25 2015 @@ -23,7 +23,8 @@ using System.Globalization; using System.IO; using log4net.Util; -using log4net.Core; +using log4net.Core; +using System.Threading; namespace log4net.Appender { @@ -233,6 +234,18 @@ namespace log4net.Appender /// public RollingFileAppender() { + } + + /// + /// Cleans up all resources used by this appender. + /// + ~RollingFileAppender() + { + if (m_mutexForRolling != null) + { + m_mutexForRolling.Close(); + m_mutexForRolling = null; + } } #endregion Public Instance Constructors @@ -592,24 +605,41 @@ namespace log4net.Appender /// virtual protected void AdjustFileBeforeAppend() { - if (m_rollDate) - { - DateTime n = m_dateTime.Now; - if (n >= m_nextCheck) - { - m_now = n; - m_nextCheck = NextCheckDate(m_now, m_rollPoint); - - RollOverTime(true); - } - } - - if (m_rollSize) - { - if ((File != null) && ((CountingQuietTextWriter)QuietWriter).Count >= m_maxFileSize) - { - RollOverSize(); - } + // reuse the file appenders locking model to lock the rolling + try + { + // if rolling should be locked, acquire the lock + if (m_mutexForRolling != null) + { + m_mutexForRolling.WaitOne(); + } + if (m_rollDate) + { + DateTime n = m_dateTime.Now; + if (n >= m_nextCheck) + { + m_now = n; + m_nextCheck = NextCheckDate(m_now, m_rollPoint); + + RollOverTime(true); + } + } + + if (m_rollSize) + { + if ((File != null) && ((CountingQuietTextWriter)QuietWriter).Count >= m_maxFileSize) + { + RollOverSize(); + } + } + } + finally + { + // if rolling should be locked, release the lock + if (m_mutexForRolling != null) + { + m_mutexForRolling.ReleaseMutex(); + } } } @@ -1115,8 +1145,11 @@ namespace log4net.Appender base.File = ConvertToFullPath(base.File.Trim()); // Store fully qualified base file name - m_baseFileName = base.File; - } + m_baseFileName = base.File; + } + + // initialize the mutex that is used to lock rolling + m_mutexForRollin
svn commit: r1711839 - /logging/log4net/trunk/src/Appender/RollingFileAppender.cs
Author: dpsenner Date: Sun Nov 1 19:01:25 2015 New Revision: 1711839 URL: http://svn.apache.org/viewvc?rev=1711839&view=rev Log: LOG4NET-486: adapted Simon Clarks idea to correctly detect file names when maxSizeRollBackups and datePattern is used Modified: logging/log4net/trunk/src/Appender/RollingFileAppender.cs Modified: logging/log4net/trunk/src/Appender/RollingFileAppender.cs URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/Appender/RollingFileAppender.cs?rev=1711839&r1=1711838&r2=1711839&view=diff == --- logging/log4net/trunk/src/Appender/RollingFileAppender.cs (original) +++ logging/log4net/trunk/src/Appender/RollingFileAppender.cs Sun Nov 1 19:01:25 2015 @@ -767,7 +767,7 @@ namespace log4net.Appender { if (m_preserveLogFileNameExtension) { -return Path.GetFileNameWithoutExtension(baseFileName) + ".*" + Path.GetExtension(baseFileName); +return Path.GetFileNameWithoutExtension(baseFileName) + "*" + Path.GetExtension(baseFileName); } else {
svn commit: r1714197 - /logging/log4net/trunk/src/Appender/AdoNetAppender.cs
Author: dpsenner Date: Fri Nov 13 12:29:19 2015 New Revision: 1714197 URL: http://svn.apache.org/viewvc?rev=1714197&view=rev Log: LOG4NET-489: fixed missing call to prepare the database parameter Modified: logging/log4net/trunk/src/Appender/AdoNetAppender.cs Modified: logging/log4net/trunk/src/Appender/AdoNetAppender.cs URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/Appender/AdoNetAppender.cs?rev=1714197&r1=1714196&r2=1714197&view=diff == --- logging/log4net/trunk/src/Appender/AdoNetAppender.cs (original) +++ logging/log4net/trunk/src/Appender/AdoNetAppender.cs Fri Nov 13 12:29:19 2015 @@ -1,1147 +1,1148 @@ -#region Apache License -// -// Licensed to the Apache Software Foundation (ASF) under one or more -// contributor license agreements. See the NOTICE file distributed with -// this work for additional information regarding copyright ownership. -// The ASF licenses this file to you 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 - -// SSCLI 1.0 has no support for ADO.NET -#if !SSCLI - -using System; -using System.Collections; -using System.Configuration; -using System.Data; -using System.IO; - -using log4net.Util; -using log4net.Layout; -using log4net.Core; - -namespace log4net.Appender -{ - /// - /// Appender that logs to a database. - /// - /// - /// - /// appends logging events to a table within a - /// database. The appender can be configured to specify the connection - /// string by setting the property. - /// The connection type (provider) can be specified by setting the - /// property. For more information on database connection strings for - /// your specific database see http://www.connectionstrings.com/";>http://www.connectionstrings.com/. - /// - /// - /// Records are written into the database either using a prepared - /// statement or a stored procedure. The property - /// is set to (System.Data.CommandType.Text) to specify a prepared statement - /// or to (System.Data.CommandType.StoredProcedure) to specify a stored - /// procedure. - /// - /// - /// The prepared statement text or the name of the stored procedure - /// must be set in the property. - /// - /// - /// The prepared statement or stored procedure can take a number - /// of parameters. Parameters are added using the - /// method. This adds a single to the - /// ordered list of parameters. The - /// type may be subclassed if required to provide database specific - /// functionality. The specifies - /// the parameter name, database type, size, and how the value should - /// be generated using a . - /// - /// - /// - /// An example of a SQL Server table that could be logged to: - /// - /// CREATE TABLE [dbo].[Log] ( - /// [ID] [int] IDENTITY (1, 1) NOT NULL , - /// [Date] [datetime] NOT NULL , - /// [Thread] [varchar] (255) NOT NULL , - /// [Level] [varchar] (20) NOT NULL , - /// [Logger] [varchar] (255) NOT NULL , - /// [Message] [varchar] (4000) NOT NULL - /// ) ON [PRIMARY] - /// - /// - /// - /// An example configuration to log to the above table: - /// - /// - /// - /// - /// - /// - /// - /// - /// - /// - /// - /// - /// - /// - /// - /// - /// - /// - /// - /// - /// - /// - /// - /// - /// - /// - /// - /// - /// - /// - /// - /// - /// - /// - /// - /// - /// - /// Julian Biddle - /// Nicko Cadell - /// Gert Driesen - /// Lance Nehring - public class AdoNetAppender : BufferingAppenderSkeleton - { - #region Public Instance Constructors - - /// - /// Initializes a new instance of the class. - /// - /// - /// Public default constructor
svn commit: r1714231 - in /logging/log4net/trunk: src/ src/log4net.vs2012.sln tests/src/log4net.Tests.vs2012.csproj tests/src/packages.config
Author: dpsenner Date: Fri Nov 13 16:00:19 2015 New Revision: 1714231 URL: http://svn.apache.org/viewvc?rev=1714231&view=rev Log: Added nunit nuget package to vs2012 solution Added: logging/log4net/trunk/tests/src/packages.config Modified: logging/log4net/trunk/src/ (props changed) logging/log4net/trunk/src/log4net.vs2012.sln logging/log4net/trunk/tests/src/log4net.Tests.vs2012.csproj Propchange: logging/log4net/trunk/src/ -- --- svn:ignore (original) +++ svn:ignore Fri Nov 13 16:00:19 2015 @@ -11,3 +11,5 @@ _ReSharper.log4net-vs2005 UpgradeLog.XML *.user GeneratedAssemblyInfo.cs +packages +.vs Modified: logging/log4net/trunk/src/log4net.vs2012.sln URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/log4net.vs2012.sln?rev=1714231&r1=1714230&r2=1714231&view=diff == --- logging/log4net/trunk/src/log4net.vs2012.sln (original) +++ logging/log4net/trunk/src/log4net.vs2012.sln Fri Nov 13 16:00:19 2015 @@ -22,7 +22,7 @@ Microsoft Visual Studio Solution File, F # Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "log4net.vs2012", "log4net.vs2012.csproj", "{181FE707-E161-4722-9F38-6AAAB6FAA106}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "log4net.Tests.vs2012", "..\tests\src\log4net.Tests.vs2010.csproj", "{B0530F10-0238-49A9-93B0-8EF412E90BCF}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "log4net.Tests.vs2012", "..\tests\src\log4net.Tests.vs2012.csproj", "{B0530F10-0238-49A9-93B0-8EF412E90BCF}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Modified: logging/log4net/trunk/tests/src/log4net.Tests.vs2012.csproj URL: http://svn.apache.org/viewvc/logging/log4net/trunk/tests/src/log4net.Tests.vs2012.csproj?rev=1714231&r1=1714230&r2=1714231&view=diff == --- logging/log4net/trunk/tests/src/log4net.Tests.vs2012.csproj (original) +++ logging/log4net/trunk/tests/src/log4net.Tests.vs2012.csproj Fri Nov 13 16:00:19 2015 @@ -1,4 +1,4 @@ - +
svn commit: r1714248 [2/2] - /logging/log4net/trunk/src/Appender/RollingFileAppender.cs
Modified: logging/log4net/trunk/src/Appender/RollingFileAppender.cs URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/Appender/RollingFileAppender.cs?rev=1714248&r1=1714247&r2=1714248&view=diff == --- logging/log4net/trunk/src/Appender/RollingFileAppender.cs (original) +++ logging/log4net/trunk/src/Appender/RollingFileAppender.cs Fri Nov 13 18:35:34 2015 @@ -1,239 +1,239 @@ -#region Apache License -// -// Licensed to the Apache Software Foundation (ASF) under one or more -// contributor license agreements. See the NOTICE file distributed with -// this work for additional information regarding copyright ownership. -// The ASF licenses this file to you 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 - -using System; -using System.Collections; -using System.Globalization; -using System.IO; - -using log4net.Util; +#region Apache License +// +// Licensed to the Apache Software Foundation (ASF) under one or more +// contributor license agreements. See the NOTICE file distributed with +// this work for additional information regarding copyright ownership. +// The ASF licenses this file to you 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 + +using System; +using System.Collections; +using System.Globalization; +using System.IO; + +using log4net.Util; using log4net.Core; -using System.Threading; - -namespace log4net.Appender -{ -#if CONFIRM_WIN32_FILE_SHAREMODES - // The following sounds good, and I though it was the case, but after - // further testing on Windows I have not been able to confirm it. - - /// On the Windows platform if another process has a write lock on the file - /// that is to be deleted, but allows shared read access to the file then the - /// file can be moved, but cannot be deleted. If the other process also allows - /// shared delete access to the file then the file will be deleted once that - /// process closes the file. If it is necessary to open the log file or any - /// of the backup files outside of this appender for either read or - /// write access please ensure that read and delete share modes are enabled. -#endif - - /// - /// Appender that rolls log files based on size or date or both. - /// - /// - /// - /// RollingFileAppender can roll log files based on size or date or both - /// depending on the setting of the property. - /// When set to the log file will be rolled - /// once its size exceeds the . - /// When set to the log file will be rolled - /// once the date boundary specified in the property - /// is crossed. - /// When set to the log file will be - /// rolled once the date boundary specified in the property - /// is crossed, but within a date boundary the file will also be rolled - /// once its size exceeds the . - /// When set to the log file will be rolled when - /// the appender is configured. This effectively means that the log file can be - /// rolled once per program execution. - /// - /// - /// A of few additional optional features have been added: - /// - /// Attach date pattern for current log file - /// Backup number increments for newer files - /// Infinite number of backups by file size - /// - /// - /// - /// - /// - /// For large or infinite numbers of backup files a - /// greater than zero is highly recommended, otherwise all the backup files need - /// to be renamed each time a new backup is created. - /// - /// - /// When Date/Time based rolling is used setting - /// to will reduce the number of file renamings to few or none. - /// - /// - /// - /// - /// - /// Changing or without c
svn commit: r1714248 [1/2] - /logging/log4net/trunk/src/Appender/RollingFileAppender.cs
Author: dpsenner Date: Fri Nov 13 18:35:34 2015 New Revision: 1714248 URL: http://svn.apache.org/viewvc?rev=1714248&view=rev Log: Fixed line endings of the rolling file appender Modified: logging/log4net/trunk/src/Appender/RollingFileAppender.cs
svn commit: r1714249 - /logging/log4net/trunk/src/Appender/FileAppender.cs
Author: dpsenner Date: Fri Nov 13 18:35:43 2015 New Revision: 1714249 URL: http://svn.apache.org/viewvc?rev=1714249&view=rev Log: LOG4NET-490: fix inter process lock such that the tests pass Modified: logging/log4net/trunk/src/Appender/FileAppender.cs Modified: logging/log4net/trunk/src/Appender/FileAppender.cs URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/Appender/FileAppender.cs?rev=1714249&r1=1714248&r2=1714249&view=diff == --- logging/log4net/trunk/src/Appender/FileAppender.cs (original) +++ logging/log4net/trunk/src/Appender/FileAppender.cs Fri Nov 13 18:35:43 2015 @@ -366,6 +366,16 @@ namespace log4net.Appender public abstract void CloseFile(); /// + /// Initializes all resources used by this locking model. + /// + public abstract void ActivateOptions(); + + /// + /// Disposes all resources that were initialized by this locking model. + /// + public abstract void OnClose(); + + /// /// Acquire the lock on the file /// /// A stream that is ready to be written to. @@ -544,6 +554,22 @@ namespace log4net.Appender { //NOP } + + /// + /// Initializes all resources used by this locking model. + /// + public override void ActivateOptions() + { + //NOP + } + + /// + /// Disposes all resources that were initialized by this locking model. + /// + public override void OnClose() + { + //NOP + } } /// @@ -638,6 +664,22 @@ namespace log4net.Appender CloseStream(m_stream); m_stream = null; } + + /// + /// Initializes all resources used by this locking model. + /// + public override void ActivateOptions() + { + //NOP + } + + /// + /// Disposes all resources that were initialized by this locking model. + /// + public override void OnClose() + { + //NOP + } } #if !NETCF @@ -650,6 +692,7 @@ namespace log4net.Appender { private Mutex m_mutex = null; private Stream m_stream = null; + private int m_recursiveWatch = 0; /// /// Open the file specified and prepare for logging. @@ -673,13 +716,6 @@ namespace log4net.Appender try { m_stream = CreateStream(filename, append, FileShare.ReadWrite); - - string mutexFriendlyFilename = filename - .Replace("\\", "_") - .Replace(":", "_") - .Replace("/", "_"); - - m_mutex = new Mutex(false, mutexFriendlyFilename); } catch (Exception e1) { @@ -705,8 +741,6 @@ namespace log4net.Appender finally { ReleaseLock(); - m_mutex.Close(); - m_mutex = null; } } @@ -726,10 +760,20 @@ namespace log4net.Appender // TODO: add timeout? m_mutex.WaitOne(); + // increment recursive watch + m_recursiveWatch++; + // should always be true (and fast) for FileStream - if (m_
svn commit: r1714254 - /logging/log4net/trunk/tests/src/Appender/RemotingAppenderTest.cs
Author: dpsenner Date: Fri Nov 13 19:04:11 2015 New Revision: 1714254 URL: http://svn.apache.org/viewvc?rev=1714254&view=rev Log: Fixed the remoting appender test The trouble was the broken default serialization of logging events. Using a binary formatter solved the issue. Modified: logging/log4net/trunk/tests/src/Appender/RemotingAppenderTest.cs Modified: logging/log4net/trunk/tests/src/Appender/RemotingAppenderTest.cs URL: http://svn.apache.org/viewvc/logging/log4net/trunk/tests/src/Appender/RemotingAppenderTest.cs?rev=1714254&r1=1714253&r2=1714254&view=diff == --- logging/log4net/trunk/tests/src/Appender/RemotingAppenderTest.cs (original) +++ logging/log4net/trunk/tests/src/Appender/RemotingAppenderTest.cs Fri Nov 13 19:04:11 2015 @@ -201,9 +201,16 @@ namespace log4net.Tests.Appender private void RegisterRemotingServerChannel() { if (m_remotingChannel == null) - { - m_remotingChannel = new TcpChannel(8085); - + { + BinaryClientFormatterSinkProvider clientSinkProvider = new BinaryClientFormatterSinkProvider(); + + BinaryServerFormatterSinkProvider serverSinkProvider = new BinaryServerFormatterSinkProvider(); + serverSinkProvider.TypeFilterLevel = System.Runtime.Serialization.Formatters.TypeFilterLevel.Full; + + Hashtable channelProperties = new Hashtable(); + channelProperties["port"] = 8085; + + m_remotingChannel = new TcpChannel(channelProperties, clientSinkProvider, serverSinkProvider); // Setup remoting server try {
svn commit: r1714265 - /logging/log4net/trunk/tests/src/Appender/SmtpPickupDirAppenderTest.cs
Author: dpsenner Date: Fri Nov 13 20:46:20 2015 New Revision: 1714265 URL: http://svn.apache.org/viewvc?rev=1714265&view=rev Log: LOG4NET-488: fix tests for .net 2.0 This is a modified version of the patch supplied by NN. Modified: logging/log4net/trunk/tests/src/Appender/SmtpPickupDirAppenderTest.cs Modified: logging/log4net/trunk/tests/src/Appender/SmtpPickupDirAppenderTest.cs URL: http://svn.apache.org/viewvc/logging/log4net/trunk/tests/src/Appender/SmtpPickupDirAppenderTest.cs?rev=1714265&r1=1714264&r2=1714265&view=diff == --- logging/log4net/trunk/tests/src/Appender/SmtpPickupDirAppenderTest.cs (original) +++ logging/log4net/trunk/tests/src/Appender/SmtpPickupDirAppenderTest.cs Fri Nov 13 20:46:20 2015 @@ -220,8 +220,7 @@ namespace log4net.Tests.Appender Assert.AreEqual(1, Directory.GetFiles(_testPickupDir).Length); var fileInfo = new FileInfo(Directory.GetFiles(_testPickupDir)[0]); Assert.AreEqual("." + fileExtension, fileInfo.Extension); - Guid tmpGuid; - Assert.IsTrue(Guid.TryParse(fileInfo.Name.Substring(0, fileInfo.Name.Length - fileInfo.Extension.Length), out tmpGuid)); // Assert that filename before extension is a guid + Assert.DoesNotThrow(delegate { new Guid(fileInfo.Name.Substring(0, fileInfo.Name.Length - fileInfo.Extension.Length)); }); // Assert that filename before extension is a guid Assert.AreEqual("", sh.Message, "Unexpected error message"); } @@ -242,8 +241,7 @@ namespace log4net.Tests.Appender Assert.AreEqual(1, Directory.GetFiles(_testPickupDir).Length); var fileInfo = new FileInfo(Directory.GetFiles(_testPickupDir)[0]); Assert.IsEmpty(fileInfo.Extension); - Guid tmpGuid; - Assert.IsTrue(Guid.TryParse(fileInfo.Name, out tmpGuid)); // Assert that filename is a guid + Assert.DoesNotThrow(delegate { new Guid(fileInfo.Name); }); // Assert that filename is a guid Assert.AreEqual("", sh.Message, "Unexpected error message"); }
svn commit: r1714270 - /logging/log4net/trunk/src/Appender/FileAppender.cs
Author: dpsenner Date: Fri Nov 13 21:40:28 2015 New Revision: 1714270 URL: http://svn.apache.org/viewvc?rev=1714270&view=rev Log: Fixes for the file appender such that build does no longer fail Modified: logging/log4net/trunk/src/Appender/FileAppender.cs Modified: logging/log4net/trunk/src/Appender/FileAppender.cs URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/Appender/FileAppender.cs?rev=1714270&r1=1714269&r2=1714270&view=diff == --- logging/log4net/trunk/src/Appender/FileAppender.cs (original) +++ logging/log4net/trunk/src/Appender/FileAppender.cs Fri Nov 13 21:40:28 2015 @@ -830,7 +830,7 @@ namespace log4net.Appender if (m_mutex != null) { m_mutex.Close(); - m_mutex.Dispose(); + m_mutex = null; } else { @@ -1095,7 +1095,10 @@ namespace log4net.Appender m_fileName = null; } - protected override void OnClose() + /// + /// Close this appender instance. The underlying stream or writer is also closed. + /// + override protected void OnClose() { base.OnClose(); m_lockingModel.OnClose();
svn commit: r1716909 - /logging/log4net/trunk/src/Appender/AdoNetAppender.cs
Author: dpsenner Date: Fri Nov 27 19:19:54 2015 New Revision: 1716909 URL: http://svn.apache.org/viewvc?rev=1716909&view=rev Log: LOG4NET-495: clear parameters when flushing multiple events Modified: logging/log4net/trunk/src/Appender/AdoNetAppender.cs Modified: logging/log4net/trunk/src/Appender/AdoNetAppender.cs URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/Appender/AdoNetAppender.cs?rev=1716909&r1=1716908&r2=1716909&view=diff == --- logging/log4net/trunk/src/Appender/AdoNetAppender.cs (original) +++ logging/log4net/trunk/src/Appender/AdoNetAppender.cs Fri Nov 27 19:19:54 2015 @@ -551,19 +551,25 @@ namespace log4net.Appender dbCmd.Transaction = dbTran; } // prepare the command, which is significantly faster - dbCmd.Prepare(); - // run for all events - foreach (LoggingEvent e in events) - { - // Set the parameter values - foreach (AdoNetAppenderParameter param in m_parameters) - { - param.Prepare(dbCmd); - param.FormatValue(dbCmd, e); - } - - // Execute the query - dbCmd.ExecuteNonQuery(); + dbCmd.Prepare(); + // run for all events + foreach (LoggingEvent e in events) + { + // Set the parameter values + foreach (AdoNetAppenderParameter param in m_parameters) + { + param.Prepare(dbCmd); + param.FormatValue(dbCmd, e); + } + + // Execute the query + dbCmd.ExecuteNonQuery(); + + // clear parameters that have been set + if (events.Length > 0) + { + dbCmd.Parameters.Clear(); + } } } }
svn commit: r1716910 - /logging/log4net/trunk/tests/src/Appender/AdoNetAppenderTest.cs
Author: dpsenner Date: Fri Nov 27 19:48:25 2015 New Revision: 1716910 URL: http://svn.apache.org/viewvc?rev=1716910&view=rev Log: LOG4NET-495: added buffering test for the AdoNetAppender Modified: logging/log4net/trunk/tests/src/Appender/AdoNetAppenderTest.cs Modified: logging/log4net/trunk/tests/src/Appender/AdoNetAppenderTest.cs URL: http://svn.apache.org/viewvc/logging/log4net/trunk/tests/src/Appender/AdoNetAppenderTest.cs?rev=1716910&r1=1716909&r2=1716910&view=diff == --- logging/log4net/trunk/tests/src/Appender/AdoNetAppenderTest.cs (original) +++ logging/log4net/trunk/tests/src/Appender/AdoNetAppenderTest.cs Fri Nov 27 19:48:25 2015 @@ -51,6 +51,30 @@ namespace log4net.Tests.Appender ILog log = LogManager.GetLogger(rep.Name, "NoBufferingTest"); log.Debug("Message"); Assert.AreEqual(1, Log4NetCommand.MostRecentInstance.ExecuteNonQueryCount); +} + +[Test] +public void BufferingTest() +{ +ILoggerRepository rep = LogManager.CreateRepository(Guid.NewGuid().ToString()); + +int bufferSize = 5; + +AdoNetAppender adoNetAppender = new AdoNetAppender(); +adoNetAppender.BufferSize = bufferSize; +adoNetAppender.ConnectionType = "log4net.Tests.Appender.AdoNet.Log4NetConnection"; +adoNetAppender.ActivateOptions(); + +BasicConfigurator.Configure(rep, adoNetAppender); + +ILog log = LogManager.GetLogger(rep.Name, "BufferingTest"); +for (int i = 0; i < bufferSize; i++) +{ +log.Debug("Message"); +Assert.IsNull(Log4NetCommand.MostRecentInstance); +} +log.Debug("Message"); +Assert.AreEqual(bufferSize+1, Log4NetCommand.MostRecentInstance.ExecuteNonQueryCount); } [Test]
svn commit: r1716912 - /logging/log4net/trunk/tests/src/Appender/AdoNetAppenderTest.cs
Author: dpsenner Date: Fri Nov 27 20:23:16 2015 New Revision: 1716912 URL: http://svn.apache.org/viewvc?rev=1716912&view=rev Log: LOG4NET-495: added buffering website test for the AdoNetAppender Modified: logging/log4net/trunk/tests/src/Appender/AdoNetAppenderTest.cs Modified: logging/log4net/trunk/tests/src/Appender/AdoNetAppenderTest.cs URL: http://svn.apache.org/viewvc/logging/log4net/trunk/tests/src/Appender/AdoNetAppenderTest.cs?rev=1716912&r1=1716911&r2=1716912&view=diff == --- logging/log4net/trunk/tests/src/Appender/AdoNetAppenderTest.cs (original) +++ logging/log4net/trunk/tests/src/Appender/AdoNetAppenderTest.cs Fri Nov 27 20:23:16 2015 @@ -164,6 +164,99 @@ namespace log4net.Tests.Appender param = (IDbDataParameter)command.Parameters["@exception"]; Assert.IsEmpty((string)param.Value); +} + +[Test] +public void BufferingWebsiteExample() +{ +XmlDocument log4netConfig = new XmlDocument(); +#region Load log4netConfig +log4netConfig.LoadXml(@" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +"); +#endregion + +ILoggerRepository rep = LogManager.CreateRepository(Guid.NewGuid().ToString()); +XmlConfigurator.Configure(rep, log4netConfig["log4net"]); +ILog log = LogManager.GetLogger(rep.Name, "WebsiteExample"); + +for (int i = 0; i < 3; i++) +{ +log.Debug("Message"); +} + +IDbCommand command = Log4NetCommand.MostRecentInstance; + +Assert.AreEqual( +"INSERT INTO Log ([Date],[Thread],[Level],[Logger],[Message],[Exception]) VALUES (@log_date, @thread, @log_level, @logger, @message, @exception)", +command.CommandText); + +Assert.AreEqual(6, command.Parameters.Count); + +IDbDataParameter param = (IDbDataParameter)command.Parameters["@message"]; +Assert.AreEqual("Message", param.Value); + +param = (IDbDataParameter)command.Parameters["@log_level"]; +Assert.AreEqual(Level.Debug.ToString(), param.Value); + +param = (IDbDataParameter)command.Parameters["@logger"]; +Assert.AreEqual("WebsiteExample", param.Value); + +param = (IDbDataParameter)command.Parameters["@exception"]; +Assert.IsEmpty((string)param.Value); } [Test]
svn commit: r1716913 - /logging/log4net/trunk/src/Appender/AdoNetAppender.cs
Author: dpsenner Date: Fri Nov 27 20:23:25 2015 New Revision: 1716913 URL: http://svn.apache.org/viewvc?rev=1716913&view=rev Log: LOG4NET-495: adjusted the way how the parameters are cleared so that the AdoNetAppender tests pass Modified: logging/log4net/trunk/src/Appender/AdoNetAppender.cs Modified: logging/log4net/trunk/src/Appender/AdoNetAppender.cs URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/Appender/AdoNetAppender.cs?rev=1716913&r1=1716912&r2=1716913&view=diff == --- logging/log4net/trunk/src/Appender/AdoNetAppender.cs (original) +++ logging/log4net/trunk/src/Appender/AdoNetAppender.cs Fri Nov 27 20:23:25 2015 @@ -551,25 +551,22 @@ namespace log4net.Appender dbCmd.Transaction = dbTran; } // prepare the command, which is significantly faster - dbCmd.Prepare(); - // run for all events - foreach (LoggingEvent e in events) - { - // Set the parameter values - foreach (AdoNetAppenderParameter param in m_parameters) - { - param.Prepare(dbCmd); - param.FormatValue(dbCmd, e); - } - - // Execute the query - dbCmd.ExecuteNonQuery(); - - // clear parameters that have been set - if (events.Length > 0) - { - dbCmd.Parameters.Clear(); - } + dbCmd.Prepare(); + // run for all events + foreach (LoggingEvent e in events) + { + // clear parameters that have been set + dbCmd.Parameters.Clear(); + + // Set the parameter values + foreach (AdoNetAppenderParameter param in m_parameters) + { + param.Prepare(dbCmd); + param.FormatValue(dbCmd, e); + } + + // Execute the query + dbCmd.ExecuteNonQuery(); } } }
svn commit: r1717718 - /logging/log4net/tags/1.2.15RC1/
Author: dpsenner Date: Thu Dec 3 07:32:22 2015 New Revision: 1717718 URL: http://svn.apache.org/viewvc?rev=1717718&view=rev Log: Tagged 1.2.15 RC1 Added: logging/log4net/tags/1.2.15RC1/ (props changed) - copied from r1716913, logging/log4net/trunk/ Propchange: logging/log4net/tags/1.2.15RC1/ -- bugtraq:logregex = (LOG4NET-\d+) Propchange: logging/log4net/tags/1.2.15RC1/ -- bugtraq:url = http://issues.apache.org/jira/browse/%BUGID% Propchange: logging/log4net/tags/1.2.15RC1/ -- --- svn:ignore (added) +++ svn:ignore Thu Dec 3 07:32:22 2015 @@ -0,0 +1,7 @@ +bin +build +*.zip +gc.log +old-log4net.snk +target + Propchange: logging/log4net/tags/1.2.15RC1/ -- svn:mergeinfo = /logging/log4net/branches/1.2.12:1511686-1520870
svn commit: r1766540 - /logging/log4net/trunk/src/site/xdoc/release/config-examples.xml
Author: dpsenner Date: Tue Oct 25 14:32:05 2016 New Revision: 1766540 URL: http://svn.apache.org/viewvc?rev=1766540&view=rev Log: Site: fixed links to sdk for all the appenders in the config-examples page [LOG4NET-527] Modified: logging/log4net/trunk/src/site/xdoc/release/config-examples.xml Modified: logging/log4net/trunk/src/site/xdoc/release/config-examples.xml URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/site/xdoc/release/config-examples.xml?rev=1766540&r1=1766539&r2=1766540&view=diff == --- logging/log4net/trunk/src/site/xdoc/release/config-examples.xml (original) +++ logging/log4net/trunk/src/site/xdoc/release/config-examples.xml Tue Oct 25 14:32:05 2016 @@ -43,7 +43,7 @@ limitations under the License. -For full details see the SDK Reference entry: log4net.Appender.AdoNetAppender. +For full details see the SDK Reference entry: log4net.Appender.AdoNetAppender. The configuration of the AdoNetAppender depends on the @@ -447,7 +447,7 @@ CREATE TABLE Log ( -For full details see the SDK Reference entry: log4net.Appender.AspNetTraceAppender. +For full details see the SDK Reference entry: log4net.Appender.AspNetTraceAppender. The following example shows how to configure the AspNetTraceAppender @@ -467,7 +467,7 @@ CREATE TABLE Log ( -For full details see the SDK Reference entry: log4net.Appender.BufferingForwardingAppender. +For full details see the SDK Reference entry: log4net.Appender.BufferingForwardingAppender. The following example shows how to configure the BufferingForwardingAppender @@ -500,7 +500,7 @@ CREATE TABLE Log ( -For full details see the SDK Reference entry: log4net.Appender.ColoredConsoleAppender. +For full details see the SDK Reference entry: log4net.Appender.ColoredConsoleAppender. The following example shows how to configure the ColoredConsoleAppender @@ -542,7 +542,7 @@ CREATE TABLE Log ( -For full details see the SDK Reference entry: log4net.Appender.ConsoleAppender. +For full details see the SDK Reference entry: log4net.Appender.ConsoleAppender. The following example shows how to configure the ConsoleAppender @@ -571,7 +571,7 @@ CREATE TABLE Log ( -For full details see the SDK Reference entry: log4net.Appender.EventLogAppender. +For full details see the SDK Reference entry: log4net.Appender.EventLogAppender. The following example shows how to configure the EventLogAppender to log @@ -606,7 +606,7 @@ CREATE TABLE Log ( -For full details see the SDK Reference entry: log4net.Appender.FileAppender. +For full details see the SDK Reference entry: log4net.Appender.FileAppender. The following example shows how to configure the FileAppender @@ -674,7 +674,7 @@ CREATE TABLE Log ( -For full details see the SDK Reference entry: log4net.Appender.ForwardingAppender. +For full details see the SDK Reference entry: log4net.Appender.ForwardingAppender. The following example shows how to configure the ForwardingAppender. @@ -695,7 +695,7 @@ CREATE TABLE Log ( -For full details see the SDK Reference entry: log4net.Appender.ManagedColoredConsoleAppender. +For full details see the SDK Reference entry: log4net.Appender.ManagedColoredConsoleAppender. The following example shows how to configure the ManagedColoredConsoleAppender @@ -745,7 +745,7 @@ CREATE TABLE Log ( -For full details see the SDK Reference entry: log4net.Appender.MemoryAppender. +For full details see the SDK Reference entry: log4net.Appender.MemoryAppender. It is unlikely that the MemoryAppender will be configured
svn commit: r1786989 - /logging/log4net/trunk/src/Layout/Pattern/TypeNamePatternConverter.cs
Author: dpsenner Date: Wed Mar 15 07:35:52 2017 New Revision: 1786989 URL: http://svn.apache.org/viewvc?rev=1786989&view=rev Log: TypeNamePatternConverter: added a safety net of null checks to avoid null reference exceptions [LOG4NET-559] Modified: logging/log4net/trunk/src/Layout/Pattern/TypeNamePatternConverter.cs Modified: logging/log4net/trunk/src/Layout/Pattern/TypeNamePatternConverter.cs URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/Layout/Pattern/TypeNamePatternConverter.cs?rev=1786989&r1=1786988&r2=1786989&view=diff == --- logging/log4net/trunk/src/Layout/Pattern/TypeNamePatternConverter.cs (original) +++ logging/log4net/trunk/src/Layout/Pattern/TypeNamePatternConverter.cs Wed Mar 15 07:35:52 2017 @@ -48,6 +48,16 @@ namespace log4net.Layout.Pattern /// override protected string GetFullyQualifiedName(LoggingEvent loggingEvent) { + if (loggingEvent == null) + { + return string.Empty; + } + + if (logigngEvent.LocationInformation == null) + { + return string.Empty; + } + return loggingEvent.LocationInformation.ClassName; } }
svn commit: r1791883 - /logging/log4net/trunk/src/site/site.xml
Author: dpsenner Date: Wed Apr 19 08:57:11 2017 New Revision: 1791883 URL: http://svn.apache.org/viewvc?rev=1791883&view=rev Log: Site: fixed the indentation and whitespace issues of site.xml Modified: logging/log4net/trunk/src/site/site.xml Modified: logging/log4net/trunk/src/site/site.xml URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/site/site.xml?rev=1791883&r1=1791882&r2=1791883&view=diff == --- logging/log4net/trunk/src/site/site.xml (original) +++ logging/log4net/trunk/src/site/site.xml Wed Apr 19 08:57:11 2017 @@ -16,65 +16,64 @@ --> - -Apache Logging Services Project -images/ls-logo.jpg -http://logging.apache.org/ - - - - http://www.apache.org/"/> - http://logging.apache.org/"/> - http://logging.apache.org/log4net/"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - http://www.apache.org/"/> - http://www.apache.org/licenses/"/> - http://www.apache.org/foundation/sponsorship.html"/> - http://www.apache.org/foundation/thanks.html"/> - http://www.apache.org/security/"/> - http://www.apachecon.com"/> - - - + + Apache Logging Services Project + images/ls-logo.jpg + http://logging.apache.org/ + + + + http://www.apache.org/"/> + http://logging.apache.org/"/> + http://logging.apache.org/log4net/"/> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + http://www.apache.org/"/> + http://www.apache.org/licenses/"/> + http://www.apache.org/foundation/sponsorship.html"/> + http://www.apache.org/foundation/thanks.html"/> + http://www.apache.org/security/"/> + http://www.apachecon.com"/> + +
[33/50] [abbrv] logging-log4net git commit: Fixed double slash escaping in configuration examples
Fixed double slash escaping in configuration examples Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/f9f6f42b Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/f9f6f42b Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/f9f6f42b Branch: refs/heads/origin/trunk Commit: f9f6f42b4162bc5864b99f952143c1fa183657cf Parents: 123a63b Author: Nicko Cadell Authored: Mon Mar 7 01:36:35 2005 + Committer: Nicko Cadell Committed: Mon Mar 7 01:36:35 2005 + -- doc/release/config-examples.html | 100 ++--- xdocs/src/release/config-examples.xml | 6 +- 2 files changed, 53 insertions(+), 53 deletions(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/f9f6f42b/doc/release/config-examples.html -- diff --git a/doc/release/config-examples.html b/doc/release/config-examples.html index b40691c..6a60d50 100755 --- a/doc/release/config-examples.html +++ b/doc/release/config-examples.html @@ -65,81 +65,81 @@ limitations under the License. - log4net Config Examples + log4net Config Examples Contents - Overview + Overview - AdoNetAppender + AdoNetAppender - MS SQL Server + MS SQL Server -MS Access +MS Access -Oracle9i +Oracle9i -Oracle8i +Oracle8i -IBM DB2 +IBM DB2 - AspNetTraceAppender + AspNetTraceAppender - BufferingForwardingAppender + BufferingForwardingAppender - ColoredConsoleAppender + ColoredConsoleAppender - ConsoleAppender +
[05/50] [abbrv] logging-log4net git commit: Removed Context Lists. The Context Stacks give essentially the same functionality
Removed Context Lists. The Context Stacks give essentially the same functionality Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/6aa28734 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/6aa28734 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/6aa28734 Branch: refs/heads/origin/trunk Commit: 6aa287347dafcb6f611465d1be6a8de14e92a071 Parents: 4fa09a4 Author: Nicko Cadell Authored: Mon Feb 14 03:24:37 2005 + Committer: Nicko Cadell Committed: Mon Feb 14 03:24:37 2005 + -- src/LogicalThreadContext.cs| 21 - src/ThreadContext.cs | 21 - src/Util/ThreadContextList.cs | 161 src/Util/ThreadContextLists.cs | 110 src/log4net.csproj | 10 --- 5 files changed, 323 deletions(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/6aa28734/src/LogicalThreadContext.cs -- diff --git a/src/LogicalThreadContext.cs b/src/LogicalThreadContext.cs index 1d449cd..7fc8e45 100755 --- a/src/LogicalThreadContext.cs +++ b/src/LogicalThreadContext.cs @@ -118,22 +118,6 @@ namespace log4net get { return s_stacks; } } - /// - /// The thread lists - /// - /// - /// list map - /// - /// - /// - /// The logical thread lists. - /// - /// - public static ThreadContextLists Lists - { - get { return s_lists; } - } - #endregion Public Static Properties #region Private Static Fields @@ -148,11 +132,6 @@ namespace log4net /// private readonly static ThreadContextStacks s_stacks = new ThreadContextStacks(s_properties); - /// - /// The thread context lists instance - /// - private readonly static ThreadContextLists s_lists = new ThreadContextLists(s_properties); - #endregion Private Static Fields } } http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/6aa28734/src/ThreadContext.cs -- diff --git a/src/ThreadContext.cs b/src/ThreadContext.cs index 7e6f7a1..8e24edc 100755 --- a/src/ThreadContext.cs +++ b/src/ThreadContext.cs @@ -115,22 +115,6 @@ namespace log4net get { return s_stacks; } } - /// - /// The thread lists - /// - /// - /// list map - /// - /// - /// - /// The thread local lists. - /// - /// - public static ThreadContextLists Lists - { - get { return s_lists; } - } - #endregion Public Static Properties #region Private Static Fields @@ -145,11 +129,6 @@ namespace log4net /// private readonly static ThreadContextStacks s_stacks = new ThreadContextStacks(s_properties); - /// - /// The thread context lists instance - /// - private readonly static ThreadContextLists s_lists = new ThreadContextLists(s_properties); - #endregion Private Static Fields } } http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/6aa28734/src/Util/ThreadContextList.cs -- diff --git a/src/Util/ThreadContextList.cs b/src/Util/ThreadContextList.cs deleted file mode 100755 index 5c4cab8..000 --- a/src/Util/ThreadContextList.cs +++ /dev/null @@ -1,161 +0,0 @@ -#region Copyright & License -// -// Copyright 2001-2005 The Apache Software Foundation -// -// 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 - -using System; -using System.Text; -using System.Collections; - -using log4net.Core; - -namespace log4net.Util -{ - ///
[40/50] [abbrv] logging-log4net git commit: Updated comments, fixed couple of typos
Updated comments, fixed couple of typos Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/146c74c4 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/146c74c4 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/146c74c4 Branch: refs/heads/origin/trunk Commit: 146c74c496422a378d6f09a2b200e289ec3d1be6 Parents: 2a412c9 Author: Nicko Cadell Authored: Fri Mar 11 22:30:25 2005 + Committer: Nicko Cadell Committed: Fri Mar 11 22:30:25 2005 + -- src/Appender/FileAppender.cs | 390 - tests/src/Appender/RollingFileAppenderTest.cs | 28 +- 2 files changed, 321 insertions(+), 97 deletions(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/146c74c4/src/Appender/FileAppender.cs -- diff --git a/src/Appender/FileAppender.cs b/src/Appender/FileAppender.cs index a689be9..3449ffa 100755 --- a/src/Appender/FileAppender.cs +++ b/src/Appender/FileAppender.cs @@ -63,18 +63,26 @@ namespace log4net.Appender /// Niall Daley public class FileAppender : TextWriterAppender { - #region Inner Classes + #region LockingStream Inner Class + + /// + /// Write only that uses the + /// to manage access to an underlying resource. + /// private sealed class LockingStream : Stream, IDisposable { - public class LockStateException : Exception + public sealed class LockStateException : LogException { - public LockStateException(string message): base(message){} + public LockStateException(string message): base(message) + { + } } private Stream m_realStream=null; private LockingModelBase m_lockingModel=null; - #region Stream methods + #region Override Implementation of Stream + // Methods public LockingStream(LockingModelBase locking) : base() { @@ -84,13 +92,15 @@ namespace log4net.Appender } m_lockingModel=locking; } + public override IAsyncResult BeginRead(byte[] buffer, int offset, int count, AsyncCallback callback, object state) { - AssertLocked(); - IAsyncResult ret=m_realStream.BeginRead(buffer,offset,count,callback,state); - EndRead(ret); - return ret; + throw new NotSupportedException("Read operations are not supported on the LockingStream"); } + + /// + /// True asynchronous writes are not supported, the implementation forces a synchronous write. + /// public override IAsyncResult BeginWrite(byte[] buffer, int offset, int count, AsyncCallback callback, object state) { AssertLocked(); @@ -98,43 +108,122 @@ namespace log4net.Appender EndWrite(ret); return ret; } - public override void Close() {m_lockingModel.CloseFile();} - public override int EndRead(IAsyncResult asyncResult) {AssertLocked();return m_realStream.EndRead(asyncResult);} - public override void EndWrite(IAsyncResult asyncResult) {AssertLocked();m_realStream.EndWrite(asyncResult);} - public override void Flush() {AssertLocked();m_realStream.Flush();} - public override int Read(byte[] buffer, int offset, int count) {AssertLocked();return m_realStream.Read(buffer,offset,count);} - public override int ReadByte() {AssertLocked();return m_realStream.ReadByte();} - public override long Seek(long offset, SeekOrigin origin) {AssertLocked();return m_realStream.Seek(offset,origin);} - public override void SetLength(long value) {AssertLocked();m_realStream.SetLength(value);} - void IDisposable.Dispose() {this.Close();} - public override void Write(byte[] buffer, int offset, int count) {AssertLocked();m_realStream.Write(buffe
[18/50] [abbrv] logging-log4net git commit: Updated changelog and release notes
Updated changelog and release notes Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/e549ce85 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/e549ce85 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/e549ce85 Branch: refs/heads/origin/trunk Commit: e549ce8593ecd971c983e01b2ec0e640f3e85e52 Parents: 60d93a1 Author: Nicko Cadell Authored: Thu Feb 17 14:36:46 2005 + Committer: Nicko Cadell Committed: Thu Feb 17 14:36:46 2005 + -- ChangeLog.txt | 199 +- doc/release/release-notes.html | 202 --- xdocs/src/release/release-notes.xml | 152 --- 3 files changed, 435 insertions(+), 118 deletions(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/e549ce85/ChangeLog.txt -- diff --git a/ChangeLog.txt b/ChangeLog.txt index 23d6e4a..477cb3a 100755 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,10 +1,203 @@ - = -Version 1.2. +Version 1.2.9 BETA = +2005-02-15 18:56 nicko + + * Util/TypeConverters/IPAddressConverter.cs: + + Only attempt to IPAddress.Parse if the string contains valid IP address characters + +2005-02-14 19:45 nicko + + * Appender/AppenderSkeleton.cs: + + Added anonymous catch handler + +2005-02-14 10:41 nicko + + * NDC.cs: + + Fixed Stack reference on NETCF + + * Config/XmlConfigurator.cs: + + Added DefaultCredential authentication support to loading config from web request + +2005-02-14 03:45 nicko + + * LogicalThreadContext.cs, MDC.cs, ThreadContext.cs: + + Updated doc comments + + * NDC.cs, Util/ThreadContextStack.cs: + + Added support for all old methods in NDC - Depth, SetMaxDepth, CloneStack, Inherit + +2005-02-14 03:24 nicko + + * LogicalThreadContext.cs, ThreadContext.cs, log4net.csproj, + Util/ThreadContextList.cs, Util/ThreadContextLists.cs: + + Removed Context Lists. The Context Stacks give essentially the same functionality + + * AssemblyInfo.cs: + + Renamed CORE build to CLI_1_0 + + * Config/XmlConfiguratorAttribute.cs: + + Added support for locating the config file when the app is deployed from a web server, i.e. via no-touch deployment + + * Config/XmlConfigurator.cs: + + Added support for loading the configuration data via a URI + + * Appender/FileAppender.cs, Appender/SmtpPickupDirAppender.cs, + Util/SystemInfo.cs: + + Moved ConvertToFullPath method to SystemInfo + + * Appender/ColoredConsoleAppender.cs, Appender/EventLogAppender.cs, + Appender/NetSendAppender.cs, + Appender/OutputDebugStringAppender.cs, Util/NativeError.cs, + Util/WindowsSecurityContext.cs: + + Renamed CORE build to CLI_1_0 + +2005-02-07 23:27 nicko + + * Util/SystemInfo.cs: + + Fixed TryParse on NETCF + + * Layout/XmlLayoutSchemaLog4j.cs: + + Updated link to log4j site + +2005-02-07 22:41 nicko + + * DateFormatter/AbsoluteTimeDateFormatter.cs, + DateFormatter/DateTimeDateFormatter.cs, + DateFormatter/Iso8601DateFormatter.cs, + Layout/Pattern/DatePatternConverter.cs, + Util/PatternStringConverters/DatePatternConverter.cs: + + Updated date patterns in doc comments to use .NET DateTime.ToString formatting patterns rather than Java syntax + + * Appender/EventLogAppender.cs, Appender/RollingFileAppender.cs, + Layout/Pattern/NamedPatternConverter.cs, Util/OptionConverter.cs, + Util/SystemInfo.cs, + Util/PatternStringConverters/RandomStringPatternConverter.cs: + + Added SystemInfo.TryParse methods for parsing strings to integers. These methods give a performance boost when the string cannot be parsed. + +2005-02-07 04:05 nicko + + * Util/: PropertiesDictionary.cs, ProtectCloseTextWriter.cs, + QuietTextWriter.cs, ReadOnlyPropertiesDictionary.cs, + ReaderWriterLock.cs, ReusableStringWriter.cs, SystemInfo.cs, + TextWriterAdapter.cs, ThreadContextList.cs, + ThreadContextLists.cs, ThreadContextProperties.cs, + ThreadContextStack.cs, ThreadContextStacks.cs, Transform.cs, + WindowsSecurityContext.cs: + + Tidied up doc comments + + * Util/TypeConverters/: BooleanConverter.cs, EncodingConverter.cs, + IPAddressConverter.cs, PatternLayoutConverter.cs, + PatternStringConverter.cs, TypeConverter.cs: + + Made type converter implementations inte
[38/50] [abbrv] logging-log4net git commit: Added support for packaging the README.txt
Added support for packaging the README.txt Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/24e791fa Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/24e791fa Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/24e791fa Branch: refs/heads/origin/trunk Commit: 24e791fa5ab3df2554e1c5bcac5f5f11492463ea Parents: 7f9efaa Author: Nicko Cadell Authored: Fri Mar 11 21:41:02 2005 + Committer: Nicko Cadell Committed: Fri Mar 11 21:41:02 2005 + -- log4net.build | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/24e791fa/log4net.build -- diff --git a/log4net.build b/log4net.build index 98db3f7..eae3d37 100755 --- a/log4net.build +++ b/log4net.build @@ -741,6 +741,7 @@ limitations under the License. +
[16/50] [abbrv] logging-log4net git commit: Added sample extension that returns logger wrappers that are MarshalByRef
Added sample extension that returns logger wrappers that are MarshalByRef Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/9930fffe Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/9930fffe Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/9930fffe Branch: refs/heads/origin/trunk Commit: 9930fffe162776b31aed27f3b37e00d4d55e93ed Parents: 341a28c Author: Nicko Cadell Authored: Wed Feb 16 22:13:50 2005 + Committer: Nicko Cadell Committed: Wed Feb 16 22:13:50 2005 + -- .../1.0/log4net.Ext.MarshalByRef/cs/.cvsignore | 4 + .../1.0/log4net.Ext.MarshalByRef/cs/nant.build | 36 +++ .../1.0/log4net.Ext.MarshalByRef/cs/nant.config | 7 + .../log4net.Ext.MarshalByRef/cs/src/.cvsignore | 6 + .../cs/src/AssemblyInfo.cs | 62 .../cs/src/MarshalByRefLogImpl.cs | 226 ++ .../cs/src/MarshalByRefLogManager.cs| 291 +++ .../cs/src/log4net.Ext.MarshalByRef.csproj | 111 +++ .../net/1.0/log4net.Ext.MarshalByRef/nant.build | 13 + .../1.0/log4net.Ext.MarshalByRef/nant.config| 5 + 10 files changed, 761 insertions(+) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/9930fffe/extensions/net/1.0/log4net.Ext.MarshalByRef/cs/.cvsignore -- diff --git a/extensions/net/1.0/log4net.Ext.MarshalByRef/cs/.cvsignore b/extensions/net/1.0/log4net.Ext.MarshalByRef/cs/.cvsignore new file mode 100755 index 000..1c2c992 --- /dev/null +++ b/extensions/net/1.0/log4net.Ext.MarshalByRef/cs/.cvsignore @@ -0,0 +1,4 @@ +bin +doc +build + http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/9930fffe/extensions/net/1.0/log4net.Ext.MarshalByRef/cs/nant.build -- diff --git a/extensions/net/1.0/log4net.Ext.MarshalByRef/cs/nant.build b/extensions/net/1.0/log4net.Ext.MarshalByRef/cs/nant.build new file mode 100755 index 000..ed01836 --- /dev/null +++ b/extensions/net/1.0/log4net.Ext.MarshalByRef/cs/nant.build @@ -0,0 +1,36 @@ + +http://tempuri.org/nant-vs.xsd";> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/9930fffe/extensions/net/1.0/log4net.Ext.MarshalByRef/cs/nant.config -- diff --git a/extensions/net/1.0/log4net.Ext.MarshalByRef/cs/nant.config b/extensions/net/1.0/log4net.Ext.MarshalByRef/cs/nant.config new file mode 100755 index 000..a6e7363 --- /dev/null +++ b/extensions/net/1.0/log4net.Ext.MarshalByRef/cs/nant.config @@ -0,0 +1,7 @@ + +http://tempuri.org/nant-vs.xsd";> + + + + + http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/9930fffe/extensions/net/1.0/log4net.Ext.MarshalByRef/cs/src/.cvsignore -- diff --git a/extensions/net/1.0/log4net.Ext.MarshalByRef/cs/src/.cvsignore b/extensions/net/1.0/log4net.Ext.MarshalByRef/cs/src/.cvsignore new file mode 100755 index 000..c74ea63 --- /dev/null +++ b/extensions/net/1.0/log4net.Ext.MarshalByRef/cs/src/.cvsignore @@ -0,0 +1,6 @@ +bin +obj +log4net.xml +*.csproj.user +*.suo + http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/9930fffe/extensions/net/1.0/log4net.Ext.MarshalByRef/cs/src/AssemblyInfo.cs -- diff --git a/extensions/net/1.0/log4net.Ext.MarshalByRef/cs/src/AssemblyInfo.cs b/extensions/net/1.0/log4net.Ext.MarshalByRef/cs/src/AssemblyInfo.cs new file mode 100755 index 000..68cc4e5 --- /dev/null +++ b/extensions/net/1.0/log4net.Ext.MarshalByRef/cs/src/AssemblyInfo.cs @@ -0,0 +1,62 @@ +#region Copyright & License +// +// Copyright 2001-2005 The Apache Software Foundation +// +// 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
[09/50] [abbrv] logging-log4net git commit: Rebuilt html docs
Rebuilt html docs Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/ebba1245 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/ebba1245 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/ebba1245 Branch: refs/heads/origin/trunk Commit: ebba1245b7c8329f689766a129a599729bcf351b Parents: 3b72f8c Author: Nicko Cadell Authored: Mon Feb 14 03:48:59 2005 + Committer: Nicko Cadell Committed: Mon Feb 14 03:48:59 2005 + -- doc/contributing.html | 20 ++-- doc/history.html | 2 +- doc/index.html| 12 +- doc/license.html | 6 +- doc/release/building.html | 18 +-- doc/release/config-examples.html | 94 doc/release/example-apps.html | 70 ++-- doc/release/faq.html | 170 ++--- doc/release/features.html | 45 doc/release/framework-support.html| 95 doc/release/manual/configuration.html | 62 +-- doc/release/manual/contexts.html | 26 ++--- doc/release/manual/internals.html | 10 +- doc/release/manual/introduction.html | 41 +++ doc/release/manual/plugins.html | 10 +- doc/release/manual/repositories.html | 10 +- doc/release/release-notes.html| 56 +- doc/roadmap.html | 2 +- doc/support.html | 10 +- 19 files changed, 406 insertions(+), 353 deletions(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/ebba1245/doc/contributing.html -- diff --git a/doc/contributing.html b/doc/contributing.html index 72b6c9a..733de4f 100755 --- a/doc/contributing.html +++ b/doc/contributing.html @@ -65,15 +65,15 @@ limitations under the License. - Contributing to log4net Development + Contributing to log4net Development -Developer Mailing List +Developer Mailing List All discussion relating to log4net development takes place on this list. All CVS checkin notifications are also copied to this list. -Mailing List Archives +Mailing List Archives You can browse the mailing list archives at the following locations: @@ -84,7 +84,7 @@ limitations under the License. http://sourceforge.net/mailarchive/forum.php?forum=log4net-devel";>Old Mailing List at sourceforge -Subscribe +Subscribe Subscribe to either the list or to the digest list: @@ -105,7 +105,7 @@ limitations under the License. -Unsubscribe +Unsubscribe To unsubscribe send an email to the relevant email address: @@ -126,7 +126,7 @@ limitations under the License. -Posting +Posting Most of the guidelines for the log4net-user list also apply to the dev list. @@ -147,16 +147,16 @@ limitations under the License. -CVS Access +CVS Access -Browsing CVS +Browsing CVS
[39/50] [abbrv] logging-log4net git commit: Removed unused reference
Removed unused reference Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/2a412c94 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/2a412c94 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/2a412c94 Branch: refs/heads/origin/trunk Commit: 2a412c9416becee1dc391037a87f123d4c12154d Parents: 24e791f Author: Nicko Cadell Authored: Fri Mar 11 21:44:44 2005 + Committer: Nicko Cadell Committed: Fri Mar 11 21:44:44 2005 + -- tests/src/log4net.Tests.csproj | 5 - 1 file changed, 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/2a412c94/tests/src/log4net.Tests.csproj -- diff --git a/tests/src/log4net.Tests.csproj b/tests/src/log4net.Tests.csproj index d968016..aeffa18 100755 --- a/tests/src/log4net.Tests.csproj +++ b/tests/src/log4net.Tests.csproj @@ -87,11 +87,6 @@ AssemblyName = "System.Runtime.Remoting" HintPath = "..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.0.3705\System.Runtime.Remoting.dll" /> -
[15/50] [abbrv] logging-log4net git commit: Added packaging support for the xdocs and the unit tests
Added packaging support for the xdocs and the unit tests Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/341a28cd Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/341a28cd Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/341a28cd Branch: refs/heads/origin/trunk Commit: 341a28cde1901b26c187421d82f2d8bfa3519fa7 Parents: e8fd624 Author: Nicko Cadell Authored: Wed Feb 16 21:53:56 2005 + Committer: Nicko Cadell Committed: Wed Feb 16 21:53:56 2005 + -- log4net.build | 42 ++ 1 file changed, 42 insertions(+) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/341a28cd/log4net.build -- diff --git a/log4net.build b/log4net.build index 6d0f810..cba977a 100755 --- a/log4net.build +++ b/log4net.build @@ -1,6 +1,7 @@ http://tempuri.org/nant-vs.xsd";> + @@ -600,6 +601,8 @@ + + @@ -654,6 +657,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + @@ -676,6 +704,14 @@ + + + + + + + + @@ -715,6 +751,12 @@ + + + + + +
[14/50] [abbrv] logging-log4net git commit: Only attempt to IPAddress.Parse if the string contains valid IP address characters
Only attempt to IPAddress.Parse if the string contains valid IP address characters Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/e8fd624d Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/e8fd624d Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/e8fd624d Branch: refs/heads/origin/trunk Commit: e8fd624d1e7832151c292bd235d2cc4e38356ed2 Parents: 3ad6acc Author: Nicko Cadell Authored: Tue Feb 15 18:56:52 2005 + Committer: Nicko Cadell Committed: Tue Feb 15 18:56:52 2005 + -- src/Util/TypeConverters/IPAddressConverter.cs | 33 ++ 1 file changed, 22 insertions(+), 11 deletions(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/e8fd624d/src/Util/TypeConverters/IPAddressConverter.cs -- diff --git a/src/Util/TypeConverters/IPAddressConverter.cs b/src/Util/TypeConverters/IPAddressConverter.cs index 673f1c6..7e3896a 100755 --- a/src/Util/TypeConverters/IPAddressConverter.cs +++ b/src/Util/TypeConverters/IPAddressConverter.cs @@ -2,15 +2,15 @@ // // Copyright 2001-2005 The Apache Software Foundation // -// Licensed under the Apache License, Version 2.0 (the "License"); +// 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. +// 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. // @@ -72,19 +72,25 @@ namespace log4net.Util.TypeConverters public object ConvertFrom(object source) { string str = source as string; - if (str != null) + if (str != null && str.Length > 0) { try { - try + // Check if the string only contains IP address valid chars + if (str.Trim(validIpAddressChars).Length == 0) { - return IPAddress.Parse(str); - } - catch(FormatException) - { - // Ignore a FormatException, try to resolve via DNS + try + { + // try to parse the string as an IP address + return IPAddress.Parse(str); + } + catch(FormatException) + { + // Ignore a FormatException, try to resolve via DNS + } } + // Try to resolve via DNS. This is a blocking call. IPHostEntry host = Dns.GetHostByName(str); if (host != null && host.AddressList != null && @@ -103,5 +109,10 @@ namespace log4net.Util.TypeConverters } #endregion + + /// + /// Valid characters in an IPv4 or IPv6 address string. (Does not support subnets) + /// + private static readonly char[] validIpAddressChars = {'0','1','2','3','4','5','6','7','8','9','a','b','c','d','e','f','A','B','C','D','E','F','x','X','.',':','%'}; } }
[23/50] [abbrv] logging-log4net git commit: Added missing NOTICE.txt to package zip
Added missing NOTICE.txt to package zip Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/bdc4a9eb Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/bdc4a9eb Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/bdc4a9eb Branch: refs/heads/origin/trunk Commit: bdc4a9eb204689fc40ae9c15e89407a26aa91baf Parents: d443205 Author: Nicko Cadell Authored: Wed Feb 23 22:31:06 2005 + Committer: Nicko Cadell Committed: Wed Feb 23 22:31:06 2005 + -- log4net.build | 2 ++ 1 file changed, 2 insertions(+) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/bdc4a9eb/log4net.build -- diff --git a/log4net.build b/log4net.build index cba977a..ef68764 100755 --- a/log4net.build +++ b/log4net.build @@ -725,7 +725,9 @@ + +
[31/50] [abbrv] logging-log4net git commit: Added Thread.MemoryBarrier call on NET_1_1 after writing to local variable, this is only required on SMP machines with a weak memory model (e.g. Itanium)
Added Thread.MemoryBarrier call on NET_1_1 after writing to local variable, this is only required on SMP machines with a weak memory model (e.g. Itanium) Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/2dca8050 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/2dca8050 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/2dca8050 Branch: refs/heads/origin/trunk Commit: 2dca80504f208d4a9c1b42a66996c0eb21d42924 Parents: 15376d4 Author: Nicko Cadell Authored: Fri Mar 4 21:11:48 2005 + Committer: Nicko Cadell Committed: Fri Mar 4 21:11:48 2005 + -- src/DateFormatter/AbsoluteTimeDateFormatter.cs | 10 +- 1 file changed, 9 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/2dca8050/src/DateFormatter/AbsoluteTimeDateFormatter.cs -- diff --git a/src/DateFormatter/AbsoluteTimeDateFormatter.cs b/src/DateFormatter/AbsoluteTimeDateFormatter.cs index 118fe1c..a026413 100755 --- a/src/DateFormatter/AbsoluteTimeDateFormatter.cs +++ b/src/DateFormatter/AbsoluteTimeDateFormatter.cs @@ -121,8 +121,16 @@ namespace log4net.DateFormatter // Calculate the new string for this second FormatDateWithoutMillis(dateToFormat, s_lastTimeBuf); + // Render the string buffer to a string + string currentDateWithoutMillis = s_lastTimeBuf.ToString(); + +#if NET_1_1 + // Ensure that the above string is written into the variable NOW on all threads. + // This is only required on multiprocessor machines with weak memeory models + System.Threading.Thread.MemoryBarrier(); +#endif // Store the time as a string (we only have to do this once per second) - s_lastTimeString = s_lastTimeBuf.ToString(); + s_lastTimeString = currentDateWithoutMillis; s_lastTimeToTheSecond = currentTimeToTheSecond; } }
[20/50] [abbrv] logging-log4net git commit: Added Downloads doc page. Tweaked release notes doc.
http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/6f317353/doc/release/faq.html -- diff --git a/doc/release/faq.html b/doc/release/faq.html index 70df0a2..a691fb6 100755 --- a/doc/release/faq.html +++ b/doc/release/faq.html @@ -65,116 +65,116 @@ limitations under the License. - log4net Manual - Frequently Asked Questions + log4net Manual - Frequently Asked Questions Contents - Information + Information -What is log4net? +What is log4net? -Is log4net a reliable logging system? +Is log4net a reliable logging system? -What are the prerequisites for log4net? +What are the prerequisites for log4net? -Is there example code for using log4net? +Is there example code for using log4net? -What are the features of log4net? +What are the features of log4net? -Is log4net thread-safe? +Is log4net thread-safe? -What does log output look like? +What does log output look like? -What are Loggers? +What are Loggers? -Why should I donate my extensions to log4net back to the project? +Why should I donate my extensions to log4net back to the project? -What should I keep in mind when contributing code? +What should I keep in mind when contributing code? -How fast do bugs in log4net get fixed? +How fast do bugs in log4net get fixed? -What is the history of log4net? +What is the history of log4net? -Where can I find the latest distribution of log4net? +Where can I find the latest distribution of log4net? - Configuration + Configuration
[32/50] [abbrv] logging-log4net git commit: Added virtual SetQWForFiles(Stream) method to make it simpler for subclasses to wrap the output file stream, for example to add support for encryption
Added virtual SetQWForFiles(Stream) method to make it simpler for subclasses to wrap the output file stream, for example to add support for encryption Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/123a63b8 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/123a63b8 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/123a63b8 Branch: refs/heads/origin/trunk Commit: 123a63b8658bec063ec2ea90697e4e9370faaea6 Parents: 2dca805 Author: Nicko Cadell Authored: Mon Mar 7 01:34:45 2005 + Committer: Nicko Cadell Committed: Mon Mar 7 01:34:45 2005 + -- src/Appender/FileAppender.cs | 26 -- 1 file changed, 24 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/123a63b8/src/Appender/FileAppender.cs -- diff --git a/src/Appender/FileAppender.cs b/src/Appender/FileAppender.cs index b7eb255..94244de 100755 --- a/src/Appender/FileAppender.cs +++ b/src/Appender/FileAppender.cs @@ -385,12 +385,34 @@ namespace log4net.Appender } /// + /// Sets the quiet writer used for file output + /// + /// the file stream that has been opened for writing + /// + /// + /// This implementation of creates a + /// over the and passes it to the + /// method. + /// + /// + /// This method can be overridden by sub classes that want to wrap the + /// in some way, for example to encrypt the output + /// data using a System.Security.Cryptography.CryptoStream. + /// + /// + virtual protected void SetQWForFiles(Stream fileStream) + { + SetQWForFiles(new StreamWriter(fileStream, m_encoding)); + } + + /// /// Sets the quiet writer being used. /// - /// the writer to set + /// the writer over the file stream that has been opened for writing /// /// - /// This method can be overridden by sub classes. + /// This method can be overridden by sub classes that want to + /// wrap the in some way. /// /// virtual protected void SetQWForFiles(TextWriter writer)
[10/50] [abbrv] logging-log4net git commit: Added links to MARC lists
Added links to MARC lists Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/7e44ed96 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/7e44ed96 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/7e44ed96 Branch: refs/heads/origin/trunk Commit: 7e44ed96fb3f83bada14c58efe674488557d3e66 Parents: ebba124 Author: Nicko Cadell Authored: Mon Feb 14 10:40:04 2005 + Committer: Nicko Cadell Committed: Mon Feb 14 10:40:04 2005 + -- doc/contributing.html | 2 +- doc/support.html | 12 ++-- xdocs/src/contributing.xml | 2 +- xdocs/src/support.xml | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/7e44ed96/doc/contributing.html -- diff --git a/doc/contributing.html b/doc/contributing.html index 733de4f..e25715f 100755 --- a/doc/contributing.html +++ b/doc/contributing.html @@ -80,7 +80,7 @@ limitations under the License. http://nagoya.apache.org/eyebrowse/SummarizeList?listId=214";>eyebrowse - + http://marc.theaimsgroup.com/?l=log4net-dev&r=1&w=2";>MARC http://sourceforge.net/mailarchive/forum.php?forum=log4net-devel";>Old Mailing List at sourceforge http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/7e44ed96/doc/support.html -- diff --git a/doc/support.html b/doc/support.html index d07873a..6154e33 100755 --- a/doc/support.html +++ b/doc/support.html @@ -65,25 +65,25 @@ limitations under the License. - log4net Support + log4net Support log4net user support is provided via a mailing list. Discussion on log4net is held on the log4net-user mailing list. Please search the archives before posting because it is likely that your question has been answered before. -Mailing List Archives +Mailing List Archives You can browse the mailing list archives at the following locations: http://nagoya.apache.org/eyebrowse/SummarizeList?listId=215";>eyebrowse - + http://marc.theaimsgroup.com/?l=log4net-user&r=1&w=2";>MARC http://sourceforge.net/mailarchive/forum.php?forum=log4net-users";>Old Mailing List at sourceforge -Subscribe +Subscribe Subscribe to either the list or to the digest list: @@ -104,7 +104,7 @@ limitations under the License. -Unsubscribe +Unsubscribe To unsubscribe send an email to the relevant email address: @@ -125,7 +125,7 @@ limitations under the License. -Posting +Posting Before posting please read the following guidelines: http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/7e44ed96/xdocs/src/contributing.xml -- diff --git a/xdocs/src/contributing.xml b/xdocs/src/contributing.xml index b1c172a..8c59e73 100755 --- a
[29/50] [abbrv] logging-log4net git commit: Added ASF copyright to all nant build files
Added ASF copyright to all nant build files Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/4e45554f Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/4e45554f Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/4e45554f Branch: refs/heads/origin/trunk Commit: 4e45554fbbfd7806799b1dce37cc5538de9a66e5 Parents: 5394a5d Author: Nicko Cadell Authored: Sun Feb 27 23:22:54 2005 + Committer: Nicko Cadell Committed: Sun Feb 27 23:22:54 2005 + -- .../mono/1.0/Performance/NotLogging/cs/nant.build| 15 +++ .../mono/1.0/Performance/NotLogging/cs/nant.config | 15 +++ examples/mono/1.0/Performance/NotLogging/nant.build | 15 +++ examples/mono/1.0/Performance/NotLogging/nant.config | 15 +++ examples/mono/1.0/Performance/nant.build | 15 +++ examples/mono/1.0/Performance/nant.config| 15 +++ .../mono/1.0/Repository/SharedModule/cs/nant.build | 15 +++ .../mono/1.0/Repository/SharedModule/cs/nant.config | 15 +++ examples/mono/1.0/Repository/SharedModule/nant.build | 15 +++ .../mono/1.0/Repository/SharedModule/nant.config | 15 +++ examples/mono/1.0/Repository/SimpleApp/cs/nant.build | 15 +++ .../mono/1.0/Repository/SimpleApp/cs/nant.config | 15 +++ examples/mono/1.0/Repository/SimpleApp/nant.build| 15 +++ examples/mono/1.0/Repository/SimpleApp/nant.config | 15 +++ .../mono/1.0/Repository/SimpleModule/cs/nant.build | 15 +++ .../mono/1.0/Repository/SimpleModule/cs/nant.config | 15 +++ examples/mono/1.0/Repository/SimpleModule/nant.build | 15 +++ .../mono/1.0/Repository/SimpleModule/nant.config | 15 +++ examples/mono/1.0/Repository/nant.build | 15 +++ examples/mono/1.0/Repository/nant.config | 15 +++ examples/mono/1.0/Tutorials/ConsoleApp/cs/nant.build | 15 +++ .../mono/1.0/Tutorials/ConsoleApp/cs/nant.config | 15 +++ examples/mono/1.0/Tutorials/ConsoleApp/nant.build| 15 +++ examples/mono/1.0/Tutorials/ConsoleApp/nant.config | 15 +++ examples/mono/1.0/Tutorials/nant.build | 15 +++ examples/mono/1.0/Tutorials/nant.config | 15 +++ examples/mono/1.0/nant.build | 15 +++ examples/mono/1.0/nant.config| 15 +++ examples/mono/nant.build | 15 +++ examples/mono/nant.config| 15 +++ examples/nant.build | 15 +++ examples/nant.config | 15 +++ .../1.0/Appenders/SampleAppendersApp/cs/nant.build | 15 +++ .../1.0/Appenders/SampleAppendersApp/cs/nant.config | 15 +++ .../net/1.0/Appenders/SampleAppendersApp/nant.build | 15 +++ .../net/1.0/Appenders/SampleAppendersApp/nant.config | 15 +++ examples/net/1.0/Appenders/nant.build| 15 +++ examples/net/1.0/Appenders/nant.config | 15 +++ .../1.0/Extensibility/EventIDLogApp/cs/nant.build| 15 +++ .../1.0/Extensibility/EventIDLogApp/cs/nant.config | 15 +++ .../net/1.0/Extensibility/EventIDLogApp/nant.build | 15 +++ .../net/1.0/Extensibility/EventIDLogApp/nant.config | 15 +++ .../net/1.0/Extensibility/TraceLogApp/cs/nant.build | 15 +++ .../net/1.0/Extensibility/TraceLogApp/cs/nant.config | 15 +++ .../net/1.0/Extensibility/TraceLogApp/nant.build | 15 +++ .../net/1.0/Extensibility/TraceLogApp/nant.config| 15 +++ examples/net/1.0/Extensibility/nant.build| 15 +++ examples/net/1.0/Extensibility/nant.config | 15 +++ .../net/1.0/Performance/NotLogging/cs/nant.build | 15 +++ .../net/1.0/Performance/NotLogging/cs/nant.config| 15 +++ examples/net/1.0/Performance/NotLogging/nant.build | 15 +++ examples/net/1.0/Performance/NotLogging/nant.config | 15 +++ .../net/1.0/Performance/NotLogging/vb/nant.build | 15 +++ .../net/1.0/Performance/NotLogging/vb/nant.config| 15 +++ examples/net/1.0/Performance/nant.build | 15 +++ examples/net/1.0/Performance/nant.config | 15 +++ .../net/1.0/Remoting/RemotingClient/cs/nant.build| 15 +++ .../net/1.0/Remoting/RemotingClient/cs/nant.config | 15 +++ ex
[06/50] [abbrv] logging-log4net git commit: Added support for all old methods in NDC - Depth, SetMaxDepth, CloneStack, Inherit
Added support for all old methods in NDC - Depth, SetMaxDepth, CloneStack, Inherit Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/f85c2955 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/f85c2955 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/f85c2955 Branch: refs/heads/origin/trunk Commit: f85c29558ec851b22fb94388f97d9b4d3eb03a2b Parents: 6aa2873 Author: Nicko Cadell Authored: Mon Feb 14 03:45:01 2005 + Committer: Nicko Cadell Committed: Mon Feb 14 03:45:01 2005 + -- src/NDC.cs | 109 +++- src/Util/ThreadContextStack.cs | 41 +- 2 files changed, 134 insertions(+), 16 deletions(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/f85c2955/src/NDC.cs -- diff --git a/src/NDC.cs b/src/NDC.cs index aeefcf4..5b8e75e 100755 --- a/src/NDC.cs +++ b/src/NDC.cs @@ -25,10 +25,12 @@ namespace log4net /// Implementation of Nested Diagnostic Contexts. /// /// + /// /// /// The NDC is deprecated and has been replaced by the . /// The current NDC implementation forwards to the ThreadContext.Stacks["NDC"]. /// + /// /// /// A Nested Diagnostic Context, or NDC in short, is an instrument /// to distinguish interleaved log output from different sources. Log @@ -82,6 +84,12 @@ namespace log4net /// /// The current context depth. /// + /// + /// + /// The NDC is deprecated and has been replaced by the . + /// The current NDC implementation forwards to the ThreadContext.Stacks["NDC"]. + /// + /// /// /// The number of context values pushed onto the context stack. /// @@ -91,10 +99,10 @@ namespace log4net /// /// /// - [Obsolete("NDC has been replaced by ThreadContext.Stacks", true)] + /*[Obsolete("NDC has been replaced by ThreadContext.Stacks")]*/ public static int Depth { - get { throw new NotSupportedException("NDC has been replaced by ThreadContext.Stacks"); } + get { return ThreadContext.Stacks["NDC"].Count; } } #endregion Public Static Properties @@ -105,9 +113,17 @@ namespace log4net /// Clears all the contextual information held on the current thread. /// /// + /// + /// + /// The NDC is deprecated and has been replaced by the . + /// The current NDC implementation forwards to the ThreadContext.Stacks["NDC"]. + /// + /// + /// /// Clears the stack of NDC data held on the current thread. + /// /// - /*[Obsolete("NDC has been replaced by ThreadContext.Stacks", true)]*/ + /*[Obsolete("NDC has been replaced by ThreadContext.Stacks")]*/ public static void Clear() { ThreadContext.Stacks["NDC"].Clear(); @@ -118,14 +134,22 @@ namespace log4net /// /// A clone of the context info for this thread. /// + /// + /// + /// The NDC is deprecated and has been replaced by the . + /// The current NDC implementation forwards to the ThreadContext.Stacks["NDC"]. + /// + /// + /// /// The results of this method can be passed to the /// method to allow child threads to inherit the context of their /// parent thread. + /// /// - [Obsolete("NDC has been replaced by ThreadContext.Stacks", true)] + /*[Obsolete("NDC has been replaced by ThreadContext.Stacks")]*/ public static Stack CloneStack() { - throw new NotSupportedException("NDC has been replaced by ThreadContext.Stacks"); + return ThreadContext.Stacks["NDC"].InternalStack; } /// @@ -133,6 +157,13 @@ namespace log4net /// /// The context stack to inherit. /// + /// + /// + /// The NDC is deprecated and has been replaced by the . + /// The
[50/50] [abbrv] logging-log4net git commit: Removed obsolete ReleaseStrong build config
Removed obsolete ReleaseStrong build config Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/fecc9fb7 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/fecc9fb7 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/fecc9fb7 Branch: refs/heads/origin/trunk Commit: fecc9fb7d67df6312482fe5e9a2ad6e665b241f2 Parents: 3e00d06 Author: Nicko Cadell Authored: Mon Mar 21 01:34:46 2005 + Committer: Nicko Cadell Committed: Mon Mar 21 01:34:46 2005 + -- src/log4net.sln | 7 --- 1 file changed, 7 deletions(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/fecc9fb7/src/log4net.sln -- diff --git a/src/log4net.sln b/src/log4net.sln index e3c50ee..1fb7b31 100755 --- a/src/log4net.sln +++ b/src/log4net.sln @@ -4,9 +4,6 @@ EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "log4net.Tests", "..\tests\src\log4net.Tests.csproj", "{4B68B77E-0C8B-4296-930D-6AC2787170B8}" EndProject Global - GlobalSection(DPCodeReviewSolutionGUID) = preSolution - DPCodeReviewSolutionGUID = {----} - EndGlobalSection GlobalSection(SolutionConfiguration) = preSolution ConfigName.0 = Debug ConfigName.1 = Release @@ -18,14 +15,10 @@ Global {F6A02431-167E-4347-BC43-65532C31CDB7}.Debug.Build.0 = Debug|.NET {F6A02431-167E-4347-BC43-65532C31CDB7}.Release.ActiveCfg = Release|.NET {F6A02431-167E-4347-BC43-65532C31CDB7}.Release.Build.0 = Release|.NET - {F6A02431-167E-4347-BC43-65532C31CDB7}.ReleaseStrong.ActiveCfg = ReleaseStrong|.NET - {F6A02431-167E-4347-BC43-65532C31CDB7}.ReleaseStrong.Build.0 = ReleaseStrong|.NET {4B68B77E-0C8B-4296-930D-6AC2787170B8}.Debug.ActiveCfg = Debug|.NET {4B68B77E-0C8B-4296-930D-6AC2787170B8}.Debug.Build.0 = Debug|.NET {4B68B77E-0C8B-4296-930D-6AC2787170B8}.Release.ActiveCfg = Release|.NET {4B68B77E-0C8B-4296-930D-6AC2787170B8}.Release.Build.0 = Release|.NET - {4B68B77E-0C8B-4296-930D-6AC2787170B8}.ReleaseStrong.ActiveCfg = Release|.NET - {4B68B77E-0C8B-4296-930D-6AC2787170B8}.ReleaseStrong.Build.0 = Release|.NET EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution EndGlobalSection
[36/50] [abbrv] logging-log4net git commit: Implemented locking models so tat FileAppender and it's subclasses can change their file access semantics.
Implemented locking models so tat FileAppender and it's subclasses can change their file access semantics. Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/edce5eb0 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/edce5eb0 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/edce5eb0 Branch: refs/heads/origin/trunk Commit: edce5eb0c301af731fcaddc60efb8ccb7cb27505 Parents: 94d54e5 Author: Niall Daley Authored: Fri Mar 11 18:21:56 2005 + Committer: Niall Daley Committed: Fri Mar 11 18:21:56 2005 + -- src/Appender/FileAppender.cs | 394 - tests/src/Appender/RollingFileAppenderTest.cs | 256 + tests/src/log4net.Tests.csproj| 5 + 3 files changed, 639 insertions(+), 16 deletions(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/edce5eb0/src/Appender/FileAppender.cs -- diff --git a/src/Appender/FileAppender.cs b/src/Appender/FileAppender.cs index 94244de..a94f665 100755 --- a/src/Appender/FileAppender.cs +++ b/src/Appender/FileAppender.cs @@ -60,8 +60,268 @@ namespace log4net.Appender /// Gert Driesen /// Rodrigo B. de Oliveira /// Douglas de la Torre - public class FileAppender : TextWriterAppender + /// Niall Daley + public class FileAppender : TextWriterAppender { + #region Inner Classes + private sealed class LockingStream : Stream, IDisposable + { + public class LockStateException : Exception + { + public LockStateException(string message): base(message){} + } + + private Stream m_realStream=null; + private LockingModelBase m_lockingModel=null; + + #region Stream methods + // Methods + public LockingStream(LockingModelBase locking) : base() + { + if (locking==null) + { + throw new ArgumentException("Locking model may not be null","locking"); + } + m_lockingModel=locking; + } + public override IAsyncResult BeginRead(byte[] buffer, int offset, int count, AsyncCallback callback, object state) + { + AssertLocked(); + IAsyncResult ret=m_realStream.BeginRead(buffer,offset,count,callback,state); + EndRead(ret); + return ret; + } + public override IAsyncResult BeginWrite(byte[] buffer, int offset, int count, AsyncCallback callback, object state) + { + AssertLocked(); + IAsyncResult ret=m_realStream.BeginWrite(buffer,offset,count,callback,state); + EndWrite(ret); + return ret; + } + public override void Close() {m_lockingModel.CloseFile();} + public override int EndRead(IAsyncResult asyncResult) {AssertLocked();return m_realStream.EndRead(asyncResult);} + public override void EndWrite(IAsyncResult asyncResult) {AssertLocked();m_realStream.EndWrite(asyncResult);} + public override void Flush() {AssertLocked();m_realStream.Flush();} + public override int Read(byte[] buffer, int offset, int count) {AssertLocked();return m_realStream.Read(buffer,offset,count);} + public override int ReadByte() {AssertLocked();return m_realStream.ReadByte();} + public override long Seek(long offset, SeekOrigin origin) {AssertLocked();return m_realStream.Seek(offset,origin);} + public override void SetLength(long value) {AssertLocked();m_realStream.SetLength(value);} + void IDisposable.Dispose() {this.Close();} + public override void Write(byte[] buffer, int offset, int count) {AssertLocked();m_realStream.Write(buffer,offset,count);} + public override void WriteByte(byte value) {AssertLocked();m_realStream.WriteByte(value);} + + // Properties + public override bool CanRead { get {AssertLocked();return m_realStream.CanRead;} } + public override bo
[41/50] [abbrv] logging-log4net git commit: Updated doc comments
Updated doc comments Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/fd4acd01 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/fd4acd01 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/fd4acd01 Branch: refs/heads/origin/trunk Commit: fd4acd01ff8110e162331cb1bb6be5bfa1bef238 Parents: 146c74c Author: Nicko Cadell Authored: Fri Mar 11 22:57:48 2005 + Committer: Nicko Cadell Committed: Fri Mar 11 22:57:48 2005 + -- src/Appender/FileAppender.cs | 16 1 file changed, 12 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/fd4acd01/src/Appender/FileAppender.cs -- diff --git a/src/Appender/FileAppender.cs b/src/Appender/FileAppender.cs index 3449ffa..4cb76a4 100755 --- a/src/Appender/FileAppender.cs +++ b/src/Appender/FileAppender.cs @@ -55,6 +55,14 @@ namespace log4net.Appender /// If the file cannot be opened for writing when a message is logged then /// the message will be discarded by this appender. /// + /// + /// The supports pluggable file locking models via + /// the property. + /// The default behaviour, implemented by + /// is to obtain an exclusive write lock on the file until this appender is closed. + /// The alternative model, , only holds a + /// write lock while the appender is writing a logging event. + /// /// /// Nicko Cadell /// Gert Driesen @@ -81,9 +89,6 @@ namespace log4net.Appender private Stream m_realStream=null; private LockingModelBase m_lockingModel=null; - #region Override Implementation of Stream - - // Methods public LockingStream(LockingModelBase locking) : base() { if (locking==null) @@ -93,6 +98,9 @@ namespace log4net.Appender m_lockingModel=locking; } + #region Override Implementation of Stream + + // Methods public override IAsyncResult BeginRead(byte[] buffer, int offset, int count, AsyncCallback callback, object state) { throw new NotSupportedException("Read operations are not supported on the LockingStream"); @@ -537,8 +545,8 @@ namespace log4net.Appender m_stream=null; } } - #endregion + #endregion Locking Models #region Public Instance Constructors
[46/50] [abbrv] logging-log4net git commit: Implemented nestable locking and delegated impersonation to the locking model.
Implemented nestable locking and delegated impersonation to the locking model. Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/e4b66da7 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/e4b66da7 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/e4b66da7 Branch: refs/heads/origin/trunk Commit: e4b66da7f737a0eb0a99f86737c4906091610e1d Parents: 0ce7747 Author: Niall Daley Authored: Tue Mar 15 21:12:29 2005 + Committer: Niall Daley Committed: Tue Mar 15 21:12:29 2005 + -- src/Appender/FileAppender.cs | 170 +++--- 1 file changed, 87 insertions(+), 83 deletions(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/e4b66da7/src/Appender/FileAppender.cs -- diff --git a/src/Appender/FileAppender.cs b/src/Appender/FileAppender.cs index 4cb76a4..2e9e6f7 100755 --- a/src/Appender/FileAppender.cs +++ b/src/Appender/FileAppender.cs @@ -88,6 +88,8 @@ namespace log4net.Appender private Stream m_realStream=null; private LockingModelBase m_lockingModel=null; + private int m_readTotal=-1; + private int m_lockLevel=0; public LockingStream(LockingModelBase locking) : base() { @@ -103,7 +105,10 @@ namespace log4net.Appender // Methods public override IAsyncResult BeginRead(byte[] buffer, int offset, int count, AsyncCallback callback, object state) { - throw new NotSupportedException("Read operations are not supported on the LockingStream"); + AssertLocked(); + IAsyncResult ret=m_realStream.BeginRead(buffer,offset,count,callback,state); + m_readTotal=EndRead(ret); + return ret; } /// @@ -124,12 +129,12 @@ namespace log4net.Appender public override int EndRead(IAsyncResult asyncResult) { - throw new NotSupportedException("Read operations are not supported on the LockingStream"); + AssertLocked(); + return m_readTotal; } public override void EndWrite(IAsyncResult asyncResult) { - AssertLocked(); - m_realStream.EndWrite(asyncResult); + //No-op, it's already been handled } public override void Flush() { @@ -138,11 +143,11 @@ namespace log4net.Appender } public override int Read(byte[] buffer, int offset, int count) { - throw new NotSupportedException("Read operations are not supported on the LockingStream"); + return m_realStream.Read(buffer,offset,count); } public override int ReadByte() { - throw new NotSupportedException("Read operations are not supported on the LockingStream"); + return m_realStream.ReadByte(); } public override long Seek(long offset, SeekOrigin origin) { @@ -224,23 +229,31 @@ namespace log4net.Appender } } - public void AcquireLock() + public bool AcquireLock() { + bool ret=false; lock(this) { - if (m_realStream == null) + if (m_lockLevel==0) { // If lock is already acquired, nop m_realStream=m_lockingModel.AcquireLock(); } + if (m_realStream!=null) + { + m_lockLevel++; + ret=true; + } } +
[08/50] [abbrv] logging-log4net git commit: Rebuilt html docs
http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/ebba1245/doc/release/features.html -- diff --git a/doc/release/features.html b/doc/release/features.html index fef8cd2..6e6abe0 100755 --- a/doc/release/features.html +++ b/doc/release/features.html @@ -65,39 +65,39 @@ limitations under the License. - log4net Features + log4net Features Contents - Overview + Overview - Features + Features - Support for multiple frameworks + Support for multiple frameworks - Output to multiple logging targets + Output to multiple logging targets - Hierarchical logging architecture + Hierarchical logging architecture - XML Configuration + XML Configuration - Dynamic Configuration + Dynamic Configuration - Logging Context + Logging Context - Proven architecture + Proven architecture - Overview + Overview log4net is a tool to help the programmer output log statements to a @@ -119,7 +119,7 @@ limitations under the License. log4net is designed with two distinct goals in mind: speed and flexibility -Features +Features Support for multiple frameworks @@ -133,20 +133,21 @@ limitations under the License. High performance with flexibility
[03/50] [abbrv] logging-log4net git commit: Cnaged CORE build to CLI_1_0. Updated package target
Cnaged CORE build to CLI_1_0. Updated package target Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/dd6dbc94 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/dd6dbc94 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/dd6dbc94 Branch: refs/heads/origin/trunk Commit: dd6dbc946c06fef6054e2af757a0a6b056de4702 Parents: 6c76eda Author: Nicko Cadell Authored: Mon Feb 14 03:17:06 2005 + Committer: Nicko Cadell Committed: Mon Feb 14 03:17:06 2005 + -- log4net.build | 41 - log4net.include | 34 +- 2 files changed, 37 insertions(+), 38 deletions(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/dd6dbc94/log4net.build -- diff --git a/log4net.build b/log4net.build index 9225d2e..6d0f810 100755 --- a/log4net.build +++ b/log4net.build @@ -175,7 +175,7 @@ - + @@ -201,12 +201,15 @@ + + - + @@ -462,17 +465,19 @@ - + @@ -518,7 +523,7 @@ - +--> @@ -641,8 +646,8 @@ - - + + @@ -670,25 +675,19 @@ - - - - - - - + - + - + http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/dd6dbc94/log4net.include -- diff --git a/log4net.include b/log4net.include index bdedbe3..4f543a5 100755 --- a/log4net.include +++ b/log4net.include @@ -43,10 +43,10 @@ - +--> @@ -85,10 +85,10 @@ - + @@ -128,11 +128,11 @@ - +--> @@ -246,15 +246,15 @@ - + - - - - - - + + + + + +
[13/50] [abbrv] logging-log4net git commit: Added anonymous catch handler
Added anonymous catch handler Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/3ad6acc8 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/3ad6acc8 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/3ad6acc8 Branch: refs/heads/origin/trunk Commit: 3ad6acc863e098db6e28b14bbe0f9dea60275fcb Parents: 07adff7 Author: Nicko Cadell Authored: Mon Feb 14 19:45:11 2005 + Committer: Nicko Cadell Committed: Mon Feb 14 19:45:11 2005 + -- src/Appender/AppenderSkeleton.cs | 5 + 1 file changed, 5 insertions(+) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/3ad6acc8/src/Appender/AppenderSkeleton.cs -- diff --git a/src/Appender/AppenderSkeleton.cs b/src/Appender/AppenderSkeleton.cs index a0f43fc..77ce4f1 100755 --- a/src/Appender/AppenderSkeleton.cs +++ b/src/Appender/AppenderSkeleton.cs @@ -343,6 +343,11 @@ namespace log4net.Appender { ErrorHandler.Error("Failed in DoAppend", ex); } + catch + { + // Catch handler for non System.Exception types + ErrorHandler.Error("Failed in DoAppend (unknown exception)"); + } finally { m_recursiveGuard = false;
[47/50] [abbrv] logging-log4net git commit: Updated doc comment
Updated doc comment Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/6653dd08 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/6653dd08 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/6653dd08 Branch: refs/heads/origin/trunk Commit: 6653dd08be2f62be1246eafd8564da112b03c7f6 Parents: e4b66da Author: Nicko Cadell Authored: Mon Mar 21 00:23:13 2005 + Committer: Nicko Cadell Committed: Mon Mar 21 00:23:13 2005 + -- src/Appender/FileAppender.cs | 22 +++--- 1 file changed, 19 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/6653dd08/src/Appender/FileAppender.cs -- diff --git a/src/Appender/FileAppender.cs b/src/Appender/FileAppender.cs index 2e9e6f7..7b118c0 100755 --- a/src/Appender/FileAppender.cs +++ b/src/Appender/FileAppender.cs @@ -58,7 +58,7 @@ namespace log4net.Appender /// /// The supports pluggable file locking models via /// the property. - /// The default behaviour, implemented by + /// The default behavior, implemented by /// is to obtain an exclusive write lock on the file until this appender is closed. /// The alternative model, , only holds a /// write lock while the appender is writing a logging event. @@ -332,12 +332,28 @@ namespace log4net.Appender public abstract void ReleaseLock(); /// - /// The appender we are related to. Used to identify the security context to work within, and the error handler to use. + /// Gets or sets the for this LockingModel /// + /// + /// The for this LockingModel + /// + /// + /// + /// The file appender this locking model is attached to and working on + /// behalf of. + /// + /// + /// The file appender is used to locate the security context and the error handler to use. + /// + /// + /// The value of this property will be set before is + /// called. + /// + /// public FileAppender CurrentAppender { get { return m_appender; } - set { m_appender=value; } + set { m_appender = value; } } }
[45/50] [abbrv] logging-log4net git commit: Removed obsolete Format method from ILayout and LayoutSkeleton. It was already a breaking change, best to remove the old method before the next release, i.e
Removed obsolete Format method from ILayout and LayoutSkeleton. It was already a breaking change, best to remove the old method before the next release, i.e. so we don't have to break it again. Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/0ce77476 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/0ce77476 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/0ce77476 Branch: refs/heads/origin/trunk Commit: 0ce77476c86e8d5010327150a4f07b1b5092aa70 Parents: f8ef80f Author: Nicko Cadell Authored: Mon Mar 14 02:44:57 2005 + Committer: Nicko Cadell Committed: Mon Mar 14 02:44:57 2005 + -- src/Layout/ILayout.cs| 26 +++--- src/Layout/LayoutSkeleton.cs | 22 -- 2 files changed, 11 insertions(+), 37 deletions(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/0ce77476/src/Layout/ILayout.cs -- diff --git a/src/Layout/ILayout.cs b/src/Layout/ILayout.cs index 569fa3e..8b709bf 100755 --- a/src/Layout/ILayout.cs +++ b/src/Layout/ILayout.cs @@ -30,7 +30,7 @@ namespace log4net.Layout /// /// /// An object is used to format a - /// as text. The method is called by an + /// as text. The method is called by an /// appender to transform the into a string. /// /// @@ -45,27 +45,23 @@ namespace log4net.Layout /// /// Implement this method to create your own layout format. /// + /// The TextWriter to write the formatted event to /// The event to format - /// returns the formatted event /// /// /// This method is called by an appender to format - /// the as a string. + /// the as text and output to a writer. /// - /// - [Obsolete("Use Format(TextWriter,LoggingEvent)")] - string Format(LoggingEvent loggingEvent); - - /// - /// Implement this method to create your own layout format. - /// - /// The TextWriter to write the formatted event to - /// The event to format - /// /// - /// This method is called by an appender to format - /// the as text. + /// If the caller does not have a and prefers the + /// event to be formatted as a then the following + /// code can be used to format the event into a . /// + /// + /// StringWriter writer = new StringWriter(); + /// Layout.Format(writer, loggingEvent); + /// string formattedEvent = writer.ToString(); + /// /// void Format(TextWriter writer, LoggingEvent loggingEvent); http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/0ce77476/src/Layout/LayoutSkeleton.cs -- diff --git a/src/Layout/LayoutSkeleton.cs b/src/Layout/LayoutSkeleton.cs index 1f29f00..ef92be7 100755 --- a/src/Layout/LayoutSkeleton.cs +++ b/src/Layout/LayoutSkeleton.cs @@ -129,28 +129,6 @@ namespace log4net.Layout /// /// Implement this method to create your own layout format. /// - /// The event to format - /// returns the formatted event - /// - /// - /// This method is called by an appender to format - /// the as a string. - /// - /// - /// This method must be implemented by the subclass. - /// - /// - [Obsolete("Use Format(TextWriter,LoggingEvent)")] - public string Format(LoggingEvent loggingEvent) - { - StringWriter writer = new StringWriter(System.Globalization.CultureInfo.InvariantCulture); - this.Format(writer, loggingEvent); - return writer.ToString(); - } - - /// - /// Implement this method to create your own layout format. - /// /// The TextWriter to write the formatted event to /// The event to format ///
[28/50] [abbrv] logging-log4net git commit: Added ASF copyright to all nant build files
http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/4e45554f/examples/net/1.0/Remoting/RemotingClient/nant.config -- diff --git a/examples/net/1.0/Remoting/RemotingClient/nant.config b/examples/net/1.0/Remoting/RemotingClient/nant.config index 26e110e..c3605c4 100755 --- a/examples/net/1.0/Remoting/RemotingClient/nant.config +++ b/examples/net/1.0/Remoting/RemotingClient/nant.config @@ -1,4 +1,19 @@ + http://tempuri.org/nant-vs.xsd";> http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/4e45554f/examples/net/1.0/Remoting/RemotingServer/cs/nant.build -- diff --git a/examples/net/1.0/Remoting/RemotingServer/cs/nant.build b/examples/net/1.0/Remoting/RemotingServer/cs/nant.build index ec69331..224a182 100755 --- a/examples/net/1.0/Remoting/RemotingServer/cs/nant.build +++ b/examples/net/1.0/Remoting/RemotingServer/cs/nant.build @@ -1,4 +1,19 @@ + http://tempuri.org/nant-vs.xsd";> http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/4e45554f/examples/net/1.0/Remoting/RemotingServer/cs/nant.config -- diff --git a/examples/net/1.0/Remoting/RemotingServer/cs/nant.config b/examples/net/1.0/Remoting/RemotingServer/cs/nant.config index f5c8731..60749c2 100755 --- a/examples/net/1.0/Remoting/RemotingServer/cs/nant.config +++ b/examples/net/1.0/Remoting/RemotingServer/cs/nant.config @@ -1,4 +1,19 @@ + http://tempuri.org/nant-vs.xsd";> http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/4e45554f/examples/net/1.0/Remoting/RemotingServer/nant.build -- diff --git a/examples/net/1.0/Remoting/RemotingServer/nant.build b/examples/net/1.0/Remoting/RemotingServer/nant.build index 603b71f..648d736 100755 --- a/examples/net/1.0/Remoting/RemotingServer/nant.build +++ b/examples/net/1.0/Remoting/RemotingServer/nant.build @@ -1,4 +1,19 @@ + http://tempuri.org/nant-vs.xsd";> http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/4e45554f/examples/net/1.0/Remoting/RemotingServer/nant.config -- diff --git a/examples/net/1.0/Remoting/RemotingServer/nant.config b/examples/net/1.0/Remoting/RemotingServer/nant.config index 26e110e..c3605c4 100755 --- a/examples/net/1.0/Remoting/RemotingServer/nant.config +++ b/examples/net/1.0/Remoting/RemotingServer/nant.config @@ -1,4 +1,19 @@ + http://tempuri.org/nant-vs.xsd";> http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/4e45554f/examples/net/1.0/Remoting/nant.build -- diff --git a/examples/net/1.0/Remoting/nant.build b/examples/net/1.0/Remoting/nant.build index ca47048..88cafb7 100755 --- a/examples/net/1.0/Remoting/nant.build +++ b/examples/net/1.0/Remoting/nant.build @@ -1,4 +1,19 @@ + http://tempuri.org/nant-vs.xsd";> http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/4e45554f/examples/net/1.0/Remoting/nant.config -- diff --git a/examples/net/1.0/Remoting/nant.config b/examples/net/1.0/Remoting/nant.config index 26e110e..c3605c4 100755 --- a/examples/net/1.0/Remoting/nant.config +++ b/examples/net/1.0/Remoting/nant.config @@ -1,4 +1,19 @@ + http://tempuri.org/nant-vs.xsd";> http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/4e45554f/examples/net/1.0/Repository/SharedModule/cs/nant.build -- diff --git a/examples/net/1.0/Repository/SharedModule/cs/nant.build b/examples/net/1.0/Repository/SharedModule/cs/nant.build index c94b749..22acd9e 100755 --- a/examples/net/1.0/Repository/SharedModule/cs/nant.build +++ b/examples/net/1.0/Repository/SharedModule/cs/nant.build @@ -1,4 +1,19 @@ + http://tempuri.org/nant-vs.xsd";> http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/4e45554f/examples/net/1.0/Repository/SharedModule/cs/nant.config -- diff --git a/examples/net/1.0/Repository/SharedModule/cs/nant.config b/examples/net/1.0/Repository/SharedModule/cs/nant.config index f5c8731..60749c2 100755 --- a/examples/net/1.0/Repository/SharedModule/cs/nant.config +++ b/examples/net/1.0/Repository/SharedModule/cs/nant.config @@ -1,4 +1,19 @@ + http://tempuri.org/nant-vs.xsd";> http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/4e45554f/examples/net/1.0/Repository/SharedModule/nant.build -- diff --git a/examples/net/1.0/Repository/SharedModule/nant.build b/examples/net/1.0/Repository/SharedModule/nant.build index 5dd
[12/50] [abbrv] logging-log4net git commit: Fixed Stack reference on NETCF
Fixed Stack reference on NETCF Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/07adff7d Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/07adff7d Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/07adff7d Branch: refs/heads/origin/trunk Commit: 07adff7dc0309a8131053e72e3cef99d21fc5e15 Parents: 04ce826 Author: Nicko Cadell Authored: Mon Feb 14 10:41:15 2005 + Committer: Nicko Cadell Committed: Mon Feb 14 10:41:15 2005 + -- src/NDC.cs | 4 1 file changed, 4 insertions(+) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/07adff7d/src/NDC.cs -- diff --git a/src/NDC.cs b/src/NDC.cs index 5b8e75e..f5786e1 100755 --- a/src/NDC.cs +++ b/src/NDC.cs @@ -19,6 +19,10 @@ using System; using System.Collections; +#if NETCF +using Stack = log4net.Util.ThreadContextStack.Stack; +#endif + namespace log4net { ///
[24/50] [abbrv] logging-log4net git commit: Rebuilt html docs
http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/b7f4bf1a/doc/release/features.html -- diff --git a/doc/release/features.html b/doc/release/features.html index f6f807d..554fe7b 100755 --- a/doc/release/features.html +++ b/doc/release/features.html @@ -65,39 +65,39 @@ limitations under the License. - log4net Features + log4net Features Contents - Overview + Overview - Features + Features - Support for multiple frameworks + Support for multiple frameworks - Output to multiple logging targets + Output to multiple logging targets - Hierarchical logging architecture + Hierarchical logging architecture - XML Configuration + XML Configuration - Dynamic Configuration + Dynamic Configuration - Logging Context + Logging Context - Proven architecture + Proven architecture - Overview + Overview log4net is a tool to help the programmer output log statements to a @@ -119,7 +119,7 @@ limitations under the License. log4net is designed with two distinct goals in mind: speed and flexibility -Features +Features Support for multiple frameworks @@ -133,7 +133,7 @@ limitations under the License. High performance with flexibility
[21/50] [abbrv] logging-log4net git commit: Added Downloads doc page. Tweaked release notes doc.
Added Downloads doc page. Tweaked release notes doc. Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/6f317353 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/6f317353 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/6f317353 Branch: refs/heads/origin/trunk Commit: 6f317353aaafd38f08e1bafaec0f5a057a7682d6 Parents: e549ce8 Author: Nicko Cadell Authored: Sun Feb 20 19:29:15 2005 + Committer: Nicko Cadell Committed: Sun Feb 20 19:29:15 2005 + -- doc/contributing.html | 5 +- doc/downloads.html| 210 + doc/history.html | 9 +- doc/index.html| 17 ++- doc/license.html | 11 +- doc/release/building.html | 23 ++-- doc/release/config-examples.html | 99 +++--- doc/release/example-apps.html | 75 +-- doc/release/faq.html | 175 doc/release/features.html | 43 +++--- doc/release/framework-support.html| 43 +++--- doc/release/manual/configuration.html | 67 + doc/release/manual/contexts.html | 31 +++-- doc/release/manual/internals.html | 15 +-- doc/release/manual/introduction.html | 39 +++--- doc/release/manual/plugins.html | 15 +-- doc/release/manual/repositories.html | 15 +-- doc/release/release-notes.html| 64 - doc/roadmap.html | 7 +- doc/support.html | 15 +-- xdocs/src/downloads.xml | 80 +++ xdocs/src/history.xml | 2 +- xdocs/src/release/release-notes.xml | 9 +- xdocs/src/stylesheets/project.xml | 5 +- 24 files changed, 676 insertions(+), 398 deletions(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/6f317353/doc/contributing.html -- diff --git a/doc/contributing.html b/doc/contributing.html index e25715f..80bb477 100755 --- a/doc/contributing.html +++ b/doc/contributing.html @@ -229,6 +229,8 @@ cvs -d :pserver:anon...@cvs.apache.org:/home/cvspublic checkout logging-log4net< History +Downloads + log4net 1.2 Documentation Features @@ -259,9 +261,6 @@ cvs -d :pserver:anon...@cvs.apache.org:/home/cvspublic checkout logging-log4net< Internals - log4net Releases -http://sourceforge.net/project/showfiles.php?group_id=31983&release_id=171808";>download at sourceforge.net - http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/6f317353/doc/downloads.html -- diff --git a/doc/downloads.html b/doc/downloads.html new file mode 100755 index 000..44e6a87 --- /dev/null +++ b/doc/downloads.html @@ -0,0 +1,210 @@ +http://www.w3.org/TR/html4/loose.dtd";> + + + + + + + + + + + + + + + + + + + + + + + + + + + + +log4net - log4net Downloads + + + + + + + + http://logging.apache.org/";> + http://logging.apache.org/images/ls-logo.jpg"; border="0"/> + + + + + + + + + + + + + + + log4net Downloads + +Project Status + + + log4net is an effort undergoing incubation at the Apache Software + Foundation (ASF), sponsored by the Apache Logging Services project. + Incubation is required of all newly accepted projects until a further + review indicates that the infrastructure, communications, and decision + making process have stabilized in a manner consistent with other + successful ASF projects. While incubation status is not necessarily a + reflection of the completeness or stability of the code, it
[07/50] [abbrv] logging-log4net git commit: Updated doc comments
Updated doc comments Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/3b72f8cc Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/3b72f8cc Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/3b72f8cc Branch: refs/heads/origin/trunk Commit: 3b72f8cce5a2d1139e1ee623a3069f0b66be1ed9 Parents: f85c295 Author: Nicko Cadell Authored: Mon Feb 14 03:45:23 2005 + Committer: Nicko Cadell Committed: Mon Feb 14 03:45:23 2005 + -- src/LogicalThreadContext.cs | 4 src/MDC.cs | 36 +++- src/ThreadContext.cs| 4 3 files changed, 39 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/3b72f8cc/src/LogicalThreadContext.cs -- diff --git a/src/LogicalThreadContext.cs b/src/LogicalThreadContext.cs index 7fc8e45..283b5f9 100755 --- a/src/LogicalThreadContext.cs +++ b/src/LogicalThreadContext.cs @@ -77,7 +77,9 @@ namespace log4net /// Private Constructor. /// /// + /// /// Uses a private access modifier to prevent instantiation of this class. + /// /// private LogicalThreadContext() { @@ -94,8 +96,10 @@ namespace log4net /// The thread properties map /// /// + /// /// The LogicalThreadContext properties override any /// or properties with the same name. + /// /// public static LogicalThreadContextProperties Properties { http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/3b72f8cc/src/MDC.cs -- diff --git a/src/MDC.cs b/src/MDC.cs index 3089976..cab2f1e 100755 --- a/src/MDC.cs +++ b/src/MDC.cs @@ -25,10 +25,12 @@ namespace log4net /// Implementation of Mapped Diagnostic Contexts. /// /// + /// /// /// The MDC is deprecated and has been replaced by the . /// The current MDC implementation forwards to the ThreadContext.Properties. /// + /// /// /// The MDC class is similar to the class except that it is /// based on a map instead of a stack. It provides mapped @@ -66,14 +68,20 @@ namespace log4net /// /// Gets the context value identified by the parameter. /// + /// The key to lookup in the MDC. + /// The string value held for the key, or a null reference if no corresponding value is found. /// + /// + /// + /// The MDC is deprecated and has been replaced by the . + /// The current MDC implementation forwards to the ThreadContext.Properties. + /// + /// /// /// If the parameter does not look up to a /// previously defined context then null will be returned. /// /// - /// The key to lookup in the MDC. - /// The string value held for the key, or a null reference if no corresponding value is found. /*[Obsolete("MDC has been replaced by ThreadContext.Properties")]*/ public static string Get(string key) { @@ -88,7 +96,15 @@ namespace log4net /// /// Add an entry to the MDC /// + /// The key to store the value under. + /// The value to store. /// + /// + /// + /// The MDC is deprecated and has been replaced by the . + /// The current MDC implementation forwards to the ThreadContext.Properties. + /// + /// /// /// Puts a context value (the parameter) as identified /// with the parameter into the current thread's @@ -100,8 +116,6 @@ namespace log4net /// is specified as null then the key value mapping will be removed. /// /// - /// The key to store the value under. - /// The value to store. /*[Obsolete("MDC has been replaced by ThreadContext.Properties")]*/ public static void Set(string key, string value) { @@ -111,12 +125,18 @@ namespace log4net /// /// Removes the key value mapping
[43/50] [abbrv] logging-log4net git commit: Added project STATUS file with project info and committers
Added project STATUS file with project info and committers Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/d6f92d33 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/d6f92d33 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/d6f92d33 Branch: refs/heads/origin/trunk Commit: d6f92d337e29adc1c0695204f9caa22282311cba Parents: 87af054 Author: Nicko Cadell Authored: Sat Mar 12 12:35:56 2005 + Committer: Nicko Cadell Committed: Sat Mar 12 12:35:56 2005 + -- STATUS.txt | 35 +++ 1 file changed, 35 insertions(+) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/d6f92d33/STATUS.txt -- diff --git a/STATUS.txt b/STATUS.txt new file mode 100755 index 000..22f2938 --- /dev/null +++ b/STATUS.txt @@ -0,0 +1,35 @@ +APACHE LOG4NET PROJECT STATUS += + +Project Status +== + +log4net is an effort undergoing incubation at the Apache Software Foundation +(ASF), sponsored by the Apache Logging Services project. Incubation is required +of all newly accepted projects until a further review indicates that the +infrastructure, communications, and decision making process have stabilized in +a manner consistent with other successful ASF projects. While incubation status +is not necessarily a reflection of the completeness or stability of the code, +it does indicate that the project has yet to be fully endorsed by the ASF. + + +Project Details +=== + +Web site: http://logging.apache.org/log4net +Incubator Status: http://incubator.apache.org/projects/log4net.html +Issue Tracking: http://issues.apache.org/jira/browse/LOG4NET +Source Code: http://cvs.apache.org/viewcvs/logging-log4net/ +Mailing Lists: + User: log4net-u...@logging.apache.org + Dev: log4net-...@logging.apache.org + + +Active Committers += + +* Nicko Cadell (nicko) +* Niall Daley (niall) +* Gert Driesen (drieseng) + +
[27/50] [abbrv] logging-log4net git commit: Added ASF copyright to all nant build files
http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/4e45554f/examples/netcf/1.0/Tutorials/ConsoleApp/nant.build -- diff --git a/examples/netcf/1.0/Tutorials/ConsoleApp/nant.build b/examples/netcf/1.0/Tutorials/ConsoleApp/nant.build index c8b56d0..24c859f 100755 --- a/examples/netcf/1.0/Tutorials/ConsoleApp/nant.build +++ b/examples/netcf/1.0/Tutorials/ConsoleApp/nant.build @@ -1,4 +1,19 @@ + http://tempuri.org/nant-vs.xsd";> http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/4e45554f/examples/netcf/1.0/Tutorials/ConsoleApp/nant.config -- diff --git a/examples/netcf/1.0/Tutorials/ConsoleApp/nant.config b/examples/netcf/1.0/Tutorials/ConsoleApp/nant.config index 26e110e..c3605c4 100755 --- a/examples/netcf/1.0/Tutorials/ConsoleApp/nant.config +++ b/examples/netcf/1.0/Tutorials/ConsoleApp/nant.config @@ -1,4 +1,19 @@ + http://tempuri.org/nant-vs.xsd";> http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/4e45554f/examples/netcf/1.0/Tutorials/ConsoleApp/vb/nant.build -- diff --git a/examples/netcf/1.0/Tutorials/ConsoleApp/vb/nant.build b/examples/netcf/1.0/Tutorials/ConsoleApp/vb/nant.build index 9020cad..72f114d 100755 --- a/examples/netcf/1.0/Tutorials/ConsoleApp/vb/nant.build +++ b/examples/netcf/1.0/Tutorials/ConsoleApp/vb/nant.build @@ -1,4 +1,19 @@ + http://tempuri.org/nant-vs.xsd";> http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/4e45554f/examples/netcf/1.0/Tutorials/ConsoleApp/vb/nant.config -- diff --git a/examples/netcf/1.0/Tutorials/ConsoleApp/vb/nant.config b/examples/netcf/1.0/Tutorials/ConsoleApp/vb/nant.config index f5c8731..60749c2 100755 --- a/examples/netcf/1.0/Tutorials/ConsoleApp/vb/nant.config +++ b/examples/netcf/1.0/Tutorials/ConsoleApp/vb/nant.config @@ -1,4 +1,19 @@ + http://tempuri.org/nant-vs.xsd";> http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/4e45554f/examples/netcf/1.0/Tutorials/nant.build -- diff --git a/examples/netcf/1.0/Tutorials/nant.build b/examples/netcf/1.0/Tutorials/nant.build index c1f5fb1..3ecf315 100755 --- a/examples/netcf/1.0/Tutorials/nant.build +++ b/examples/netcf/1.0/Tutorials/nant.build @@ -1,4 +1,19 @@ + http://tempuri.org/nant-vs.xsd";> http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/4e45554f/examples/netcf/1.0/Tutorials/nant.config -- diff --git a/examples/netcf/1.0/Tutorials/nant.config b/examples/netcf/1.0/Tutorials/nant.config index 26e110e..c3605c4 100755 --- a/examples/netcf/1.0/Tutorials/nant.config +++ b/examples/netcf/1.0/Tutorials/nant.config @@ -1,4 +1,19 @@ + http://tempuri.org/nant-vs.xsd";> http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/4e45554f/examples/netcf/1.0/nant.build -- diff --git a/examples/netcf/1.0/nant.build b/examples/netcf/1.0/nant.build index b706645..92bd078 100755 --- a/examples/netcf/1.0/nant.build +++ b/examples/netcf/1.0/nant.build @@ -1,4 +1,19 @@ + http://tempuri.org/nant-vs.xsd";> http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/4e45554f/examples/netcf/1.0/nant.config -- diff --git a/examples/netcf/1.0/nant.config b/examples/netcf/1.0/nant.config index e9cf1ef..f00707f 100755 --- a/examples/netcf/1.0/nant.config +++ b/examples/netcf/1.0/nant.config @@ -1,4 +1,19 @@ + http://tempuri.org/nant-vs.xsd";> http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/4e45554f/examples/netcf/nant.build -- diff --git a/examples/netcf/nant.build b/examples/netcf/nant.build index 306511d..3e5dbe7 100755 --- a/examples/netcf/nant.build +++ b/examples/netcf/nant.build @@ -1,4 +1,19 @@ + http://tempuri.org/nant-vs.xsd";> http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/4e45554f/examples/netcf/nant.config -- diff --git a/examples/netcf/nant.config b/examples/netcf/nant.config index 6f46ae1..3d1416e 100755 --- a/examples/netcf/nant.config +++ b/examples/netcf/nant.config @@ -1,4 +1,19 @@ + http://tempuri.org/nant-vs.xsd";> http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/4e45554f/examples/sscli/1.0/Repository/SharedModule/cs/nant.build -- diff --git a/examples/sscli/1.0/Repository/SharedModule/cs/nant.build b/examples/sscli/1.0/Repositor
[44/50] [abbrv] logging-log4net git commit: Mono now supports the EventLog API. The implementation is a NOP
Mono now supports the EventLog API. The implementation is a NOP Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/f8ef80f6 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/f8ef80f6 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/f8ef80f6 Branch: refs/heads/origin/trunk Commit: f8ef80f600cdd0ce43ac17a8f7942119a3db7e2f Parents: d6f92d3 Author: Nicko Cadell Authored: Mon Mar 14 02:08:47 2005 + Committer: Nicko Cadell Committed: Mon Mar 14 02:08:47 2005 + -- src/Appender/EventLogAppender.cs | 6 -- 1 file changed, 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/f8ef80f6/src/Appender/EventLogAppender.cs -- diff --git a/src/Appender/EventLogAppender.cs b/src/Appender/EventLogAppender.cs index 9274bf2..fabd64b 100755 --- a/src/Appender/EventLogAppender.cs +++ b/src/Appender/EventLogAppender.cs @@ -20,12 +20,8 @@ // .NET Compact Framework 1.0 has no support for EventLog #if !NETCF -// .Mono 1.0 has no support for EventLog -#if !MONO // SSCLI 1.0 has no support for EventLog #if !SSCLI -// We don't want framework or platform specific code in the CLI version of log4net -#if !CLI_1_0 using System; using System.Diagnostics; @@ -492,7 +488,5 @@ namespace log4net.Appender } } -#endif // !CLI_1_0 #endif // !SSCLI -#endif // !MONO #endif // !NETCF \ No newline at end of file
[42/50] [abbrv] logging-log4net git commit: Added link to mod_mbox mailing list archive
Added link to mod_mbox mailing list archive Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/87af054d Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/87af054d Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/87af054d Branch: refs/heads/origin/trunk Commit: 87af054def3faee7f9ced8f34240e28c840b5eef Parents: fd4acd0 Author: Nicko Cadell Authored: Fri Mar 11 23:03:21 2005 + Committer: Nicko Cadell Committed: Fri Mar 11 23:03:21 2005 + -- doc/contributing.html| 23 + doc/release/config-examples.html | 94 +-- doc/support.html | 11 ++-- xdocs/src/contributing.xml | 1 + xdocs/src/support.xml| 1 + 5 files changed, 67 insertions(+), 63 deletions(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/87af054d/doc/contributing.html -- diff --git a/doc/contributing.html b/doc/contributing.html index 7c9bd1f..180410f 100755 --- a/doc/contributing.html +++ b/doc/contributing.html @@ -65,26 +65,27 @@ limitations under the License. - Contributing to log4net Development + Contributing to log4net Development -Developer Mailing List +Developer Mailing List All discussion relating to log4net development takes place on this list. All CVS checkin notifications are also copied to this list. -Mailing List Archives +Mailing List Archives You can browse the mailing list archives at the following locations: + http://mail-archives.eu.apache.org/mod_mbox/logging-log4net-dev/";>mod_mbox http://nagoya.apache.org/eyebrowse/SummarizeList?listId=214";>eyebrowse http://marc.theaimsgroup.com/?l=log4net-dev&r=1&w=2";>MARC http://sourceforge.net/mailarchive/forum.php?forum=log4net-devel";>Old Mailing List at sourceforge -Subscribe +Subscribe Subscribe to either the list or to the digest list: @@ -105,7 +106,7 @@ limitations under the License. -Unsubscribe +Unsubscribe To unsubscribe send an email to the relevant email address: @@ -126,7 +127,7 @@ limitations under the License. -Posting +Posting Most of the guidelines for the log4net-user list also apply to the dev list. @@ -147,16 +148,16 @@ limitations under the License. -CVS Access +CVS Access -Browsing CVS +Browsing CVS http://cvs.apache.org/viewcvs/logging-log4net/";>Browse log4net CVS repository using ViewCVS. -Anonymous CVS Access +
[04/50] [abbrv] logging-log4net git commit: Updated to use nant 0.85 rc1
Updated to use nant 0.85 rc1 Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/4fa09a40 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/4fa09a40 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/4fa09a40 Branch: refs/heads/origin/trunk Commit: 4fa09a409522d5eeea3d32acbc6de105de4f09c9 Parents: dd6dbc9 Author: Nicko Cadell Authored: Mon Feb 14 03:17:43 2005 + Committer: Nicko Cadell Committed: Mon Feb 14 03:17:43 2005 + -- build.cmd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/4fa09a40/build.cmd -- diff --git a/build.cmd b/build.cmd index ca70a4d..f1483d7 100755 --- a/build.cmd +++ b/build.cmd @@ -18,7 +18,7 @@ SET NANTEXE_PATH=nant.exe IF NOT ERRORLEVEL 1 goto FoundNAnt REM Try hard coded path for NAnt -SET NANTEXE_PATH=C:\net\nant-0.85-20040520\bin\nant.exe +SET NANTEXE_PATH=C:\net\nant-0.85-rc1\bin\nant.exe %NANTEXE_PATH% -help >NUL: 2>NUL: IF NOT ERRORLEVEL 1 goto FoundNAnt
[26/50] [abbrv] logging-log4net git commit: Updated version numbers to 1.2.9.0
Updated version numbers to 1.2.9.0 Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/5394a5d9 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/5394a5d9 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/5394a5d9 Branch: refs/heads/origin/trunk Commit: 5394a5d9fc15bac60afac988b8ce677be833e288 Parents: b7f4bf1 Author: Nicko Cadell Authored: Sun Feb 27 22:57:11 2005 + Committer: Nicko Cadell Committed: Sun Feb 27 22:57:11 2005 + -- src/AssemblyVersionInfo.cpp | 2 +- src/AssemblyVersionInfo.cs | 2 +- src/AssemblyVersionInfo.js | 2 +- src/AssemblyVersionInfo.vb | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/5394a5d9/src/AssemblyVersionInfo.cpp -- diff --git a/src/AssemblyVersionInfo.cpp b/src/AssemblyVersionInfo.cpp index 86e4cbd..d125e6e 100755 --- a/src/AssemblyVersionInfo.cpp +++ b/src/AssemblyVersionInfo.cpp @@ -29,7 +29,7 @@ using namespace System::Runtime::CompilerServices; // You can specify all the value or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersionAttribute("1.2.0.30714")]; +[assembly: AssemblyVersionAttribute("1.2.9.0")]; [assembly: AssemblyInformationalVersionAttribute("1.2")]; // http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/5394a5d9/src/AssemblyVersionInfo.cs -- diff --git a/src/AssemblyVersionInfo.cs b/src/AssemblyVersionInfo.cs index d12b278..c2b1c4c 100755 --- a/src/AssemblyVersionInfo.cs +++ b/src/AssemblyVersionInfo.cs @@ -27,7 +27,7 @@ // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: System.Reflection.AssemblyVersion("1.2.1.40216")] +[assembly: System.Reflection.AssemblyVersion("1.2.9.0")] [assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.2")] // http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/5394a5d9/src/AssemblyVersionInfo.js -- diff --git a/src/AssemblyVersionInfo.js b/src/AssemblyVersionInfo.js index eb53072..4c7f1f4 100755 --- a/src/AssemblyVersionInfo.js +++ b/src/AssemblyVersionInfo.js @@ -30,7 +30,7 @@ // an import functions as a workaround for this issue. import System.Reflection; -[assembly: AssemblyVersion("1.2.0.30714")] +[assembly: AssemblyVersion("1.2.9.0")] [assembly: AssemblyInformationalVersionAttribute("1.2")] // http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/5394a5d9/src/AssemblyVersionInfo.vb -- diff --git a/src/AssemblyVersionInfo.vb b/src/AssemblyVersionInfo.vb index 3ba96c2..2a5f866 100755 --- a/src/AssemblyVersionInfo.vb +++ b/src/AssemblyVersionInfo.vb @@ -25,7 +25,7 @@ ' You can specify all the values or you can default the Revision and Build Numbers ' by using the '*' as shown below: - + '
[35/50] [abbrv] logging-log4net git commit: Added README.txt file with incubator status
Added README.txt file with incubator status Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/94d54e5e Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/94d54e5e Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/94d54e5e Branch: refs/heads/origin/trunk Commit: 94d54e5e66681062481d6e57411fbbeba46f82b6 Parents: de16fe9 Author: Nicko Cadell Authored: Wed Mar 9 00:52:13 2005 + Committer: Nicko Cadell Committed: Wed Mar 9 00:52:13 2005 + -- README.txt | 20 1 file changed, 20 insertions(+) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/94d54e5e/README.txt -- diff --git a/README.txt b/README.txt new file mode 100755 index 000..508ae05 --- /dev/null +++ b/README.txt @@ -0,0 +1,20 @@ +Project Status +== + +log4net is an effort undergoing incubation at the Apache Software Foundation +(ASF), sponsored by the Apache Logging Services project. Incubation is required +of all newly accepted projects until a further review indicates that the +infrastructure, communications, and decision making process have stabilized in +a manner consistent with other successful ASF projects. While incubation status +is not necessarily a reflection of the completeness or stability of the code, +it does indicate that the project has yet to be fully endorsed by the ASF. + + +Documentation += + +For local documentation, which is correct for this release see: +doc/index.html + +For the latest documentation see the log4net web site at: +http://logging.apache.org/log4net
[30/50] [abbrv] logging-log4net git commit: Added section on issue tracking
Added section on issue tracking Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/15376d4f Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/15376d4f Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/15376d4f Branch: refs/heads/origin/trunk Commit: 15376d4ffe1de37072039752b7cbff2d7f4d9c4b Parents: 4e45554 Author: Nicko Cadell Authored: Tue Mar 1 20:21:06 2005 + Committer: Nicko Cadell Committed: Tue Mar 1 20:21:06 2005 + -- doc/contributing.html | 57 - xdocs/src/contributing.xml | 57 - 2 files changed, 112 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/15376d4f/doc/contributing.html -- diff --git a/doc/contributing.html b/doc/contributing.html index 7d5eda5..7c9bd1f 100755 --- a/doc/contributing.html +++ b/doc/contributing.html @@ -188,8 +188,63 @@ cvs -d :pserver:anon...@cvs.apache.org:/home/cvspublic checkout logging-log4net< Issue Tracking - Issue tracking is not yet available for the log4net project. + Many bugs reported end up not being a bug in the log4net code, + but are due to incorrect configuration, problems caused by installed applications, + the operating system, etc. + + Before reporting a bug please make every effort to investigate and resolve the problem yourself. + Just reporting a bug will not fix it. A good bug report includes a detailed + description of the problem and a succinct test case which can reproduce the problem. + + + Before reporting an issue please investigate the following information sources for + a potential resolution. + + + Documentation + Internal log4net debug + FAQs + Mailing Lists + + + Before reporting a bug, you are advised to discuss it on the relevant mailing list first. + + + http://issues.apache.org/jira/browse/LOG4NET";>Search the bug database to see if the bug + you are seeing has already been reported. If it has been reported then you can vote for the issue. + +Reporting an Issue + + + If after you have exhausted all other resources to resolve a problem you may want to file a bug report. + Please make sure the problem is a bug in Logging and not a bug in your application. + + + Please make sure you provide as much information as possible. Its very hard to fix a bug if the person + looking into the problem can't reproduce it. Here is a listing of information which should be included: + + + Version - log4net version, or if from a nightly build, version and date of build. + Application Type - Assembly type, i.e. exe or dll, and how your code is launched, e.g. console application, windows application, ASP.NET project, COM+ hosted object, etc... + Framework - The .NET framework running the application, name (e.g. MS .NET, Mono, SSCLI) and version. + Platform - Computer operating system, version, and hardware platform in use. +
[25/50] [abbrv] logging-log4net git commit: Rebuilt html docs
Rebuilt html docs Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/b7f4bf1a Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/b7f4bf1a Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/b7f4bf1a Branch: refs/heads/origin/trunk Commit: b7f4bf1a36bcf2ea9eb390d2aa5350552f6bd687 Parents: bdc4a9e Author: Nicko Cadell Authored: Wed Feb 23 22:31:40 2005 + Committer: Nicko Cadell Committed: Wed Feb 23 22:31:40 2005 + -- doc/contributing.html | 20 ++-- doc/downloads.html| 10 +- doc/history.html | 2 +- doc/index.html| 12 +- doc/license.html | 6 +- doc/release/building.html | 18 +-- doc/release/config-examples.html | 94 doc/release/example-apps.html | 70 ++-- doc/release/faq.html | 170 ++--- doc/release/features.html | 38 +++ doc/release/framework-support.html| 38 +++ doc/release/manual/configuration.html | 62 +-- doc/release/manual/contexts.html | 26 ++--- doc/release/manual/internals.html | 10 +- doc/release/manual/introduction.html | 34 +++--- doc/release/manual/plugins.html | 10 +- doc/release/manual/repositories.html | 10 +- doc/release/release-notes.html| 60 +- doc/roadmap.html | 2 +- doc/support.html | 10 +- 20 files changed, 351 insertions(+), 351 deletions(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/b7f4bf1a/doc/contributing.html -- diff --git a/doc/contributing.html b/doc/contributing.html index 80bb477..7d5eda5 100755 --- a/doc/contributing.html +++ b/doc/contributing.html @@ -65,15 +65,15 @@ limitations under the License. - Contributing to log4net Development + Contributing to log4net Development -Developer Mailing List +Developer Mailing List All discussion relating to log4net development takes place on this list. All CVS checkin notifications are also copied to this list. -Mailing List Archives +Mailing List Archives You can browse the mailing list archives at the following locations: @@ -84,7 +84,7 @@ limitations under the License. http://sourceforge.net/mailarchive/forum.php?forum=log4net-devel";>Old Mailing List at sourceforge -Subscribe +Subscribe Subscribe to either the list or to the digest list: @@ -105,7 +105,7 @@ limitations under the License. -Unsubscribe +Unsubscribe To unsubscribe send an email to the relevant email address: @@ -126,7 +126,7 @@ limitations under the License. -Posting +Posting Most of the guidelines for the log4net-user list also apply to the dev list. @@ -147,16 +147,16 @@ limitations under the License. -CVS Access +CVS Access -Browsing CVS +Browsing CVS
[11/50] [abbrv] logging-log4net git commit: Added DefaultCredential authentication support to loading config from web request
Added DefaultCredential authentication support to loading config from web request Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/04ce8260 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/04ce8260 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/04ce8260 Branch: refs/heads/origin/trunk Commit: 04ce8260eed94f7cdf0d7f530c8b0fa766abf2fa Parents: 7e44ed9 Author: Nicko Cadell Authored: Mon Feb 14 10:40:46 2005 + Committer: Nicko Cadell Committed: Mon Feb 14 10:40:46 2005 + -- src/Config/XmlConfigurator.cs | 13 + 1 file changed, 13 insertions(+) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/04ce8260/src/Config/XmlConfigurator.cs -- diff --git a/src/Config/XmlConfigurator.cs b/src/Config/XmlConfigurator.cs index c5b2ac0..433cac6 100755 --- a/src/Config/XmlConfigurator.cs +++ b/src/Config/XmlConfigurator.cs @@ -527,6 +527,7 @@ namespace log4net.Config } else { + // NETCF dose not support WebClient WebRequest configRequest = null; try @@ -540,6 +541,17 @@ namespace log4net.Config if (configRequest != null) { +#if !NETCF + // authentication may be required, set client to use default credentials + try + { + configRequest.Credentials = CredentialCache.DefaultCredentials; + } + catch + { + // ignore security exception + } +#endif try { WebResponse response = configRequest.GetResponse(); @@ -547,6 +559,7 @@ namespace log4net.Config { try { + // Open stream on config URI using(Stream configStream = response.GetResponseStream()) { Configure(repository, configStream);
[01/50] [abbrv] logging-log4net git commit: Renamed CORE build to CLI_1_0
Repository: logging-log4net Updated Branches: refs/heads/origin/trunk [created] fecc9fb7d Renamed CORE build to CLI_1_0 Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/cbbfe6c5 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/cbbfe6c5 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/cbbfe6c5 Branch: refs/heads/origin/trunk Commit: cbbfe6c571d777d7c7dd9cd6b2e91e84fff569a2 Parents: cb1c09f Author: Nicko Cadell Authored: Mon Feb 14 03:14:52 2005 + Committer: Nicko Cadell Committed: Mon Feb 14 03:14:52 2005 + -- src/Appender/ColoredConsoleAppender.cs| 7 +++ src/Appender/EventLogAppender.cs | 7 +++ src/Appender/NetSendAppender.cs | 7 +++ src/Appender/OutputDebugStringAppender.cs | 7 +++ src/AssemblyInfo.cs | 6 +- src/Util/NativeError.cs | 7 +++ src/Util/WindowsSecurityContext.cs| 6 +++--- 7 files changed, 23 insertions(+), 24 deletions(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/cbbfe6c5/src/Appender/ColoredConsoleAppender.cs -- diff --git a/src/Appender/ColoredConsoleAppender.cs b/src/Appender/ColoredConsoleAppender.cs index 5d747f6..658b62d 100755 --- a/src/Appender/ColoredConsoleAppender.cs +++ b/src/Appender/ColoredConsoleAppender.cs @@ -24,9 +24,8 @@ #if !MONO // SSCLI 1.0 has no support for Win32 Console API's #if !SSCLI -// We don't want framework or platform specific code in the Core version of -// log4net -#if !CORE +// We don't want framework or platform specific code in the CLI version of log4net +#if !CLI_1_0 using System; using System.Globalization; @@ -652,7 +651,7 @@ namespace log4net.Appender } } -#endif // !CORE +#endif // !CLI_1_0 #endif // !SSCLI #endif // !MONO #endif // !NETCF http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/cbbfe6c5/src/Appender/EventLogAppender.cs -- diff --git a/src/Appender/EventLogAppender.cs b/src/Appender/EventLogAppender.cs index c4884a4..9274bf2 100755 --- a/src/Appender/EventLogAppender.cs +++ b/src/Appender/EventLogAppender.cs @@ -24,9 +24,8 @@ #if !MONO // SSCLI 1.0 has no support for EventLog #if !SSCLI -// We don't want framework or platform specific code in the Core version of -// log4net -#if !CORE +// We don't want framework or platform specific code in the CLI version of log4net +#if !CLI_1_0 using System; using System.Diagnostics; @@ -493,7 +492,7 @@ namespace log4net.Appender } } -#endif // !CORE +#endif // !CLI_1_0 #endif // !SSCLI #endif // !MONO #endif // !NETCF \ No newline at end of file http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/cbbfe6c5/src/Appender/NetSendAppender.cs -- diff --git a/src/Appender/NetSendAppender.cs b/src/Appender/NetSendAppender.cs index b2298b1..3e505e5 100755 --- a/src/Appender/NetSendAppender.cs +++ b/src/Appender/NetSendAppender.cs @@ -24,9 +24,8 @@ #if !MONO // SSCLI 1.0 has no support for Win32 NetMessageBufferSend API #if !SSCLI -// We don't want framework or platform specific code in the Core version of -// log4net -#if !CORE +// We don't want framework or platform specific code in the CLI version of log4net +#if !CLI_1_0 using System; using System.Globalization; @@ -415,7 +414,7 @@ namespace log4net.Appender } } -#endif // !CORE +#endif // !CLI_1_0 #endif // !SSCLI #endif // !MONO #endif // !NETCF \ No newline at end of file http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/cbbfe6c5/src/Appender/OutputDebugStringAppender.cs -- diff --git a/src/Appender/OutputDebugStringAppender.cs b/src/Appender/OutputDebugStringAppender.cs index e6ecd30..bb550ef 100755 --- a/src/Appender/OutputDebugStringAppender.cs +++ b/src/Appender/OutputDebugStringAppender.cs @@ -20,9 +20,8 @@ #if !MONO // SSCLI 1.0 has no support for Win32 OutputDebugString API #if !SSCLI -// We don't want framework or platform specific code in the Core version of -// log4net -#if !CORE +// We don't want framework or platform specific code in the CLI version of log4net +#if !CLI_1_0 using System.Runtime.InteropServices; @@ -118,6 +117,6 @@ namespace log4net.Appender } } -#endif // !CORE +#endif // !CLI_1_0 #endif // !SSCLI #endif // !MONO http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/cbbfe6c5/src/AssemblyInfo.cs -- diff --git a/src/AssemblyInfo.cs b/src/AssemblyInfo.cs index 9d3f534..755
[48/50] [abbrv] logging-log4net git commit: Added info on LockingModel to ChangeLog and release-notes
Added info on LockingModel to ChangeLog and release-notes Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/1103c643 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/1103c643 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/1103c643 Branch: refs/heads/origin/trunk Commit: 1103c64357bb0b2ba2efe460a0f06de8387b7b32 Parents: 6653dd0 Author: Nicko Cadell Authored: Mon Mar 21 00:37:27 2005 + Committer: Nicko Cadell Committed: Mon Mar 21 00:37:27 2005 + -- ChangeLog.txt | 302 +++ doc/release/release-notes.html | 74 +--- xdocs/src/release/release-notes.xml | 24 ++- 3 files changed, 289 insertions(+), 111 deletions(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/1103c643/ChangeLog.txt -- diff --git a/ChangeLog.txt b/ChangeLog.txt index 477cb3a..07c7eab 100755 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -4,11 +4,77 @@ Version 1.2.9 BETA = +2005-03-15 21:12 niall + + * Appender/FileAppender.cs: + + Implemented nestable locking and delegated impersonation to the locking model. + +2005-03-14 02:44 nicko + + * Layout/: ILayout.cs, LayoutSkeleton.cs: + + Removed obsolete Format method from ILayout and LayoutSkeleton. It was + already a breaking change, best to remove the old method before the next + release, i.e. so we don't have to break it again. + +2005-03-14 02:08 nicko + + * Appender/EventLogAppender.cs: + + Mono now supports the EventLog API. The implementation is a NOP + +2005-03-11 22:57 nicko + + * Appender/FileAppender.cs: + + Updated doc comments + +2005-03-11 22:30 nicko + + * Appender/FileAppender.cs: + + Updated comments, fixed couple of typos + +2005-03-11 18:38 niall + + * Appender/FileAppender.cs: + + Added documentation for the locking models in FileAppender. + + * Appender/FileAppender.cs: + + Implemented locking models so that FileAppender and it's subclasses can + change their file access semantics. + +2005-03-07 01:34 nicko + + * Appender/FileAppender.cs: + + Added virtual SetQWForFiles(Stream) method to make it simpler for subclasses + to wrap the output file stream, for example to add support for encryption + +2005-03-04 21:11 nicko + + * DateFormatter/AbsoluteTimeDateFormatter.cs: + + Added Thread.MemoryBarrier call on NET_1_1 after writing to local variable, + this is only required on SMP machines with a weak memory model + (e.g. Itanium) + +2005-02-27 22:57 nicko + + * AssemblyVersionInfo.cpp, AssemblyVersionInfo.cs, + AssemblyVersionInfo.js, AssemblyVersionInfo.vb: + + Updated version numbers to 1.2.9.0 + 2005-02-15 18:56 nicko * Util/TypeConverters/IPAddressConverter.cs: - Only attempt to IPAddress.Parse if the string contains valid IP address characters + Only attempt to IPAddress.Parse if the string contains valid IP address + characters 2005-02-14 19:45 nicko @@ -24,7 +90,8 @@ Version 1.2.9 BETA * Config/XmlConfigurator.cs: - Added DefaultCredential authentication support to loading config from web request + Added DefaultCredential authentication support to loading config from web + request 2005-02-14 03:45 nicko @@ -34,14 +101,16 @@ Version 1.2.9 BETA * NDC.cs, Util/ThreadContextStack.cs: - Added support for all old methods in NDC - Depth, SetMaxDepth, CloneStack, Inherit + Added support for all old methods in NDC - Depth, SetMaxDepth, CloneStack, + Inherit 2005-02-14 03:24 nicko * LogicalThreadContext.cs, ThreadContext.cs, log4net.csproj, Util/ThreadContextList.cs, Util/ThreadContextLists.cs: - Removed Context Lists. The Context Stacks give essentially the same functionality + Removed Context Lists. The Context Stacks give essentially the same + functionality * AssemblyInfo.cs: @@ -49,7 +118,8 @@ Version 1.2.9 BETA * Config/XmlConfiguratorAttribute.cs: - Added support for locating the config file when the app is deployed from a web server, i.e. via no-touch deployment + Added support for locating the config file when the app is deployed from a + web server, i.e. via no-touch deployment * Config/XmlConfigurator.cs: @@ -85,14 +155,16 @@ Version 1.2.9 BETA Layout/Pattern/DatePatternConverter.cs, Util/PatternStringCo
[37/50] [abbrv] logging-log4net git commit: Added documentation for the locking models in FileAppender.
Added documentation for the locking models in FileAppender. Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/7f9efaa9 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/7f9efaa9 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/7f9efaa9 Branch: refs/heads/origin/trunk Commit: 7f9efaa9d1d73f3841592dee580123e4454718b9 Parents: edce5eb Author: Niall Daley Authored: Fri Mar 11 18:38:07 2005 + Committer: Niall Daley Committed: Fri Mar 11 18:38:07 2005 + -- src/Appender/FileAppender.cs | 34 +- 1 file changed, 33 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/7f9efaa9/src/Appender/FileAppender.cs -- diff --git a/src/Appender/FileAppender.cs b/src/Appender/FileAppender.cs index a94f665..a689be9 100755 --- a/src/Appender/FileAppender.cs +++ b/src/Appender/FileAppender.cs @@ -218,12 +218,18 @@ namespace log4net.Appender } /// - /// Open te file once for writing and hold it open until CloseFile is called. Maintains an exclusive lock on the file during this time. + /// Open the file once for writing and hold it open until CloseFile is called. Maintains an exclusive lock on the file during this time. /// public class ExclusiveLock : LockingModelBase { private Stream m_stream=null; + /// + /// Open the file specified and prepare for logging. + /// + /// The filename to use + /// Whether to append to the file, or overwrite + /// The encoding to use public override void OpenFile(string filename, bool append,Encoding encoding) { try @@ -247,16 +253,26 @@ namespace log4net.Appender } } + /// + /// Close the file. + /// public override void CloseFile() { m_stream.Close(); } + /// + /// Does nothing. The lock is already taken + /// + /// A stream that is ready to be written to. public override Stream AquireLock() { return m_stream; } + /// + /// Does nothing. The lock will be released when the file is closed. + /// public override void ReleaseLock() { //NOP @@ -274,17 +290,30 @@ namespace log4net.Appender private bool m_append; private Stream m_stream=null; + /// + /// Prepares to open the file when the first message is logged. + /// + /// The filename to use + /// Whether to append to the file, or overwrite + /// The encoding to use public override void OpenFile(string filename, bool append, Encoding encoding) { m_filename=filename; m_append=append; } + /// + /// Ensures the file is closed. + /// public override void CloseFile() { //NOP } + /// + /// Aquire the lock on the file in preparation for writing to it. Return a stream pointing to the file. + /// + /// A stream that is ready to be written to. public override Stream AquireLock() { if (m_stream==null) @@ -313,6 +342,9 @@ namespace log4net.Appender return m_stream; } + /// + /// Release the lock on the file. No further writes will be made to the stream until AquireLock is called again. + /// public override void ReleaseLock()
[34/50] [abbrv] logging-log4net git commit: Added OpenPGP release verification keys file
Added OpenPGP release verification keys file Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/de16fe91 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/de16fe91 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/de16fe91 Branch: refs/heads/origin/trunk Commit: de16fe9123b4585c2e247660b92a30880c5fb582 Parents: f9f6f42 Author: Nicko Cadell Authored: Mon Mar 7 18:27:44 2005 + Committer: Nicko Cadell Committed: Mon Mar 7 18:27:44 2005 + -- KEYS.txt | 50 ++ 1 file changed, 50 insertions(+) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/de16fe91/KEYS.txt -- diff --git a/KEYS.txt b/KEYS.txt new file mode 100755 index 000..b8cbc69 --- /dev/null +++ b/KEYS.txt @@ -0,0 +1,50 @@ +This file contains the PGP keys of various Apache developers. +These keys are primarily used for code signing. + +These keys can be verified using any OpenPGP compatible system, +for example, http://www.gnupg.org. + +Developers: To add key information use: + gpg --listlkeys UID + gpg --export -a UID + +User: To import this key file into your keyring use: + gpg --import KEYS.txt + + + + +pub 1024D/914A4D28 2005-03-07 +uid Nicko Cadell +sub 2048g/6923CBDA 2005-03-07 + +-BEGIN PGP PUBLIC KEY BLOCK- +Version: GnuPG v1.4.0 (MingW32) + +mQGiBEIsjHURBAC9JqRzMEh6pEZuuyqHGwfBkQZnvOuj0Yp88lDsJtNl62cRaQJk +7eP+kVxCbl12qr1EDz1z/ZON7/+vF9YoiRh7Cydck6wLe/kQcJtUevm00q35pUQJ +7c2TSY+QbTKWriUKueOyRR6p2lpscUHhbCPB9NOLfQmJvZsa47gDZSybCwCgh0+u +8KkkcovlV55K/WrSGg16o8kEAKFGmpDKDnv0Sg1rRnvBGJv5WZFR/57p1SArMXHi +oBkj71wlWz9Ia4tonfc12TXUwoVs3WbIFOoLz1Iw31cGnwUsNkvEclaZigG9iYhx +S6+2i7jrQIivO5iXJtTuePb4zFgLwZcaoFySvLIKRm8+X6KXvoslKAYM/F/Yd0jm +OebkA/4uwIt7cGOWGIaiH2n/80QgXN6FyOhNsgCihZZcPwXo7c/gtszpJ74CwtXD +SVghIwTQ0zK4wtWcHSjf7FelPmeDSga7dLgnxQmmhjIK+sBnPIcBrNiUc3jFnRzK +o3ZIBPsGoo0jUsemgkiQA4ptVybeak/SmrTsRgxWkT4Paw41zrQfTmlja28gQ2Fk +ZWxsIDxuaWNrb0BhcGFjaGUub3JnPoheBBMRAgAeBQJCLIx1AhsDBgsJCAcDAgMV +AgMDFgIBAh4BAheAAAoJEA3R7CqRSk0ooTIAnRZ+vUY+ZN8CgL0fvDbZv76kgQG+ +AJ9vp4BwPLU5jM+YOY3hJPp1bNw1RLkCDQRCLIx/EAgArSrXU4kkXNLCTBIAMaIx +diiVvQ2JqzrFkXf4yAlE+xiy19bqGewmslt+dLmLUEtt1UFMU5b2kAiZLNMvdBWQ +OStwK0SABRESjb5sAjAcFXUeqBzjVBDvsSGxJZZa5He1pQMjFzm4hG6GNl3+vOx6 +r6fly9W5Ddc8wqfDb8JU0c6gG8s10D4gthWWyJ2K1u3BcvpggoGyqyxisvF/QM68 +KnXf8/wp+5sOfl6glyluR/OyGMCU3c38eHYU2XMzlcT3fh1VcU5MvPastp+76vUy +ImrAfb7RhS3sDrmRd9ZS8FE5JRB3967hETRSLjHW+/TZeyvxaGMJkBPdv2BdwnD8 +6wADBQf+NaK8teolegPc1LdmX3bAhR2bhfqIpuUwPBRHqIU2OtWsMJ9sEsVZY4LC +OLOHMHI1spWHEo39mx3fz5MR4x2z3+HzZRq8tzMFn5PC3c7yb06CMfqRf8pvYWVP +0cMvEctViAc+xwSpZgXQGLkwZ37KtqWncfBVocxQMj4CVUx3PeyozWGEG+bpGSso +Mrvnch41AGL3NA9bA2cgTVuOYSXZLK9TOgh4gXCM4jWTI4BqTY5w0riDwqwt5+qH +e8/HBowGa4jNopl9kWaQuEoXH7GGOTJsc9eKMK+k++iqSWiqVXFTLd7/UhUPv6Oj +7Pqm7+oSumphn00rC2DVeAAWDt7umohJBBgRAgAJBQJCLIx/AhsMAAoJEA3R7CqR +Sk0ouF4An1sFuJ+/kJlvKRs+nNjFqrQdsuDCAJ9WDNgUqnAkdLVTRJq8UeK0AjOq +oQ== +=4aNz +-END PGP PUBLIC KEY BLOCK-
[49/50] [abbrv] logging-log4net git commit: Ignored tests binaries in release package
Ignored tests binaries in release package Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/3e00d061 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/3e00d061 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/3e00d061 Branch: refs/heads/origin/trunk Commit: 3e00d0611c9b33f9a3ea3fa3f7b50b55e461a75c Parents: 1103c64 Author: Nicko Cadell Authored: Mon Mar 21 00:37:39 2005 + Committer: Nicko Cadell Committed: Mon Mar 21 00:37:39 2005 + -- log4net.build | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/3e00d061/log4net.build -- diff --git a/log4net.build b/log4net.build index eae3d37..b9560ff 100755 --- a/log4net.build +++ b/log4net.build @@ -678,6 +678,7 @@ limitations under the License. +
[17/50] [abbrv] logging-log4net git commit: Added sample extension that returns logger wrappers that are MarshalByRef
Added sample extension that returns logger wrappers that are MarshalByRef Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/60d93a1f Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/60d93a1f Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/60d93a1f Branch: refs/heads/origin/trunk Commit: 60d93a1f35963abe2002c4b74fad0454c471fc51 Parents: 9930fff Author: Nicko Cadell Authored: Wed Feb 16 22:21:45 2005 + Committer: Nicko Cadell Committed: Wed Feb 16 22:21:45 2005 + -- extensions/net/1.0/cs-extensions.sln | 11 +++ 1 file changed, 11 insertions(+) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/60d93a1f/extensions/net/1.0/cs-extensions.sln -- diff --git a/extensions/net/1.0/cs-extensions.sln b/extensions/net/1.0/cs-extensions.sln index 971d175..c8ac3d9 100755 --- a/extensions/net/1.0/cs-extensions.sln +++ b/extensions/net/1.0/cs-extensions.sln @@ -3,7 +3,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "log4net.Ext.Trace", "log4ne EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "log4net.Ext.EventID", "log4net.Ext.EventID\cs\src\log4net.Ext.EventID.csproj", "{CB985027-C009-4C0F-88C1-8CF11912EE4C}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "log4net.Ext.MarshalByRef", "log4net.Ext.MarshalByRef\cs\src\log4net.Ext.MarshalByRef.csproj", "{CB985027-C009-4C0F-88C1-8CF11912AE4C}" +EndProject Global + GlobalSection(DPCodeReviewSolutionGUID) = preSolution + DPCodeReviewSolutionGUID = {----} + EndGlobalSection GlobalSection(SolutionConfiguration) = preSolution ConfigName.0 = Debug ConfigName.1 = Release @@ -24,6 +29,12 @@ Global {CB985027-C009-4C0F-88C1-8CF11912EE4C}.Release.Build.0 = Release|.NET {CB985027-C009-4C0F-88C1-8CF11912EE4C}.ReleaseStrong.ActiveCfg = ReleaseStrong|.NET {CB985027-C009-4C0F-88C1-8CF11912EE4C}.ReleaseStrong.Build.0 = ReleaseStrong|.NET + {CB985027-C009-4C0F-88C1-8CF11912AE4C}.Debug.ActiveCfg = Debug|.NET + {CB985027-C009-4C0F-88C1-8CF11912AE4C}.Debug.Build.0 = Debug|.NET + {CB985027-C009-4C0F-88C1-8CF11912AE4C}.Release.ActiveCfg = Release|.NET + {CB985027-C009-4C0F-88C1-8CF11912AE4C}.Release.Build.0 = Release|.NET + {CB985027-C009-4C0F-88C1-8CF11912AE4C}.ReleaseStrong.ActiveCfg = Release|.NET + {CB985027-C009-4C0F-88C1-8CF11912AE4C}.ReleaseStrong.Build.0 = Release|.NET EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution EndGlobalSection
[02/50] [abbrv] logging-log4net git commit: Added info on the CLI build
Added info on the CLI build Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/6c76edaa Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/6c76edaa Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/6c76edaa Branch: refs/heads/origin/trunk Commit: 6c76edaadfc48195b42980ba979eae2cf7fd6785 Parents: cbbfe6c Author: Nicko Cadell Authored: Mon Feb 14 03:15:37 2005 + Committer: Nicko Cadell Committed: Mon Feb 14 03:15:37 2005 + -- xdocs/src/release/features.xml| 7 +-- xdocs/src/release/framework-support.xml | 64 ++ xdocs/src/release/manual/introduction.xml | 7 +-- xdocs/src/release/release-notes.xml | 8 ++-- 4 files changed, 68 insertions(+), 18 deletions(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/6c76edaa/xdocs/src/release/features.xml -- diff --git a/xdocs/src/release/features.xml b/xdocs/src/release/features.xml index 5c09c18..b525cfd 100755 --- a/xdocs/src/release/features.xml +++ b/xdocs/src/release/features.xml @@ -69,11 +69,12 @@ limitations under the License. log4net supports the following frameworks: - Microsoft .Net Framework 1.0 (1.0.3705) - Microsoft .Net Framework 1.1 (1.1.4322) - Microsoft .Net Compact Framework 1.0 (1.0.5000) + Microsoft .NET Framework 1.0 (1.0.3705) + Microsoft .NET Framework 1.1 (1.1.4322) + Microsoft .NET Compact Framework 1.0 (1.0.5000) Mono 1.0 Microsoft Shared Source CLI 1.0 + CLI 1.0 Compatible http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/6c76edaa/xdocs/src/release/framework-support.xml -- diff --git a/xdocs/src/release/framework-support.xml b/xdocs/src/release/framework-support.xml index 1e7421e..4ac92a2 100755 --- a/xdocs/src/release/framework-support.xml +++ b/xdocs/src/release/framework-support.xml @@ -30,7 +30,7 @@ limitations under the License. - log4net now builds on 5 frameworks: + log4net now builds on 6 frameworks: @@ -44,25 +44,29 @@ limitations under the License. Website - Microsoft .Net Framework 1.0 (1.0.3705) + Microsoft .NET Framework 1.0 (1.0.3705) http://msdn.microsoft.com/net";>http://msdn.microsoft.com/net - Microsoft .Net Framework 1.1 (1.1.4322) + Microsoft .NET Framework 1.1 (1.1.4322) http://msdn.microsoft.com/net";>http://msdn.microsoft.com/net - Microsoft .Net Compact Framework 1.0 (1.0.5000) + Microsoft .NET Compact Framework 1.0 (1.0.5000) http://msdn.microsoft.com/vstudio/device/compactfx.asp";>http://msdn.microsoft.com/vstudio/device/compactfx.asp Mono 1.0 - http://www.go-mono.org";>http://www.go-mono.org + http://www.mono-project.com";>http://www.mono-project.com
[19/50] [abbrv] logging-log4net git commit: Added Downloads doc page. Tweaked release notes doc.
http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/6f317353/doc/release/manual/introduction.html -- diff --git a/doc/release/manual/introduction.html b/doc/release/manual/introduction.html index 9a8515b..cf0bd62 100755 --- a/doc/release/manual/introduction.html +++ b/doc/release/manual/introduction.html @@ -65,36 +65,36 @@ limitations under the License. - log4net Manual - Introduction + log4net Manual - Introduction Contents - Overview + Overview - Frameworks + Frameworks - Loggers and Appenders + Loggers and Appenders -Logger hierarchy +Logger hierarchy -Appenders +Appenders -Filters +Filters -Layouts +Layouts -Object Renderers +Object Renderers - Overview + Overview This document is based on Short introduction to log4j by Ceki G�lc�. @@ -143,7 +143,7 @@ limitations under the License. understand and to use. -Frameworks +Frameworks Log4net is available for several frameworks. For each supported framework an @@ -163,7 +163,7 @@ limitations under the License. document for m
[22/50] [abbrv] logging-log4net git commit: Fixed typo in releae-notes
Fixed typo in releae-notes Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/d4432055 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/d4432055 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/d4432055 Branch: refs/heads/origin/trunk Commit: d443205576c1e29fb20f43716c24bee57a47997e Parents: 6f31735 Author: Nicko Cadell Authored: Wed Feb 23 22:30:45 2005 + Committer: Nicko Cadell Committed: Wed Feb 23 22:30:45 2005 + -- xdocs/src/release/release-notes.xml | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/d4432055/xdocs/src/release/release-notes.xml -- diff --git a/xdocs/src/release/release-notes.xml b/xdocs/src/release/release-notes.xml index 27a8da7..5dae803 100755 --- a/xdocs/src/release/release-notes.xml +++ b/xdocs/src/release/release-notes.xml @@ -43,16 +43,16 @@ limitations under the License. Renamed config classes and attributes In the log4net.Config namespace the DOMConfigurator, - DOMConfiguratorAttribute, RepositoryAttribute, - and AliasRepositoryAttribute have been marked as obsolete. These types are + DOMConfiguratorAttribute, DomainAttribute, + and AliasDomainAttribute have been marked as obsolete. These types are still available and functional in this release. The XmlConfigurator and XmlConfiguratorAttribute types replace DOMConfigurator and - DOMConfiguratorAttribute. The DomainAttribute - and AliasDomainAttribute types replace - RepositoryAttribute and AliasRepositoryAttribute. + DOMConfiguratorAttribute. The RepositoryAttribute + and AliasRepositoryAttribute types replace + DomainAttribute and AliasDomainAttribute.
[04/50] [abbrv] logging-log4net git commit: add dependencies for .NET Core version
add dependencies for .NET Core version Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/2ada9ba1 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/2ada9ba1 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/2ada9ba1 Branch: refs/heads/master Commit: 2ada9ba1b15dadfd562fd2bb9523395ee1965e7d Parents: d65b1a7 Author: Stefan Bodewig Authored: Wed Nov 30 06:39:26 2016 + Committer: Stefan Bodewig Committed: Wed Nov 30 06:39:26 2016 + -- log4net.nuspec | 30 ++ 1 file changed, 30 insertions(+) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/2ada9ba1/log4net.nuspec -- diff --git a/log4net.nuspec b/log4net.nuspec index e16fb82..640441e 100644 --- a/log4net.nuspec +++ b/log4net.nuspec @@ -38,6 +38,36 @@ log4net is designed with two distinct goals in mind: speed and flexibilityCopyright 2004-2016 The Apache Software Foundation false logging log tracing logfiles + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
[44/50] [abbrv] logging-log4net git commit: LOG4NET-563 try to copy skin from log4j
http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/df542d50/src/site/resources/js/bootstrap.min.js -- diff --git a/src/site/resources/js/bootstrap.min.js b/src/site/resources/js/bootstrap.min.js new file mode 100644 index 000..66e887b --- /dev/null +++ b/src/site/resources/js/bootstrap.min.js @@ -0,0 +1,6 @@ +/*! +* Bootstrap.js by @fat & @mdo +* Copyright 2012 Twitter, Inc. +* http://www.apache.org/licenses/LICENSE-2.0.txt +*/ +!function(e){e(function(){"use strict";e.support.transition=function(){var e=function(){var e=document.createElement("bootstrap"),t={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd otransitionend",transition:"transitionend"},n;for(n in t)if(e.style[n]!==undefined)return t[n]}();return e&&{end:e}}()})}(window.jQuery),!function(e){"use strict";var t='[data-dismiss="alert"]',n=function(n){e(n).on("click",t,this.close)};n.prototype.close=function(t){function s(){i.trigger("closed").remove()}var n=e(this),r=n.attr("data-target"),i;r||(r=n.attr("href"),r=r&&r.replace(/.*(?=#[^\s]*$)/,"")),i=e(r),t&&t.preventDefault(),i.length||(i=n.hasClass("alert")?n:n.parent()),i.trigger(t=e.Event("close"));if(t.isDefaultPrevented())return;i.removeClass("in"),e.support.transition&&i.hasClass("fade")?i.on(e.support.transition.end,s):s()},e.fn.alert=function(t){return this.each(function(){var r=e(this),i=r.data("alert");i||r.data("alert",i=new n(this)),type of t=="string"&&i[t].call(r)})},e.fn.alert.Constructor=n,e(function(){e("body").on("click.alert.data-api",t,n.prototype.close)})}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.$element=e(t),this.options=e.extend({},e.fn.button.defaults,n)};t.prototype.setState=function(e){var t="disabled",n=this.$element,r=n.data(),i=n.is("input")?"val":"html";e+="Text",r.resetText||n.data("resetText",n[i]()),n[i](r[e]||this.options[e]),setTimeout(function(){e=="loadingText"?n.addClass(t).attr(t,t):n.removeClass(t).removeAttr(t)},0)},t.prototype.toggle=function(){var e=this.$element.parent('[data-toggle="buttons-radio"]');e&&e.find(".active").removeClass("active"),this.$element.toggleClass("active")},e.fn.button=function(n){return this.each(function(){var r=e(this),i=r.data("button"),s=typeof n=="object"&&n;i||r.data("button",i=new t(this,s)),n=="toggle"?i.toggle():n&&i.setState(n)})},e.fn.button.defaults={loadingText:"loading..."},e.fn.button.Constructor=t,e(function(){e("body") .on("click.button.data-api","[data-toggle^=button]",function(t){var n=e(t.target);n.hasClass("btn")||(n=n.closest(".btn")),n.button("toggle")})})}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.$element=e(t),this.options=n,this.options.slide&&this.slide(this.options.slide),this.options.pause=="hover"&&this.$element.on("mouseenter",e.proxy(this.pause,this)).on("mouseleave",e.proxy(this.cycle,this))};t.prototype={cycle:function(t){return t||(this.paused=!1),this.options.interval&&!this.paused&&(this.interval=setInterval(e.proxy(this.next,this),this.options.interval)),this},to:function(t){var n=this.$element.find(".item.active"),r=n.parent().children(),i=r.index(n),s=this;if(t>r.length-1||t<0)return;return this.sliding?this.$element.one("slid",function(){s.to(t)}):i==t?this.pause().cycle():this.slide(t>i?"next":"prev",e(r[t]))},pause:function(t){return t||(this.paused=!0),this.$element.find(".next, .prev").length&&e.support.transition.end&&(this.$element.trigger(e.su pport.transition.end),this.cycle()),clearInterval(this.interval),this.interval=null,this},next:function(){if(this.sliding)return;return this.slide("next")},prev:function(){if(this.sliding)return;return this.slide("prev")},slide:function(t,n){var r=this.$element.find(".item.active"),i=n||r[t](),s=this.interval,o=t=="next"?"left":"right",u=t=="next"?"first":"last",a=this,f=e.Event("slide",{relatedTarget:i[0]});this.sliding=!0,s&&this.pause(),i=i.length?i:this.$element.find(".item")[u]();if(i.hasClass("active"))return;if(e.support.transition&&this.$element.hasClass("slide")){this.$element.trigger(f);if(f.isDefaultPrevented())return;i.addClass(t),i[0].offsetWidth,r.addClass(o),i.addClass(o),this.$element.one(e.support.transition.end,function(){i.removeClass([t,o].join(" ")).addClass("active"),r.removeClass(["active",o].join(" ")),a.sliding=!1,setTimeout(function(){a.$element.trigger("slid")},0)})}else{this.$element.trigger(f);if(f.isDefaultPrevented())return;r.removeClass("active"),i.ad dClass("active"),this.sliding=!1,this.$element.trigger("slid")}return s&&this.cycle(),this}},e.fn.carousel=function(n){return this.each(function(){var r=e(this),i=r.data("carousel"),s=e.extend({},e.fn.carousel.defaults,typeof n=="object"&&n),o=typeof n=="string"?n:s.slide;i||r.data("carousel",i=new t(this,s)),typeof n=="number"?i.to(n):o?i[o]():s.interval&&i.cycle()})},e.fn.carousel.defaults={interval:5e3,pause:"hover"},e.fn.carousel.Constru
[43/50] [abbrv] logging-log4net git commit: LOG4NET-563 try to copy skin from log4j
http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/df542d50/src/site/resources/js/jquery.js -- diff --git a/src/site/resources/js/jquery.js b/src/site/resources/js/jquery.js new file mode 100644 index 000..8ccd0ea --- /dev/null +++ b/src/site/resources/js/jquery.js @@ -0,0 +1,9266 @@ +/*! + * jQuery JavaScript Library v1.7.1 + * http://jquery.com/ + * + * Copyright 2011, John Resig + * Dual licensed under the MIT or GPL Version 2 licenses. + * http://jquery.org/license + * + * Includes Sizzle.js + * http://sizzlejs.com/ + * Copyright 2011, The Dojo Foundation + * Released under the MIT, BSD, and GPL Licenses. + * + * Date: Mon Nov 21 21:11:03 2011 -0500 + */ +(function( window, undefined ) { + +// Use the correct document accordingly with window argument (sandbox) +var document = window.document, + navigator = window.navigator, + location = window.location; +var jQuery = (function() { + +// Define a local copy of jQuery +var jQuery = function( selector, context ) { + // The jQuery object is actually just the init constructor 'enhanced' + return new jQuery.fn.init( selector, context, rootjQuery ); + }, + + // Map over jQuery in case of overwrite + _jQuery = window.jQuery, + + // Map over the $ in case of overwrite + _$ = window.$, + + // A central reference to the root jQuery(document) + rootjQuery, + + // A simple way to check for HTML strings or ID strings + // Prioritize #id over to avoid XSS via location.hash (#9521) + quickExpr = /^(?:[^#<]*(<[\w\W]+>)[^>]*$|#([\w\-]*)$)/, + + // Check if a string has a non-whitespace character in it + rnotwhite = /\S/, + + // Used for trimming whitespace + trimLeft = /^\s+/, + trimRight = /\s+$/, + + // Match a standalone tag + rsingleTag = /^<(\w+)\s*\/?>(?:<\/\1>)?$/, + + // JSON RegExp + rvalidchars = /^[\],:{}\s]*$/, + rvalidescape = /\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g, + rvalidtokens = /"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g, + rvalidbraces = /(?:^|:|,)(?:\s*\[)+/g, + + // Useragent RegExp + rwebkit = /(webkit)[ \/]([\w.]+)/, + ropera = /(opera)(?:.*version)?[ \/]([\w.]+)/, + rmsie = /(msie) ([\w.]+)/, + rmozilla = /(mozilla)(?:.*? rv:([\w.]+))?/, + + // Matches dashed string for camelizing + rdashAlpha = /-([a-z]|[0-9])/ig, + rmsPrefix = /^-ms-/, + + // Used by jQuery.camelCase as callback to replace() + fcamelCase = function( all, letter ) { + return ( letter + "" ).toUpperCase(); + }, + + // Keep a UserAgent string for use with jQuery.browser + userAgent = navigator.userAgent, + + // For matching the engine and version of the browser + browserMatch, + + // The deferred used on DOM ready + readyList, + + // The ready event handler + DOMContentLoaded, + + // Save a reference to some core methods + toString = Object.prototype.toString, + hasOwn = Object.prototype.hasOwnProperty, + push = Array.prototype.push, + slice = Array.prototype.slice, + trim = String.prototype.trim, + indexOf = Array.prototype.indexOf, + + // [[Class]] -> type pairs + class2type = {}; + +jQuery.fn = jQuery.prototype = { + constructor: jQuery, + init: function( selector, context, rootjQuery ) { + var match, elem, ret, doc; + + // Handle $(""), $(null), or $(undefined) + if ( !selector ) { + return this; + } + + // Handle $(DOMElement) + if ( selector.nodeType ) { + this.context = this[0] = selector; + this.length = 1; + return this; + } + + // The body element only exists once, optimize finding it + if ( selector === "body" && !context && document.body ) { + this.context = document; + this[0] = document.body; + this.selector = selector; + this.length = 1; + return this; + } + + // Handle HTML strings + if ( typeof selector === "string" ) { + // Are we dealing with HTML string or an ID? + if ( selector.charAt(0) === "<" && selector.charAt( selector.length - 1 ) === ">" && selector.length >= 3 ) { + // Assume that strings that start and end with <> are HTML and skip the regex check + match = [ null, selector, null ]; + + } else { + match = quickExpr.exec( selector ); + } + +
[29/50] [abbrv] logging-log4net git commit: EventRaisingAppender requires .NET 3.5
EventRaisingAppender requires .NET 3.5 Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/9397bcae Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/9397bcae Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/9397bcae Branch: refs/heads/master Commit: 9397bcaecc6981b96d19c29f7a872ffd60a880df Parents: 7919e65 Author: Stefan Bodewig Authored: Tue Mar 7 19:03:00 2017 + Committer: Stefan Bodewig Committed: Tue Mar 7 19:03:00 2017 + -- tests/src/Appender/EventRaisingAppender.cs | 25 - tests/src/Appender/RecursiveLoggingTest.cs | 2 ++ 2 files changed, 26 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/9397bcae/tests/src/Appender/EventRaisingAppender.cs -- diff --git a/tests/src/Appender/EventRaisingAppender.cs b/tests/src/Appender/EventRaisingAppender.cs index 517b6bd..6716889 100644 --- a/tests/src/Appender/EventRaisingAppender.cs +++ b/tests/src/Appender/EventRaisingAppender.cs @@ -1,4 +1,26 @@ -using System; +/* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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. + * +*/ + +#if !NET_2_0 && !MONO_2_0 +using System; using System.Collections.Generic; using System.Linq; using System.Text; @@ -56,3 +78,4 @@ namespace log4net.Tests.Appender } } } +#endif \ No newline at end of file http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/9397bcae/tests/src/Appender/RecursiveLoggingTest.cs -- diff --git a/tests/src/Appender/RecursiveLoggingTest.cs b/tests/src/Appender/RecursiveLoggingTest.cs index 4b9aeb2..191ddf6 100644 --- a/tests/src/Appender/RecursiveLoggingTest.cs +++ b/tests/src/Appender/RecursiveLoggingTest.cs @@ -19,6 +19,7 @@ * */ +#if !NET_2_0 && !MONO_2_0 using System; using System.Data; using System.Xml; @@ -82,3 +83,4 @@ namespace log4net.Tests.Appender } } +#endif \ No newline at end of file
[20/50] [abbrv] logging-log4net git commit: add release notes for 2.0.7
add release notes for 2.0.7 Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/9ca5b01c Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/9ca5b01c Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/9ca5b01c Branch: refs/heads/master Commit: 9ca5b01c792982213c2c535ca21aa167ae69f11c Parents: e3b685f Author: Stefan Bodewig Authored: Mon Jan 2 05:15:45 2017 + Committer: Stefan Bodewig Committed: Mon Jan 2 05:15:45 2017 + -- src/site/xdoc/release/release-notes.xml | 16 1 file changed, 16 insertions(+) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/9ca5b01c/src/site/xdoc/release/release-notes.xml -- diff --git a/src/site/xdoc/release/release-notes.xml b/src/site/xdoc/release/release-notes.xml index d7d889c..cc8aced 100644 --- a/src/site/xdoc/release/release-notes.xml +++ b/src/site/xdoc/release/release-notes.xml @@ -28,6 +28,22 @@ limitations under the License. + + +Apache log4net 2.0.7 fixes a glitch in nuget packaging and +is otherwise identical to 2.0.6 (apart from the copyright +year and assembly version). If you are not using the nuget +package there is no reason to upgrade. + + + + + [LOG4NET-540] - nuget dependencies for .NET Standard leak into net46 + + + + +
[28/50] [abbrv] logging-log4net git commit: commit to close the correct PR - closes #42
commit to close the correct PR - closes #42 Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/7919e655 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/7919e655 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/7919e655 Branch: refs/heads/master Commit: 7919e655c41915ac3aa957d698e6d96c9c746a11 Parents: 96f5646 Author: Stefan Bodewig Authored: Fri Mar 3 22:00:31 2017 + Committer: Stefan Bodewig Committed: Fri Mar 3 22:00:31 2017 + -- src/site/xdoc/release/manual/contexts.xml | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/7919e655/src/site/xdoc/release/manual/contexts.xml -- diff --git a/src/site/xdoc/release/manual/contexts.xml b/src/site/xdoc/release/manual/contexts.xml index c1ae4b3..a026bf6 100644 --- a/src/site/xdoc/release/manual/contexts.xml +++ b/src/site/xdoc/release/manual/contexts.xml @@ -78,7 +78,11 @@ limitations under the License. The logical thread context is visible to a logical thread. Logical threads can jump from one managed thread to another. For more details -see the .NET API System.Runtime.Remoting.Messaging.CallContext. +see the .NET API System.Runtime.Remoting.Messaging.CallContext. +For .NET Standard this uses AsyncLocal rather +than CallContext.
[08/50] [abbrv] logging-log4net git commit: more clearly spell out the limitations of .NET Core version
more clearly spell out the limitations of .NET Core version Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/6b083cd7 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/6b083cd7 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/6b083cd7 Branch: refs/heads/master Commit: 6b083cd7f7bc531a196a868991a6df236617ec55 Parents: 6503f06 Author: Stefan Bodewig Authored: Mon Dec 5 16:51:20 2016 + Committer: Stefan Bodewig Committed: Mon Dec 5 16:51:20 2016 + -- src/site/xdoc/release/framework-support.xml | 24 1 file changed, 20 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/6b083cd7/src/site/xdoc/release/framework-support.xml -- diff --git a/src/site/xdoc/release/framework-support.xml b/src/site/xdoc/release/framework-support.xml index ef421ae..95e2eea 100644 --- a/src/site/xdoc/release/framework-support.xml +++ b/src/site/xdoc/release/framework-support.xml @@ -579,11 +579,27 @@ limitations under the License. Targets netstandard-1.3 and thus doesn't support - .NET Remoting, anything related to ASP.NET or - ADO.NET, logical thread contexts, stack trace - patterns or using the log4net section in a - configuration file. + a few things that work on Mono or the classical + .NET platform. +Things that are not supported in log4net +for .NET Core: + + the ADO.NET Appender + anything related to ASP.NET (trace appender + and several pattern converters) + .NET Remoting + The NetSendAppender + The SMTP Appender + DOMConfigurator + stack trace patterns + access to appSettings (neither + the log4net section itself nor using the + AppSettingsPatternConverter + Access to "special paths" using the + EnvironmentFolderPathPatternConverter + Impersonation of Windows accounts +
[39/50] [abbrv] logging-log4net git commit: fix SDK links
fix SDK links Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/0d3c40a5 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/0d3c40a5 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/0d3c40a5 Branch: refs/heads/master Commit: 0d3c40a5cb079fedb36ce010a06ff9d1e0e1cd6d Parents: eab1f76 Author: Stefan Bodewig Authored: Wed Apr 19 09:30:27 2017 + Committer: Stefan Bodewig Committed: Wed Apr 19 09:30:27 2017 + -- src/site/xdoc/release/config-examples.xml | 38 +- src/site/xdoc/release/faq.xml | 2 +- src/site/xdoc/release/manual/introduction.xml | 84 +- src/site/xdoc/release/release-notes.xml | 6 +- 4 files changed, 58 insertions(+), 72 deletions(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/0d3c40a5/src/site/xdoc/release/config-examples.xml -- diff --git a/src/site/xdoc/release/config-examples.xml b/src/site/xdoc/release/config-examples.xml index 77ee117..9d62879 100644 --- a/src/site/xdoc/release/config-examples.xml +++ b/src/site/xdoc/release/config-examples.xml @@ -43,7 +43,7 @@ limitations under the License. -For full details see the SDK Reference entry: log4net.Appender.AdoNetAppender. +For full details see the SDK Reference entry: log4net.Appender.AdoNetAppender. The configuration of the AdoNetAppender depends on the @@ -447,7 +447,7 @@ CREATE TABLE Log ( -For full details see the SDK Reference entry: log4net.Appender.AspNetTraceAppender. +For full details see the SDK Reference entry: log4net.Appender.AspNetTraceAppender. The following example shows how to configure the AspNetTraceAppender @@ -467,7 +467,7 @@ CREATE TABLE Log ( -For full details see the SDK Reference entry: log4net.Appender.BufferingForwardingAppender. +For full details see the SDK Reference entry: log4net.Appender.BufferingForwardingAppender. The following example shows how to configure the BufferingForwardingAppender @@ -500,7 +500,7 @@ CREATE TABLE Log ( -For full details see the SDK Reference entry: log4net.Appender.ColoredConsoleAppender. +For full details see the SDK Reference entry: log4net.Appender.ColoredConsoleAppender. The following example shows how to configure the ColoredConsoleAppender @@ -542,7 +542,7 @@ CREATE TABLE Log ( -For full details see the SDK Reference entry: log4net.Appender.ConsoleAppender. +For full details see the SDK Reference entry: log4net.Appender.ConsoleAppender. The following example shows how to configure the ConsoleAppender @@ -571,7 +571,7 @@ CREATE TABLE Log ( -For full details see the SDK Reference entry: log4net.Appender.EventLogAppender. +For full details see the SDK Reference entry: log4net.Appender.EventLogAppender. The following example shows how to configure the EventLogAppender to log @@ -606,7 +606,7 @@ CREATE TABLE Log ( -For full details see the SDK Reference entry: log4net.Appender.FileAppender. +For full details see the SDK Reference entry: log4net.Appender.FileAppender. The following example shows how to configure the FileAppender @@ -674,7 +674,7 @@ CREATE TABLE Log ( -For full details see the SDK Reference entry: log4net.Appender.ForwardingAppender. +For full details see the SDK Reference entry: log4net.Appender.ForwardingAppender. The following example shows how to configure the ForwardingAppender. @@ -695,7 +695,7 @@ CREATE TABLE Log ( -For full details see the SDK Reference entry: log4net.Appender.ManagedColoredConsoleAppender. +For full details see the SDK R
[46/50] [abbrv] logging-log4net git commit: LOG4NET-563 try to copy skin from log4j
http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/df542d50/src/site/resources/css/bootstrap.min.css -- diff --git a/src/site/resources/css/bootstrap.min.css b/src/site/resources/css/bootstrap.min.css new file mode 100644 index 000..43e16d7 --- /dev/null +++ b/src/site/resources/css/bootstrap.min.css @@ -0,0 +1,9 @@ +/*! + * Bootstrap v2.2.1 + * + * Copyright 2012 Twitter, Inc + * Licensed under the Apache License v2.0 + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Designed and built with all the love in the world @twitter by @mdo and @fat. + */article,aside,details,figcaption,figure,footer,header,hgroup,nav,section{display:block}audio,canvas,video{display:inline-block;*display:inline;*zoom:1}audio:not([controls]){display:none}html{font-size:100%;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}a:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}a:hover,a:active{outline:0}sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline}sup{top:-0.5em}sub{bottom:-0.25em}img{width:auto\9;height:auto;max-width:100%;vertical-align:middle;border:0;-ms-interpolation-mode:bicubic}#map_canvas img,.google-maps img{max-width:none}button,input,select,textarea{margin:0;font-size:100%;vertical-align:middle}button,input{*overflow:visible;line-height:normal}button::-moz-focus-inner,input::-moz-focus-inner{padding:0;border:0}button,html input[type="button"],input[type="reset"],input[type="submit"]{cursor:pointer;-webkit-appearance:button}input[type="search"]{-webkit-box-siz ing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;-webkit-appearance:textfield}input[type="search"]::-webkit-search-decoration,input[type="search"]::-webkit-search-cancel-button{-webkit-appearance:none}textarea{overflow:auto;vertical-align:top}.clearfix{*zoom:1}.clearfix:before,.clearfix:after{display:table;line-height:0;content:""}.clearfix:after{clear:both}.hide-text{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0}.input-block-level{display:block;width:100%;min-height:30px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}body{margin:0;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;line-height:20px;color:#333;background-color:#fff}a{color:#08c;text-decoration:none}a:hover{color:#005580;text-decoration:underline}.img-rounded{-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px}.img-polaroid{padding:4px;background-color:#fff;border:1px solid #ccc;border:1px solid r gba(0,0,0,0.2);-webkit-box-shadow:0 1px 3px rgba(0,0,0,0.1);-moz-box-shadow:0 1px 3px rgba(0,0,0,0.1);box-shadow:0 1px 3px rgba(0,0,0,0.1)}.img-circle{-webkit-border-radius:500px;-moz-border-radius:500px;border-radius:500px}.row{margin-left:-20px;*zoom:1}.row:before,.row:after{display:table;line-height:0;content:""}.row:after{clear:both}[class*="span"]{float:left;min-height:1px;margin-left:20px}.container,.navbar-static-top .container,.navbar-fixed-top .container,.navbar-fixed-bottom .container{width:940px}.span12{width:940px}.span11{width:860px}.span10{width:780px}.span9{width:700px}.span8{width:620px}.span7{width:540px}.span6{width:460px}.span5{width:380px}.span4{width:300px}.span3{width:220px}.span2{width:140px}.span1{width:60px}.offset12{margin-left:980px}.offset11{margin-left:900px}.offset10{margin-left:820px}.offset9{margin-left:740px}.offset8{margin-left:660px}.offset7{margin-left:580px}.offset6{margin-left:500px}.offset5{margin-left:420px}.offset4{margin-left:340px}.offset3{ margin-left:260px}.offset2{margin-left:180px}.offset1{margin-left:100px}.row-fluid{width:100%;*zoom:1}.row-fluid:before,.row-fluid:after{display:table;line-height:0;content:""}.row-fluid:after{clear:both}.row-fluid [class*="span"]{display:block;float:left;width:100%;min-height:30px;margin-left:2.127659574468085%;*margin-left:2.074468085106383%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.row-fluid [class*="span"]:first-child{margin-left:0}.row-fluid .controls-row [class*="span"]+[class*="span"]{margin-left:2.127659574468085%}.row-fluid .span12{width:100%;*width:99.94680851063829%}.row-fluid .span11{width:91.48936170212765%;*width:91.43617021276594%}.row-fluid .span10{width:82.97872340425532%;*width:82.92553191489361%}.row-fluid .span9{width:74.46808510638297%;*width:74.41489361702126%}.row-fluid .span8{width:65.95744680851064%;*width:65.90425531914893%}.row-fluid .span7{width:57.44680851063829%;*width:57.39361702127659%}.row-fluid .span6{width:48.9 3617021276595%;*width:48.88297872340425%}.row-fluid .span5{width:40.42553191489362%;*width:40.37234042553192%}.row-fluid .span4{width:31.914893617021278%;*width:31.861702127659576%}.row-fluid .span3{width:23.404255319148934%;*width:23.351063829787233%}.row-fluid .span2{width:14.893617021276595%;*width:14.840425531914894%}.row-flui
[09/50] [abbrv] logging-log4net git commit: .NET Core doesn't support event log and the colored console appender either
.NET Core doesn't support event log and the colored console appender either Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/bf0e4b04 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/bf0e4b04 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/bf0e4b04 Branch: refs/heads/master Commit: bf0e4b04203c43ac2ef6d6c51c9dca1a3846e03a Parents: 6b083cd Author: Stefan Bodewig Authored: Mon Dec 5 16:53:45 2016 + Committer: Stefan Bodewig Committed: Mon Dec 5 16:53:45 2016 + -- src/site/xdoc/release/framework-support.xml | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/bf0e4b04/src/site/xdoc/release/framework-support.xml -- diff --git a/src/site/xdoc/release/framework-support.xml b/src/site/xdoc/release/framework-support.xml index 95e2eea..8e45565 100644 --- a/src/site/xdoc/release/framework-support.xml +++ b/src/site/xdoc/release/framework-support.xml @@ -585,12 +585,14 @@ limitations under the License. Things that are not supported in log4net for .NET Core: - the ADO.NET Appender + the ADO.NET appender anything related to ASP.NET (trace appender and several pattern converters) .NET Remoting + the colored console appender + the event log appender The NetSendAppender - The SMTP Appender + The SMTP appender DOMConfigurator stack trace patterns access to appSettings (neither
[33/50] [abbrv] logging-log4net git commit: add release notes for 2.0.8
add release notes for 2.0.8 Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/29be936c Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/29be936c Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/29be936c Branch: refs/heads/master Commit: 29be936c9138afcff0ab86d23369cc50bc77b523 Parents: 2002917 Author: Stefan Bodewig Authored: Wed Mar 8 17:02:53 2017 + Committer: Stefan Bodewig Committed: Wed Mar 8 17:02:53 2017 + -- src/site/xdoc/release/release-notes.xml | 32 1 file changed, 32 insertions(+) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/29be936c/src/site/xdoc/release/release-notes.xml -- diff --git a/src/site/xdoc/release/release-notes.xml b/src/site/xdoc/release/release-notes.xml index 10a366e..60e4487 100644 --- a/src/site/xdoc/release/release-notes.xml +++ b/src/site/xdoc/release/release-notes.xml @@ -28,6 +28,38 @@ limitations under the License. + + +Apache log4net 2.0.8 fixes a +LockRecursionException that could happen +inside the FileAppender under certain +circumstances. It also adds support for +LogicalThreadContext to the .NET Standard +build based on AsyncLocal rather than +CallContext. + + + + + [LOG4NET-466] - "LockRecursionException: A read lock may not be acquired with the write lock held in this mode." exception + + [LOG4NET-550] - Logging recursively from an Appender not supported for NET_4_0 and MONO_4_0 + + [LOG4NET-551] - LockRecursionException when using File Appenders + + [LOG4NET-554] - LogicalThreadContext was removed in .NETStandard + + + + + + + [LOG4NET-553] - DebugAppender configuration should give the possibility to disable outputting loggerName as category + + + + + Apache log4net 2.0.7 fixes a glitch in nuget packaging and
[11/50] [abbrv] logging-log4net git commit: missing license header
missing license header Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/74005040 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/74005040 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/74005040 Branch: refs/heads/master Commit: 74005040311c77cd24ed6e5884851fca1c5c2407 Parents: f83f0ba Author: Stefan Bodewig Authored: Sun Dec 18 17:10:21 2016 + Committer: Stefan Bodewig Committed: Sun Dec 18 17:10:21 2016 + -- src/Appender/IFlushable.cs | 19 +++ 1 file changed, 19 insertions(+) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/74005040/src/Appender/IFlushable.cs -- diff --git a/src/Appender/IFlushable.cs b/src/Appender/IFlushable.cs index e3beb05..2cb7ae3 100644 --- a/src/Appender/IFlushable.cs +++ b/src/Appender/IFlushable.cs @@ -1,3 +1,22 @@ +#region Apache License +// +// Licensed to the Apache Software Foundation (ASF) under one or more +// contributor license agreements. See the NOTICE file distributed with +// this work for additional information regarding copyright ownership. +// The ASF licenses this file to you 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 + using System; namespace log4net.Appender
[47/50] [abbrv] logging-log4net git commit: LOG4NET-563 try to copy skin from log4j
http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/df542d50/src/site/resources/css/bootstrap.css -- diff --git a/src/site/resources/css/bootstrap.css b/src/site/resources/css/bootstrap.css new file mode 100644 index 000..3ef47e1 --- /dev/null +++ b/src/site/resources/css/bootstrap.css @@ -0,0 +1,5893 @@ +/*! + * Bootstrap v2.2.1 + * + * Copyright 2012 Twitter, Inc + * Licensed under the Apache License v2.0 + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Designed and built with all the love in the world @twitter by @mdo and @fat. + */ + +article, +aside, +details, +figcaption, +figure, +footer, +header, +hgroup, +nav, +section { + display: block; +} + +audio, +canvas, +video { + display: inline-block; + *display: inline; + *zoom: 1; +} + +audio:not([controls]) { + display: none; +} + +html { + font-size: 100%; + -webkit-text-size-adjust: 100%; + -ms-text-size-adjust: 100%; +} + +a:focus { + outline: thin dotted #333; + outline: 5px auto -webkit-focus-ring-color; + outline-offset: -2px; +} + +a:hover, +a:active { + outline: 0; +} + +sub, +sup { + position: relative; + font-size: 75%; + line-height: 0; + vertical-align: baseline; +} + +sup { + top: -0.5em; +} + +sub { + bottom: -0.25em; +} + +img { + width: auto\9; + height: auto; + max-width: 100%; + vertical-align: middle; + border: 0; + -ms-interpolation-mode: bicubic; +} + +#map_canvas img, +.google-maps img { + max-width: none; +} + +button, +input, +select, +textarea { + margin: 0; + font-size: 100%; + vertical-align: middle; +} + +button, +input { + *overflow: visible; + line-height: normal; +} + +button::-moz-focus-inner, +input::-moz-focus-inner { + padding: 0; + border: 0; +} + +button, +html input[type="button"], +input[type="reset"], +input[type="submit"] { + cursor: pointer; + -webkit-appearance: button; +} + +input[type="search"] { + -webkit-box-sizing: content-box; + -moz-box-sizing: content-box; + box-sizing: content-box; + -webkit-appearance: textfield; +} + +input[type="search"]::-webkit-search-decoration, +input[type="search"]::-webkit-search-cancel-button { + -webkit-appearance: none; +} + +textarea { + overflow: auto; + vertical-align: top; +} + +.clearfix { + *zoom: 1; +} + +.clearfix:before, +.clearfix:after { + display: table; + line-height: 0; + content: ""; +} + +.clearfix:after { + clear: both; +} + +.hide-text { + font: 0/0 a; + color: transparent; + text-shadow: none; + background-color: transparent; + border: 0; +} + +.input-block-level { + display: block; + width: 100%; + min-height: 30px; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; +} + +body { + margin: 0; + font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; + font-size: 14px; + line-height: 20px; + color: #33; + background-color: #ff; +} + +a { + color: #0088cc; + text-decoration: none; +} + +a:hover { + color: #005580; + text-decoration: underline; +} + +.img-rounded { + -webkit-border-radius: 6px; + -moz-border-radius: 6px; + border-radius: 6px; +} + +.img-polaroid { + padding: 4px; + background-color: #fff; + border: 1px solid #ccc; + border: 1px solid rgba(0, 0, 0, 0.2); + -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1); + -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1); + box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1); +} + +.img-circle { + -webkit-border-radius: 500px; + -moz-border-radius: 500px; + border-radius: 500px; +} + +.row { + margin-left: -20px; + *zoom: 1; +} + +.row:before, +.row:after { + display: table; + line-height: 0; + content: ""; +} + +.row:after { + clear: both; +} + +[class*="span"] { + float: left; + min-height: 1px; + margin-left: 20px; +} + +.container, +.navbar-static-top .container, +.navbar-fixed-top .container, +.navbar-fixed-bottom .container { + width: 940px; +} + +.span12 { + width: 940px; +} + +.span11 { + width: 860px; +} + +.span10 { + width: 780px; +} + +.span9 { + width: 700px; +} + +.span8 { + width: 620px; +} + +.span7 { + width: 540px; +} + +.span6 { + width: 460px; +} + +.span5 { + width: 380px; +} + +.span4 { + width: 300px; +} + +.span3 { + width: 220px; +} + +.span2 { + width: 140px; +} + +.span1 { + width: 60px; +} + +.offset12 { + margin-left: 980px; +} + +.offset11 { + margin-left: 900px; +} + +.offset10 { + margin-left: 820px; +} + +.offset9 { + margin-left: 740px; +} + +.offset8 { + margin-left: 660px; +} + +.offset7 { + margin-left: 580px; +} + +.offset6 { + margin-left: 500px; +} + +.offset5 { + margin-left: 420px; +} + +.offset4 { + margin-left: 340px; +} + +.offset3 { + margin-left: 260px; +} + +.offset2 { + margin-left: 180px; +} + +.offset1 { + margin-left: 100px; +} + +.row-fluid { + width: 100%; + *zoom: 1; +} + +.row-fluid:before, +.row-fluid:after { + display: table; + line-height: 0; + conten
[18/50] [abbrv] logging-log4net git commit: LOG4NET-540 add empty dependency groups for all supported target frameworks
LOG4NET-540 add empty dependency groups for all supported target frameworks Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/a2d1dfe8 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/a2d1dfe8 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/a2d1dfe8 Branch: refs/heads/master Commit: a2d1dfe84ca0b88050de1bd8ca73320cd6252cf7 Parents: 0e1e66b Author: Stefan Bodewig Authored: Fri Dec 30 13:19:15 2016 + Committer: Stefan Bodewig Committed: Fri Dec 30 13:19:15 2016 + -- log4net.nuspec | 6 ++ 1 file changed, 6 insertions(+) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/a2d1dfe8/log4net.nuspec -- diff --git a/log4net.nuspec b/log4net.nuspec index 3a0b42a..27fac16 100644 --- a/log4net.nuspec +++ b/log4net.nuspec @@ -39,6 +39,12 @@ log4net is designed with two distinct goals in mind: speed and flexibilityfalse logging log tracing logfiles + + + + + +
[31/50] [abbrv] logging-log4net git commit: make test compile on .NET 2.0
make test compile on .NET 2.0 Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/9ce4638a Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/9ce4638a Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/9ce4638a Branch: refs/heads/master Commit: 9ce4638a46f02ae256e988472af12b0cd43a734b Parents: c94bb14 Author: Stefan Bodewig Authored: Tue Mar 7 19:18:27 2017 + Committer: Stefan Bodewig Committed: Tue Mar 7 19:18:27 2017 + -- tests/src/Appender/SmtpPickupDirAppenderTest.cs | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/9ce4638a/tests/src/Appender/SmtpPickupDirAppenderTest.cs -- diff --git a/tests/src/Appender/SmtpPickupDirAppenderTest.cs b/tests/src/Appender/SmtpPickupDirAppenderTest.cs index c45477a..6fbb082 100644 --- a/tests/src/Appender/SmtpPickupDirAppenderTest.cs +++ b/tests/src/Appender/SmtpPickupDirAppenderTest.cs @@ -190,9 +190,9 @@ namespace log4net.Tests.Appender { if(line.StartsWith(dateHeaderStart)) { - var datePart = line.Substring(dateHeaderStart.Length); - var date = DateTime.ParseExact(datePart, "r", System.Globalization.CultureInfo.InvariantCulture); - var diff = Math.Abs( (DateTime.UtcNow - date).TotalMilliseconds); + string datePart = line.Substring(dateHeaderStart.Length); + DateTime date = DateTime.ParseExact(datePart, "r", System.Globalization.CultureInfo.InvariantCulture); + double diff = Math.Abs( (DateTime.UtcNow - date).TotalMilliseconds); Assert.LessOrEqual(diff, 1000, "Times should be equal, allowing a diff of one second to make test robust"); hasDateHeader = true; } @@ -218,7 +218,7 @@ namespace log4net.Tests.Appender DestroyLogger(); Assert.AreEqual(1, Directory.GetFiles(_testPickupDir).Length); - var fileInfo = new FileInfo(Directory.GetFiles(_testPickupDir)[0]); + FileInfo fileInfo = new FileInfo(Directory.GetFiles(_testPickupDir)[0]); Assert.AreEqual("." + fileExtension, fileInfo.Extension); Assert.DoesNotThrow(delegate { new Guid(fileInfo.Name.Substring(0, fileInfo.Name.Length - fileInfo.Extension.Length)); }); // Assert that filename before extension is a guid @@ -239,7 +239,7 @@ namespace log4net.Tests.Appender DestroyLogger(); Assert.AreEqual(1, Directory.GetFiles(_testPickupDir).Length); - var fileInfo = new FileInfo(Directory.GetFiles(_testPickupDir)[0]); + FileInfo fileInfo = new FileInfo(Directory.GetFiles(_testPickupDir)[0]); Assert.IsEmpty(fileInfo.Extension); Assert.DoesNotThrow(delegate { new Guid(fileInfo.Name); }); // Assert that filename is a guid
[19/50] [abbrv] logging-log4net git commit: happy new year
happy new year Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/e3b685f0 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/e3b685f0 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/e3b685f0 Branch: refs/heads/master Commit: e3b685f0290e8480145fdeb8bfe8acfc2dba7858 Parents: a2d1dfe Author: Stefan Bodewig Authored: Sun Jan 1 11:25:43 2017 + Committer: Stefan Bodewig Committed: Sun Jan 1 11:25:43 2017 + -- NOTICE | 2 +- log4net.nuspec | 2 +- log4net.shfbproj | 2 +- netstandard/log4net/project.json | 2 +- src/AssemblyVersionInfo.cpp | 2 +- src/AssemblyVersionInfo.cs | 2 +- src/AssemblyVersionInfo.js | 2 +- src/AssemblyVersionInfo.vb | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/e3b685f0/NOTICE -- diff --git a/NOTICE b/NOTICE index a19db4f..86d4dfe 100644 --- a/NOTICE +++ b/NOTICE @@ -1,5 +1,5 @@ Apache log4net - Copyright 2004-2016 The Apache Software Foundation + Copyright 2004-2017 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/e3b685f0/log4net.nuspec -- diff --git a/log4net.nuspec b/log4net.nuspec index 27fac16..fc4cf92 100644 --- a/log4net.nuspec +++ b/log4net.nuspec @@ -35,7 +35,7 @@ log4net is designed with two distinct goals in mind: speed and flexibilityhttp://logging.apache.org/log4net/license.html http://logging.apache.org/log4net/ https://www.apache.org/images/feather.png -Copyright 2004-2016 The Apache Software Foundation +Copyright 2004-2017 The Apache Software Foundation false logging log tracing logfiles http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/e3b685f0/log4net.shfbproj -- diff --git a/log4net.shfbproj b/log4net.shfbproj index 4cfe5af..a883492 100644 --- a/log4net.shfbproj +++ b/log4net.shfbproj @@ -42,7 +42,7 @@ limitations under the License. False MemberName Apache log4net⢠SDK Documentation -Copyright 2004-2016 The Apache Software Foundation +Copyright 2004-2017 The Apache Software Foundation http://logging.apache.org/log4net/ AboveNamespaces http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/e3b685f0/netstandard/log4net/project.json -- diff --git a/netstandard/log4net/project.json b/netstandard/log4net/project.json index 589214f..c269c5f 100644 --- a/netstandard/log4net/project.json +++ b/netstandard/log4net/project.json @@ -2,7 +2,7 @@ "name": "log4net", "version": "2.0.7", "title": "Apache log4net for .NET Core", - "copyright": "Copyright 2004-2016 The Apache Software Foundation.", + "copyright": "Copyright 2004-2017 The Apache Software Foundation.", "frameworks": { "netstandard1.3": { "buildOptions": { http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/e3b685f0/src/AssemblyVersionInfo.cpp -- diff --git a/src/AssemblyVersionInfo.cpp b/src/AssemblyVersionInfo.cpp index c12b2e3..1dc9eb5 100644 --- a/src/AssemblyVersionInfo.cpp +++ b/src/AssemblyVersionInfo.cpp @@ -45,5 +45,5 @@ using namespace System::Runtime::CompilerServices; // [assembly: AssemblyCompany("The Apache Software Foundation")]; -[assembly: AssemblyCopyright("Copyright 2004-2016 The Apache Software Foundation.")]; +[assembly: AssemblyCopyright("Copyright 2004-2017 The Apache Software Foundation.")]; [assembly: AssemblyTrademark("Apache and Apache log4net are trademarks of The Apache Software Foundation")]; http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/e3b685f0/src/AssemblyVersionInfo.cs -- diff --git a/src/AssemblyVersionInfo.cs b/src/AssemblyVersionInfo.cs index 8a98e02..97fbc58 100644 --- a/src/AssemblyVersionInfo.cs +++ b/src/AssemblyVersionInfo.cs @@ -41,5 +41,5 @@ // [assembly: System.Reflection.AssemblyCompany("The Apache Software Foundation")] -[assembly: System.Reflection.AssemblyCopyright("Copyright 2004-2016 The Apache Software Foundation.")] +[assembly: System.Reflection.AssemblyCopyright("Copyright 2004-2017 The Apache Software Foundation.")] [assembly: System.Reflection.AssemblyTrademark("Apache and Apache log4net are trademarks of The Apache Software
[24/50] [abbrv] logging-log4net git commit: I overlooked a place that contains te version information
I overlooked a place that contains te version information Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/d1261ff3 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/d1261ff3 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/d1261ff3 Branch: refs/heads/master Commit: d1261ff3dca12471985dda164f56da9ee105e0fb Parents: b8189d1 Author: Stefan Bodewig Authored: Sun Feb 19 05:54:34 2017 + Committer: Stefan Bodewig Committed: Sun Feb 19 05:54:34 2017 + -- src/AssemblyInfo.cs | 42 src/AssemblyVersionInfo.cpp | 1 - 2 files changed, 21 insertions(+), 22 deletions(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/d1261ff3/src/AssemblyInfo.cs -- diff --git a/src/AssemblyInfo.cs b/src/AssemblyInfo.cs index 04049d8..bd5aa4c 100644 --- a/src/AssemblyInfo.cs +++ b/src/AssemblyInfo.cs @@ -54,71 +54,71 @@ using System.Runtime.CompilerServices; // #if (CLI_1_0) -[assembly: AssemblyInformationalVersionAttribute("2.0.6.0-.CLI 1.0")] +[assembly: AssemblyInformationalVersionAttribute("2.0.8.0-.CLI 1.0")] [assembly: AssemblyTitle("Apache log4net for CLI 1.0 Compatible Frameworks")] #elif (NET_1_0) -[assembly: AssemblyInformationalVersionAttribute("2.0.6.0-.NET 1.0")] +[assembly: AssemblyInformationalVersionAttribute("2.0.8.0-.NET 1.0")] [assembly: AssemblyTitle("Apache log4net for .NET Framework 1.0")] #elif (NET_1_1) -[assembly: AssemblyInformationalVersionAttribute("2.0.6.0-.NET 1.1")] +[assembly: AssemblyInformationalVersionAttribute("2.0.8.0-.NET 1.1")] [assembly: AssemblyTitle("Apache log4net for .NET Framework 1.1")] #elif (NET_4_5) -[assembly: AssemblyInformationalVersionAttribute("2.0.6.0-.NET 4.5")] +[assembly: AssemblyInformationalVersionAttribute("2.0.8.0-.NET 4.5")] [assembly: AssemblyTitle("Apache log4net for .NET Framework 4.5")] #elif (NET_4_0) #if CLIENT_PROFILE -[assembly: AssemblyInformationalVersionAttribute("2.0.6.0-.NET 4.0 CP")] +[assembly: AssemblyInformationalVersionAttribute("2.0.8.0-.NET 4.0 CP")] [assembly: AssemblyTitle("Apache log4net for .NET Framework 4.0 Client Profile")] #else -[assembly: AssemblyInformationalVersionAttribute("2.0.6.0-.NET 4.0")] +[assembly: AssemblyInformationalVersionAttribute("2.0.8.0-.NET 4.0")] [assembly: AssemblyTitle("Apache log4net for .NET Framework 4.0")] #endif // Client Profile #elif (NET_2_0) #if CLIENT_PROFILE -[assembly: AssemblyInformationalVersionAttribute("2.0.6.0-.NET 3.5 CP")] +[assembly: AssemblyInformationalVersionAttribute("2.0.8.0-.NET 3.5 CP")] [assembly: AssemblyTitle("Apache log4net for .NET Framework 3.5 Client Profile")] #else -[assembly: AssemblyInformationalVersionAttribute("2.0.6.0-.NET 2.0")] +[assembly: AssemblyInformationalVersionAttribute("2.0.8.0-.NET 2.0")] [assembly: AssemblyTitle("Apache log4net for .NET Framework 2.0")] #endif // Client Profile #elif (NETCF_1_0) -[assembly: AssemblyInformationalVersionAttribute("2.0.6.0-.NETCF 1.0")] +[assembly: AssemblyInformationalVersionAttribute("2.0.8.0-.NETCF 1.0")] [assembly: AssemblyTitle("Apache log4net for .NET Compact Framework 1.0")] #elif (NETCF_2_0) -[assembly: AssemblyInformationalVersionAttribute("2.0.6.0-.NETCF 2.0")] +[assembly: AssemblyInformationalVersionAttribute("2.0.8.0-.NETCF 2.0")] [assembly: AssemblyTitle("Apache log4net for .NET Compact Framework 2.0")] #elif (MONO_1_0) -[assembly: AssemblyInformationalVersionAttribute("2.0.6.0-Mono 1.0")] +[assembly: AssemblyInformationalVersionAttribute("2.0.8.0-Mono 1.0")] [assembly: AssemblyTitle("Apache log4net for Mono 1.0")] #elif (MONO_2_0) -[assembly: AssemblyInformationalVersionAttribute("2.0.6.0-Mono 2.0")] +[assembly: AssemblyInformationalVersionAttribute("2.0.8.0-Mono 2.0")] [assembly: AssemblyTitle("Apache log4net for Mono 2.0")] #elif (MONO_3_5) -[assembly: AssemblyInformationalVersionAttribute("2.0.6.0-Mono 3.5")] +[assembly: AssemblyInformationalVersionAttribute("2.0.8.0-Mono 3.5")] [assembly: AssemblyTitle("Apache log4net for Mono 3.5")] #elif (MONO_4_0) -[assembly: AssemblyInformationalVersionAttribute("2.0.6.0-Mono 4.0")] +[assembly: AssemblyInformationalVersionAttribute("2.0.8.0-Mono 4.0")] [assembly: AssemblyTitle("Apache log4net for Mono 4.0")] #elif (SSCLI_1_0) -[assembly: AssemblyInformationalVersionAttribute("2.0.6.0-SSCLI 1.0")] +[assembly: AssemblyInformationalVersionAttribute("2.0.8.0-SSCLI 1.0")] [assembly: AssemblyTitle("Apache log4net for Shared Source CLI 1.0")] #elif (NET) -[assembly: AssemblyInformationalVersionAttribute("2.0.6.0-.NET")] +[assembly: AssemblyInformationalVersionAttribute("2.0.8.0-.NET")] [assembly: AssemblyTitle("Apache log4net for .NET Framework")] #el
[23/50] [abbrv] logging-log4net git commit: allow the logging system to recursively log using itself
allow the logging system to recursively log using itself patch by @JJoe2 closes #41 Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/b8189d16 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/b8189d16 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/b8189d16 Branch: refs/heads/master Commit: b8189d16a65ba9e0aa76ed7dfb8242caef2da388 Parents: 8b4bc63 Author: Stefan Bodewig Authored: Thu Feb 2 11:26:18 2017 + Committer: Stefan Bodewig Committed: Thu Feb 2 11:26:18 2017 + -- src/Util/ReaderWriterLock.cs | 2 +- tests/src/Appender/EventRaisingAppender.cs | 58 + tests/src/Appender/RecursiveLoggingTest.cs | 84 + tests/src/log4net.Tests.vs2012.csproj | 2 + 4 files changed, 145 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/b8189d16/src/Util/ReaderWriterLock.cs -- diff --git a/src/Util/ReaderWriterLock.cs b/src/Util/ReaderWriterLock.cs index 5ed53c5..807a3da 100644 --- a/src/Util/ReaderWriterLock.cs +++ b/src/Util/ReaderWriterLock.cs @@ -64,7 +64,7 @@ namespace log4net.Util #if HAS_READERWRITERLOCK #if HAS_READERWRITERLOCKSLIM - m_lock = new System.Threading.ReaderWriterLockSlim(); + m_lock = new System.Threading.ReaderWriterLockSlim(System.Threading.LockRecursionPolicy.SupportsRecursion); #else m_lock = new System.Threading.ReaderWriterLock(); #endif http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/b8189d16/tests/src/Appender/EventRaisingAppender.cs -- diff --git a/tests/src/Appender/EventRaisingAppender.cs b/tests/src/Appender/EventRaisingAppender.cs new file mode 100644 index 000..517b6bd --- /dev/null +++ b/tests/src/Appender/EventRaisingAppender.cs @@ -0,0 +1,58 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace log4net.Tests.Appender +{ +/// +/// Provides data for the event. +/// +/// +public class LoggingEventEventArgs : EventArgs +{ +public log4net.Core.LoggingEvent LoggingEvent { get; private set; } + +public LoggingEventEventArgs(log4net.Core.LoggingEvent loggingEvent) +{ +if (loggingEvent == null) throw new ArgumentNullException("loggingEvent"); +LoggingEvent = loggingEvent; +} +} + +/// +/// A log4net appender that raises an event each time a logging event is appended +/// +/// +/// This class is intended to provide a way for test code to inspect logging +/// events as they are generated. +/// +public class EventRaisingAppender : log4net.Appender.IAppender +{ +public event EventHandler LoggingEventAppended; + +protected void OnLoggingEventAppended(LoggingEventEventArgs e) +{ +var loggingEventAppended = LoggingEventAppended; +if (loggingEventAppended != null) +{ +loggingEventAppended(this, e); +} +} + +public void Close() +{ +} + +public void DoAppend(log4net.Core.LoggingEvent loggingEvent) +{ +OnLoggingEventAppended(new LoggingEventEventArgs(loggingEvent)); +} + +public string Name +{ +get; set; +} +} +} http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/b8189d16/tests/src/Appender/RecursiveLoggingTest.cs -- diff --git a/tests/src/Appender/RecursiveLoggingTest.cs b/tests/src/Appender/RecursiveLoggingTest.cs new file mode 100644 index 000..4b9aeb2 --- /dev/null +++ b/tests/src/Appender/RecursiveLoggingTest.cs @@ -0,0 +1,84 @@ +/* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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 limitati
[38/50] [abbrv] logging-log4net git commit: Site: fixed the indentation and whitespace issues of site.xml
Site: fixed the indentation and whitespace issues of site.xml Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/eab1f76f Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/eab1f76f Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/eab1f76f Branch: refs/heads/master Commit: eab1f76f11c546b0b9679edddf0cf9e32446a4c3 Parents: b0769ac Author: Dominik Psenner Authored: Wed Apr 19 08:57:11 2017 + Committer: Dominik Psenner Committed: Wed Apr 19 08:57:11 2017 + -- src/site/site.xml | 113 - 1 file changed, 56 insertions(+), 57 deletions(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/eab1f76f/src/site/site.xml -- diff --git a/src/site/site.xml b/src/site/site.xml index 6a05ee1..2ab7127 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -16,65 +16,64 @@ --> - -Apache Logging Services Project -images/ls-logo.jpg -http://logging.apache.org/ - - - - http://www.apache.org/"/> - http://logging.apache.org/"/> - http://logging.apache.org/log4net/"/> - - - - - - - - + + Apache Logging Services Project + images/ls-logo.jpg + http://logging.apache.org/ + + + + http://www.apache.org/"/> + http://logging.apache.org/"/> + http://logging.apache.org/log4net/"/> + - - - - - - - - - - + + + + + + - - - - - - - - + + + + + + + + + + - - - - - - - - - - - + + + + + + + + - - http://www.apache.org/"/> - http://www.apache.org/licenses/"/> - http://www.apache.org/foundation/sponsorship.html"/> - http://www.apache.org/foundation/thanks.html"/> - http://www.apache.org/security/"/> - http://www.apachecon.com"/> - - - + + + + + + + + + + + + + + http://www.apache.org/"/> + http://www.apache.org/licenses/"/> + http://www.apache.org/foundation/sponsorship.html"/> + http://www.apache.org/foundation/thanks.html"/> + http://www.apache.org/security/"/> + http://www.apachecon.com"/> + +
[13/50] [abbrv] logging-log4net git commit: clean build of .NET Standard didn't work because of downgraded dependencies
clean build of .NET Standard didn't work because of downgraded dependencies Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/1ff7451c Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/1ff7451c Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/1ff7451c Branch: refs/heads/master Commit: 1ff7451c919668c4394e2536c005a368009e2bbf Parents: dd9b763 Author: Stefan Bodewig Authored: Tue Dec 20 06:47:17 2016 + Committer: Stefan Bodewig Committed: Tue Dec 20 06:47:17 2016 + -- log4net.nuspec | 2 +- netstandard/log4net/project.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/1ff7451c/log4net.nuspec -- diff --git a/log4net.nuspec b/log4net.nuspec index 29a8611..a7ef7b9 100644 --- a/log4net.nuspec +++ b/log4net.nuspec @@ -53,7 +53,7 @@ log4net is designed with two distinct goals in mind: speed and flexibility - + http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/1ff7451c/netstandard/log4net/project.json -- diff --git a/netstandard/log4net/project.json b/netstandard/log4net/project.json index 41d9fe8..91a39e5 100644 --- a/netstandard/log4net/project.json +++ b/netstandard/log4net/project.json @@ -54,7 +54,7 @@ "System.Net.NameResolution": "4.0.0", "System.Net.Requests": "4.0.11", "System.Net.Sockets": "4.1.0", -"System.Reflection": "4.1.0", +"System.Reflection": "4.3.0", "System.Reflection.Extensions": "4.0.1", "System.Reflection.TypeExtensions": "4.1.0", "System.Runtime.Extensions": "4.1.0",
[03/50] [abbrv] logging-log4net git commit: LOG4NET-536 there doesn't seem to be a system wide Mutex in NETCF
LOG4NET-536 there doesn't seem to be a system wide Mutex in NETCF Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/d65b1a76 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/d65b1a76 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/d65b1a76 Branch: refs/heads/master Commit: d65b1a76bc7aeb92b2c836f554148686d1460bad Parents: 9f69a10 Author: Stefan Bodewig Authored: Wed Nov 30 05:15:43 2016 + Committer: Stefan Bodewig Committed: Wed Nov 30 05:15:43 2016 + -- src/Appender/RollingFileAppender.cs | 16 +++- 1 file changed, 15 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/d65b1a76/src/Appender/RollingFileAppender.cs -- diff --git a/src/Appender/RollingFileAppender.cs b/src/Appender/RollingFileAppender.cs index ac59ec4..63ffaeb 100644 --- a/src/Appender/RollingFileAppender.cs +++ b/src/Appender/RollingFileAppender.cs @@ -241,11 +241,17 @@ namespace log4net.Appender /// ~RollingFileAppender() { +#if !NETCF if (m_mutexForRolling != null) { +#if NET_4_0 || MONO_4_0 || NETSTANDARD1_3 + m_mutexForRolling.Dispose(); +#else m_mutexForRolling.Close(); +#endif m_mutexForRolling = null; } +#endif } #endregion Public Instance Constructors @@ -606,6 +612,7 @@ namespace log4net.Appender virtual protected void AdjustFileBeforeAppend() { // reuse the file appenders locking model to lock the rolling +#if !NETCF try { // if rolling should be locked, acquire the lock @@ -613,6 +620,7 @@ namespace log4net.Appender { m_mutexForRolling.WaitOne(); } +#endif if (m_rollDate) { DateTime n = m_dateTime.Now; @@ -632,6 +640,7 @@ namespace log4net.Appender RollOverSize(); } } +#if !NETCF } finally { @@ -641,6 +650,7 @@ namespace log4net.Appender m_mutexForRolling.ReleaseMutex(); } } +#endif } /// @@ -1148,8 +1158,10 @@ namespace log4net.Appender m_baseFileName = base.File; } +#if !NETCF // initialize the mutex that is used to lock rolling m_mutexForRolling = new Mutex(false, m_baseFileName.Replace("\\", "_").Replace(":", "_").Replace("/", "_")); +#endif if (m_rollDate && File != null && m_scheduledFilename == null) { @@ -1677,11 +1689,13 @@ namespace log4net.Appender /// private string m_baseFileName; +#if !NETCF /// /// A mutex that is used to lock rolling of files. /// private Mutex m_mutexForRolling; - +#endif + #endregion Private Instance Fields #region Static Members
[01/50] [abbrv] logging-log4net git commit: update release notes for 2.0.6
Repository: logging-log4net Updated Branches: refs/heads/master [created] d5d8f2a22 update release notes for 2.0.6 Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/76f0151b Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/76f0151b Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/76f0151b Branch: refs/heads/master Commit: 76f0151b0cc0c3bcc6ff56e24cfee43dda12167a Parents: a122f66 Author: Stefan Bodewig Authored: Sun Nov 6 10:19:48 2016 + Committer: Stefan Bodewig Committed: Sun Nov 6 10:19:48 2016 + -- src/site/xdoc/release/release-notes.xml | 25 + 1 file changed, 21 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/76f0151b/src/site/xdoc/release/release-notes.xml -- diff --git a/src/site/xdoc/release/release-notes.xml b/src/site/xdoc/release/release-notes.xml index 0bb8f90..b4ce996 100644 --- a/src/site/xdoc/release/release-notes.xml +++ b/src/site/xdoc/release/release-notes.xml @@ -32,9 +32,9 @@ limitations under the License. The Apache log4net team is now responsible for the nuget -package, we've changed the version number to align it with -the version numbers. Release 2.0.6 is supposed to be -compatible with 1.2.15. +package, we've changed the version number of this release +to align the version numbers. Release 2.0.6 is supposed to +be compatible with 1.2.15. @@ -47,14 +47,31 @@ limitations under the License. [LOG4NET-508] - NAnt release build is not optimized +[LOG4NET-512] - Thread safety issue in Hierarchy.cs + +[LOG4NET-527] - broken link on config-examples.html + +[LOG4NET-529] - Possible thread-safety bug in LoggingEvent + -[LOG4NET-467] - Is .NET Core, will be supported in the near future, or not +[LOG4NET-530] - Use UTC internally to avoid ambiguous timestamps + + + +[LOG4NET-467] - Is .NET Core, will be supported in the near future, or not + +[LOG4NET-511] - API to flush appenders + +[LOG4NET-526] - Add appSetting conversion pattern to PatternString + + +
[36/50] [abbrv] logging-log4net git commit: bump version
bump version Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/87e8a49d Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/87e8a49d Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/87e8a49d Branch: refs/heads/master Commit: 87e8a49d18380c97f9d16f5d3759e0b89df8c698 Parents: 4ea23f9 Author: Stefan Bodewig Authored: Wed Mar 15 10:13:52 2017 + Committer: Stefan Bodewig Committed: Wed Mar 15 10:13:52 2017 + -- log4net.build | 2 +- log4net.nuspec | 2 +- log4net.shfbproj | 2 +- netstandard/log4net.tests/project.json | 2 +- netstandard/log4net/project.json | 2 +- pom.xml| 2 +- src/AssemblyInfo.cs| 42 ++--- src/AssemblyVersionInfo.cpp| 4 +-- src/AssemblyVersionInfo.cs | 4 +-- src/AssemblyVersionInfo.js | 4 +-- src/AssemblyVersionInfo.vb | 4 +-- src/Log4netAssemblyInfo.cs | 2 +- 12 files changed, 36 insertions(+), 36 deletions(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/87e8a49d/log4net.build -- diff --git a/log4net.build b/log4net.build index c924d0b..47056cd 100644 --- a/log4net.build +++ b/log4net.build @@ -20,7 +20,7 @@ limitations under the License. - + http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/87e8a49d/log4net.nuspec -- diff --git a/log4net.nuspec b/log4net.nuspec index 51d8f31..ea0a9f0 100644 --- a/log4net.nuspec +++ b/log4net.nuspec @@ -22,7 +22,7 @@ http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd";> log4net -2.0.8 +2.0.9 Apache log4net The Apache log4net library is a tool to help the programmer output log statements to a variety of output targets. log4net is a tool to help the programmer output log statements to a variety of output targets. In case of problems with an application, it is helpful to enable logging so that the problem can be located. With log4net it is possible to enable logging at runtime without modifying the application binary. The log4net package is designed so that log statements can remain in shipped code without incurring a high performance cost. It follows that the speed of logging (or rather not logging) is crucial. http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/87e8a49d/log4net.shfbproj -- diff --git a/log4net.shfbproj b/log4net.shfbproj index ee7a01e..7f91938 100644 --- a/log4net.shfbproj +++ b/log4net.shfbproj @@ -33,7 +33,7 @@ limitations under the License. .NET Framework 3.5 doc\sdk\net\4.0\ -log4net-sdk-2.0.8 +log4net-sdk-2.0.9 en-US Standard Blank http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/87e8a49d/netstandard/log4net.tests/project.json -- diff --git a/netstandard/log4net.tests/project.json b/netstandard/log4net.tests/project.json index 49af8d7..e5a3772 100644 --- a/netstandard/log4net.tests/project.json +++ b/netstandard/log4net.tests/project.json @@ -1,5 +1,5 @@ { - "version": "2.0.8", + "version": "2.0.9", "buildOptions": { "compile": [ "../../tests/src/*.cs", http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/87e8a49d/netstandard/log4net/project.json -- diff --git a/netstandard/log4net/project.json b/netstandard/log4net/project.json index 53164d9..e5fc4e3 100644 --- a/netstandard/log4net/project.json +++ b/netstandard/log4net/project.json @@ -1,6 +1,6 @@ { "name": "log4net", - "version": "2.0.8", + "version": "2.0.9", "title": "Apache log4net for .NET Core", "copyright": "Copyright 2004-2017 The Apache Software Foundation.", "frameworks": { http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/87e8a49d/pom.xml -- diff --git a/pom.xml b/pom.xml index a957b15..94ded91 100644 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,7 @@ log4net apache-log4net pom - 2.0.8 + 2.0.9-SNAPSHOT Apache log4net Logging framework for Microsoft .NET Framework. http://logging.apache.org/log4net/ http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/87e8a49d/src/AssemblyInfo.cs -- diff --git a/src/AssemblyInfo.cs b/src/AssemblyInfo.cs index bd5aa4c..4f47009 100644 --- a/
[32/50] [abbrv] logging-log4net git commit: Debug hasn't got a Listeners property in .NET Core
Debug hasn't got a Listeners property in .NET Core Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/20029179 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/20029179 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/20029179 Branch: refs/heads/master Commit: 200291799afeac1e1b5f832605aa918161d17f8a Parents: 9ce4638 Author: Stefan Bodewig Authored: Tue Mar 7 19:25:06 2017 + Committer: Stefan Bodewig Committed: Tue Mar 7 19:25:06 2017 + -- netstandard/log4net.tests/log4net.tests.xproj | 1 - netstandard/log4net.tests/project.json| 1 - 2 files changed, 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/20029179/netstandard/log4net.tests/log4net.tests.xproj -- diff --git a/netstandard/log4net.tests/log4net.tests.xproj b/netstandard/log4net.tests/log4net.tests.xproj index 604afde..92eecae 100644 --- a/netstandard/log4net.tests/log4net.tests.xproj +++ b/netstandard/log4net.tests/log4net.tests.xproj @@ -32,7 +32,6 @@ limitations under the License. - http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/20029179/netstandard/log4net.tests/project.json -- diff --git a/netstandard/log4net.tests/project.json b/netstandard/log4net.tests/project.json index a7d9a86..49af8d7 100644 --- a/netstandard/log4net.tests/project.json +++ b/netstandard/log4net.tests/project.json @@ -6,7 +6,6 @@ "../../tests/src/Appender/AppenderCollectionTest.cs", "../../tests/src/Appender/BufferingAppenderTest.cs", "../../tests/src/Appender/CountingAppender.cs", - "../../tests/src/Appender/DebugAppenderTest.cs", "../../tests/src/Appender/MemoryAppenderTest.cs", "../../tests/src/Appender/RollingFileAppenderTest.cs", "../../tests/src/Appender/SmtpPickupDirAppenderTest.cs",
[42/50] [abbrv] logging-log4net git commit: LOG4NET-563 try to copy skin from log4j
http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/df542d50/src/site/resources/js/jquery.min.js -- diff --git a/src/site/resources/js/jquery.min.js b/src/site/resources/js/jquery.min.js new file mode 100644 index 000..198b3ff --- /dev/null +++ b/src/site/resources/js/jquery.min.js @@ -0,0 +1,4 @@ +/*! jQuery v1.7.1 jquery.com | jquery.org/license */ +(function(a,b){function cy(a){return f.isWindow(a)?a:a.nodeType===9?a.defaultView||a.parentWindow:!1}function cv(a){if(!ck[a]){var b=c.body,d=f("<"+a+">").appendTo(b),e=d.css("display");d.remove();if(e==="none"||e===""){cl||(cl=c.createElement("iframe"),cl.frameBorder=cl.width=cl.height=0),b.appendChild(cl);if(!cm||!cl.createElement)cm=(cl.contentWindow||cl.contentDocument).document,cm.write((c.compatMode==="CSS1Compat"?"":"")+""),cm.close();d=cm.createElement(a),cm.body.appendChild(d),e=f.css(d,"display"),b.removeChild(cl)}ck[a]=e}return ck[a]}function cu(a,b){var c={};f.each(cq.concat.apply([],cq.slice(0,b)),function(){c[this]=a});return c}function ct(){cr=b}function cs(){setTimeout(ct,0);return cr=f.now()}function cj(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}function ci(){try{return new a.XMLHttpRequest}catch(b){}}function cc(a,c){a.dataFilter&&(c=a.dataFilter(c,a.dataType));var d=a.dataTypes,e={},g,h,i=d.length,j,k=d[0],l,m,n,o,p ;for(g=1;g0){if(c!=="border")for(;g=0===c})}function S(a){return!a||!a.parentNode||a.parentNode.nodeType===11}function K(){return!0}function J(){return!1}function n(a,b,c){var d=b+"defer",e=b+"queue",g=b+"mark",h=f._data(a,d);h&&(c==="queue"||!f._data(a,e))&&(c==="mark"||!f._data(a,g))&&setTimeout(function(){!f._data(a,e)&&!f._data(a,g)&&(f.removeData(a,d,!0),h.fire())},0)}function m(a){for(var b in a){if(b==="data"&&f.isEmptyObject(a[b]))continue;if(b!=="toJSON")return!1}return!0}function l(a,c,d){if(d===b&&a.nodeType===1){var e="data-"+c.replace(k,"-$1").toLowerCase();d=a.getAttribute(e);if(typeof d=="string"){try{d=d==="true"?!0:d==="false"?!1:d==="null"?null:f.isNumeric(d)?parse Float(d):j.test(d)?f.parseJSON(d):d}catch(g){}f.data(a,c,d)}else d=b}return d}function h(a){var b=g[a]={},c,d;a=a.split(/\s+/);for(c=0,d=a.length;c)[^>]*$|#([\w\-]*)$)/,j=/\S/,k=/^\s+/,l=/\s+$/,m=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,n=/^[\],:{}\s]*$/,o=/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,p=/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,q=/(?:^|:|,)(?:\s*\[)+/g,r=/(webkit)[ \/]([\w.]+)/,s=/(opera)(?:.*version)?[ \/]([\w.]+)/,t=/(msie) ([\w.]+)/,u=/(mozilla)(?:.*? rv:([\w.]+))?/,v=/-([a-z]|[0-9])/ig,w=/^-ms-/,x=function(a,b){return(b+"").toUpperCase()},y=d.userAgent,z,A,B,C=Object.prototype.toString,D=Object.prototype.hasOwnProperty,E=Array.prototype.push,F=Array.prototype.slice,G=String.pro totype.trim,H=Array.prototype.indexOf,I={};e.fn=e.prototype={constructor:e,init:function(a,d,f){var g,h,j,k;if(!a)return this;if(a.nodeType){this.context=this[0]=a,this.length=1;return this}if(a==="body"&&!d&&c.body){this.context=c,this[0]=c.body,this.selector=a,this.length=1;return this}if(typeof a=="string"){a.charAt(0)!=="<"||a.charAt(a.length-1)!==">"||a.length<3?g=i.exec(a):g=[null,a,null];if(g&&(g[1]||!d)){if(g[1]){d=d instanceof e?d[0]:d,k=d?d.ownerDocument||d:c,j=m.exec(a),j?e.isPlainObject(d)?(a=[c.createElement(j[1])],e.fn.attr.call(a,d,!0)):a=[k.createElement(j[1])]:(j=e.buildFragment([g[1]],[k]),a=(j.cacheable?e.clone(j.fragment):j.fragment).childNodes);return e.merge(this,a)}h=c.getElementById(g[2]);if(h&&h.parentNode){if(h.id!==g[2])return f.find(a);this.length=1,this[0]=h}this.context=c,this.selector=a;return this}return!d||d.jquery?(d||f).find(a):this.constructor(d).find(a)}if(e.isFunction(a))return f.ready(a);a.selector!==b&&(this.selector=a.selector,this.context=a. context);return e.makeArray(a,this)},selector:"",jquery:"1.7.1",length:0,size:function(){return this.length},toArray:function(){return F.call(this,0)},get:function(a){return a==null?this.toArray():a<0?this[this.length+a]:this[a]},pushStack:function(a,b,c){var d=this.constructor();e.isArray(a)?E.apply(d,a):e.merge(d,a),d.prevObject=this,d.context=this.context,b==="find"?d.selector=this.selector+(this.selector?" ":"")+c:b&&(d.selector=this.selector+"."+b+"("+c+")");return d},each:function(a,b){return e.each(this,a,b)},ready:function(a){e.bindReady(),A.add(a);return this},eq:function(a){a=+a;return a===-1?this.slice(a):this.slice(a,a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(F.apply(this,arguments),"slice",F.call(arguments).join(","))},map:function(a){return this.pushStack(e.map(this,function(b,c){return a.call(b,c,b)}))},end:function(){return this.prevObject||this.constructor(null)},push:E,sort:[].sort,splice:[]. splice},e.fn.init.prototype=e.fn,e.extend=e.fn.extend=function(){var a,c,d,f,g,h,i=arguments[0]||{},j=1,k=arguments.length,l=!1;typeof