Merge pull request #359 from DavidChristiansen/develop

Closes #356, Closes #357, Closes #358

3 files changed, 8 insertions, 21 deletions

diff --git a/samples/OAuthResourceServer/Code/Global.cs b/samples/OAuthResourceServer/Code/Global.cs
index a48baff..bf58c9c 100644
--- a/samples/OAuthResourceServer/Code/Global.cs
+++ b/samples/OAuthResourceServer/Code/Global.cs
@@ -5,6 +5,8 @@
 	using System.ServiceModel;
 	using System.Text;
 	using System.Web;
+
+	using DotNetOpenAuth.Logging;
 	using DotNetOpenAuth.OAuth2;
 	using DotNetOpenAuth.OAuth2.Messages;
 
@@ -39,7 +41,7 @@
 		/// <summary>
 		/// The logger for this sample to use.
 		/// </summary>
-		public static log4net.ILog Logger = log4net.LogManager.GetLogger("DotNetOpenAuth.OAuthResourceServer");
+		public static ILog Logger = LogProvider.GetLogger("DotNetOpenAuth.OAuthResourceServer");
 
 #if SAMPLESONLY
 		/// <summary>
@@ -85,19 +87,15 @@
 		}
 
 		private void Application_Start(object sender, EventArgs e) {
-			log4net.Config.XmlConfigurator.Configure();
 			Logger.Info("Sample starting...");
 		}
 
 		private void Application_End(object sender, EventArgs e) {
 			Logger.Info("Sample shutting down...");
-
-			// this would be automatic, but in partial trust scenarios it is not.
-			log4net.LogManager.Shutdown();
 		}
 
 		private void Application_Error(object sender, EventArgs e) {
-			Logger.Error("An unhandled exception occurred in ASP.NET processing: " + Server.GetLastError(), Server.GetLastError());
+			Logger.ErrorException("An unhandled exception occurred in ASP.NET processing: " + Server.GetLastError(), Server.GetLastError());
 		}
 
 		private void Application_EndRequest(object sender, EventArgs e) {
diff --git a/samples/OAuthResourceServer/Code/OAuthAuthorizationManager.cs b/samples/OAuthResourceServer/Code/OAuthAuthorizationManager.cs
index 091c9bb..37853c3 100644
--- a/samples/OAuthResourceServer/Code/OAuthAuthorizationManager.cs
+++ b/samples/OAuthResourceServer/Code/OAuthAuthorizationManager.cs
@@ -11,6 +11,8 @@
 	using System.ServiceModel.Web;
 	using System.Threading;
 	using System.Threading.Tasks;
+
+	using DotNetOpenAuth.Logging;
 	using DotNetOpenAuth.Messaging;
 	using DotNetOpenAuth.OAuth2;
 	using ProtocolException = System.ServiceModel.ProtocolException;
@@ -57,10 +59,10 @@
 						return false;
 					}
 				} catch (ProtocolFaultResponseException ex) {
-					Global.Logger.Error("Error processing OAuth messages.", ex);
+					Global.Logger.ErrorException("Error processing OAuth messages.", ex);
 					exception = ex;
 				} catch (ProtocolException ex) {
-					Global.Logger.Error("Error processing OAuth messages.", ex);
+					Global.Logger.ErrorException("Error processing OAuth messages.", ex);
 				}
 
 				if (exception != null) {
diff --git a/samples/OAuthResourceServer/Code/TracePageAppender.cs b/samples/OAuthResourceServer/Code/TracePageAppender.cs
deleted file mode 100644
index 4dc543f..0000000
--- a/samples/OAuthResourceServer/Code/TracePageAppender.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-namespace OAuthResourceServer.Code {
-	using System;
-	using System.Collections.Generic;
-	using System.IO;
-	using System.Web;
-
-	public class TracePageAppender : log4net.Appender.AppenderSkeleton {
-		protected override void Append(log4net.Core.LoggingEvent loggingEvent) {
-			StringWriter sw = new StringWriter(Global.LogMessages);
-			Layout.Format(sw, loggingEvent);
-		}
-	}
-}
\ No newline at end of file