Author: rgrabowski
Date: Mon Aug 7 20:13:01 2006
New Revision: 429549
URL: http://svn.apache.org/viewvc?rev=429549&view=rev
Log:
Additional changes for LOG4NET-87: Added checks for NETCF and SCLI compiler
directives to disable ASP.Net patterns under certain platforms. Updated
copyright year on changed files to 2006.
Modified:
logging/log4net/trunk/src/Layout/Pattern/AspNetCachePatternConverter.cs
logging/log4net/trunk/src/Layout/Pattern/AspNetContextPatternConverter.cs
logging/log4net/trunk/src/Layout/Pattern/AspNetPatternConverter.cs
logging/log4net/trunk/src/Layout/Pattern/AspNetRequestPatternConverter.cs
logging/log4net/trunk/src/Layout/Pattern/AspNetSessionPatternConverter.cs
logging/log4net/trunk/src/Layout/PatternLayout.cs
Modified:
logging/log4net/trunk/src/Layout/Pattern/AspNetCachePatternConverter.cs
URL:
http://svn.apache.org/viewvc/logging/log4net/trunk/src/Layout/Pattern/AspNetCachePatternConverter.cs?rev=429549&r1=429548&r2=429549&view=diff
==============================================================================
--- logging/log4net/trunk/src/Layout/Pattern/AspNetCachePatternConverter.cs
(original)
+++ logging/log4net/trunk/src/Layout/Pattern/AspNetCachePatternConverter.cs Mon
Aug 7 20:13:01 2006
@@ -1,6 +1,6 @@
#region Copyright & License
//
-// Copyright 2001-2005 The Apache Software Foundation
+// Copyright 2001-2006 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.
@@ -16,6 +16,10 @@
//
#endregion
+// .NET Compact Framework 1.0 has no support for ASP.NET
+// SSCLI 1.0 has no support for ASP.NET
+#if !NETCF && !SSCLI
+
using System.IO;
using System.Web;
using log4net.Core;
@@ -44,4 +48,6 @@
}
}
}
-}
\ No newline at end of file
+}
+
+#endif
\ No newline at end of file
Modified:
logging/log4net/trunk/src/Layout/Pattern/AspNetContextPatternConverter.cs
URL:
http://svn.apache.org/viewvc/logging/log4net/trunk/src/Layout/Pattern/AspNetContextPatternConverter.cs?rev=429549&r1=429548&r2=429549&view=diff
==============================================================================
--- logging/log4net/trunk/src/Layout/Pattern/AspNetContextPatternConverter.cs
(original)
+++ logging/log4net/trunk/src/Layout/Pattern/AspNetContextPatternConverter.cs
Mon Aug 7 20:13:01 2006
@@ -1,6 +1,6 @@
#region Copyright & License
//
-// Copyright 2001-2005 The Apache Software Foundation
+// Copyright 2001-2006 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.
@@ -16,6 +16,10 @@
//
#endregion
+// .NET Compact Framework 1.0 has no support for ASP.NET
+// SSCLI 1.0 has no support for ASP.NET
+#if !NETCF && !SSCLI
+
using System.IO;
using System.Web;
using log4net.Core;
@@ -30,3 +34,5 @@
}
}
}
+
+#endif
\ No newline at end of file
Modified: logging/log4net/trunk/src/Layout/Pattern/AspNetPatternConverter.cs
URL:
http://svn.apache.org/viewvc/logging/log4net/trunk/src/Layout/Pattern/AspNetPatternConverter.cs?rev=429549&r1=429548&r2=429549&view=diff
==============================================================================
--- logging/log4net/trunk/src/Layout/Pattern/AspNetPatternConverter.cs
(original)
+++ logging/log4net/trunk/src/Layout/Pattern/AspNetPatternConverter.cs Mon Aug
7 20:13:01 2006
@@ -1,6 +1,6 @@
#region Copyright & License
//
-// Copyright 2001-2005 The Apache Software Foundation
+// Copyright 2001-2006 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.
@@ -16,6 +16,10 @@
//
#endregion
+// .NET Compact Framework 1.0 has no support for ASP.NET
+// SSCLI 1.0 has no support for ASP.NET
+#if !NETCF && !SSCLI
+
using System.IO;
using System.Web;
using log4net.Core;
@@ -56,3 +60,5 @@
protected abstract void Convert(TextWriter writer, LoggingEvent
loggingEvent, HttpContext httpContext);
}
}
+
+#endif
\ No newline at end of file
Modified:
logging/log4net/trunk/src/Layout/Pattern/AspNetRequestPatternConverter.cs
URL:
http://svn.apache.org/viewvc/logging/log4net/trunk/src/Layout/Pattern/AspNetRequestPatternConverter.cs?rev=429549&r1=429548&r2=429549&view=diff
==============================================================================
--- logging/log4net/trunk/src/Layout/Pattern/AspNetRequestPatternConverter.cs
(original)
+++ logging/log4net/trunk/src/Layout/Pattern/AspNetRequestPatternConverter.cs
Mon Aug 7 20:13:01 2006
@@ -1,6 +1,6 @@
#region Copyright & License
//
-// Copyright 2001-2005 The Apache Software Foundation
+// Copyright 2001-2006 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.
@@ -16,6 +16,10 @@
//
#endregion
+// .NET Compact Framework 1.0 has no support for ASP.NET
+// SSCLI 1.0 has no support for ASP.NET
+#if !NETCF && !SSCLI
+
using System.IO;
using System.Web;
using log4net.Core;
@@ -31,7 +35,7 @@
{
if (Option != null)
{
- WriteObject(writer,
loggingEvent.Repository, httpContext.Request[Option]);
+ WriteObject(writer,
loggingEvent.Repository, httpContext.Request.Params[Option]);
}
else
{
@@ -45,3 +49,5 @@
}
}
}
+
+#endif
\ No newline at end of file
Modified:
logging/log4net/trunk/src/Layout/Pattern/AspNetSessionPatternConverter.cs
URL:
http://svn.apache.org/viewvc/logging/log4net/trunk/src/Layout/Pattern/AspNetSessionPatternConverter.cs?rev=429549&r1=429548&r2=429549&view=diff
==============================================================================
--- logging/log4net/trunk/src/Layout/Pattern/AspNetSessionPatternConverter.cs
(original)
+++ logging/log4net/trunk/src/Layout/Pattern/AspNetSessionPatternConverter.cs
Mon Aug 7 20:13:01 2006
@@ -16,6 +16,10 @@
//
#endregion
+// .NET Compact Framework 1.0 has no support for ASP.NET
+// SSCLI 1.0 has no support for ASP.NET
+#if !NETCF && !SSCLI
+
using System.IO;
using System.Web;
using log4net.Core;
@@ -27,11 +31,12 @@
{
protected override void Convert(TextWriter writer, LoggingEvent
loggingEvent, HttpContext httpContext)
{
+
if (httpContext.Session != null)
{
if (Option != null)
{
- WriteObject(writer,
loggingEvent.Repository, httpContext.Session[Option]);
+ WriteObject(writer,
loggingEvent.Repository, httpContext.Session.Contents[Option]);
}
else
{
@@ -44,4 +49,6 @@
}
}
}
-}
\ No newline at end of file
+}
+
+#endif
\ No newline at end of file
Modified: logging/log4net/trunk/src/Layout/PatternLayout.cs
URL:
http://svn.apache.org/viewvc/logging/log4net/trunk/src/Layout/PatternLayout.cs?rev=429549&r1=429548&r2=429549&view=diff
==============================================================================
--- logging/log4net/trunk/src/Layout/PatternLayout.cs (original)
+++ logging/log4net/trunk/src/Layout/PatternLayout.cs Mon Aug 7 20:13:01 2006
@@ -103,6 +103,30 @@
/// </description>
/// </item>
/// <item>
+ /// <term>aspnet-cache</term>
+ /// <description>
+ /// TODO
+ /// </description>
+ /// </item>
+ /// <item>
+ /// <term>aspnet-context</term>
+ /// <description>
+ /// TODO
+ /// </description>
+ /// </item>
+ /// <item>
+ /// <term>aspnet-request</term>
+ /// <description>
+ /// TODO
+ /// </description>
+ /// </item>
+ /// <item>
+ /// <term>aspnet-session</term>
+ /// <description>
+ /// TODO
+ /// </description>
+ /// </item>
+ /// <item>
/// <term>c</term>
/// <description>Equivalent to <b>logger</b></description>
/// </item>
@@ -778,9 +802,14 @@
s_globalRulesRegistry.Add("newline",
typeof(NewLinePatternConverter));
s_globalRulesRegistry.Add("n",
typeof(NewLinePatternConverter));
+// .NET Compact Framework 1.0 has no support for ASP.NET
+// SSCLI 1.0 has no support for ASP.NET
+#if !NETCF && !SSCLI
s_globalRulesRegistry.Add("aspnet-cache",
typeof(AspNetCachePatternConverter));
s_globalRulesRegistry.Add("aspnet-context",
typeof(AspNetContextPatternConverter));
s_globalRulesRegistry.Add("aspnet-request",
typeof(AspNetRequestPatternConverter));
+ s_globalRulesRegistry.Add("aspnet-session",
typeof(AspNetSessionPatternConverter));
+#endif
s_globalRulesRegistry.Add("c",
typeof(LoggerPatternConverter));
s_globalRulesRegistry.Add("logger",
typeof(LoggerPatternConverter));
