Merge branch 'master' into contracts

Conflicts:
	src/DotNetOpenAuth.vsmdi
	src/DotNetOpenAuth/Configuration/TypeConfigurationCollection.cs
	src/DotNetOpenAuth/Configuration/TypeConfigurationElement.cs
	src/DotNetOpenAuth/DotNetOpenAuth.csproj
	src/DotNetOpenAuth/Messaging/HttpRequestInfo.cs
	src/DotNetOpenAuth/Messaging/Reflection/MessagePart.cs
	src/DotNetOpenAuth/Messaging/Reflection/ValueMapping.cs
	src/DotNetOpenAuth/OAuth/ChannelElements/OAuthChannel.cs
	src/DotNetOpenAuth/OAuth/ConsumerBase.cs
	src/DotNetOpenAuth/OAuth/Messages/MessageBase.cs
	src/DotNetOpenAuth/OAuth/Messages/UnauthorizedTokenResponse.cs
	src/DotNetOpenAuth/OAuth/ServiceProvider.cs
	src/DotNetOpenAuth/OpenId/Protocol.cs
	src/DotNetOpenAuth/OpenId/Provider/AutoResponsiveRequest.cs
	src/DotNetOpenAuth/OpenId/Provider/HostProcessedRequest.cs
	src/DotNetOpenAuth/OpenId/Provider/IHostProcessedRequest.cs
	src/DotNetOpenAuth/OpenId/Provider/Request.cs
	src/DotNetOpenAuth/OpenId/RelyingParty/OpenIdRelyingParty.cs
	src/DotNetOpenAuth/OpenId/RelyingParty/ServiceEndpoint.cs

1 files changed, 0 insertions, 63 deletions

diff --git a/samples/DotNetOpenAuth.ApplicationBlock/OAuthIdentity.cs b/samples/DotNetOpenAuth.ApplicationBlock/OAuthIdentity.cs
deleted file mode 100644
index ea9ec0b..0000000
--- a/samples/DotNetOpenAuth.ApplicationBlock/OAuthIdentity.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-//-----------------------------------------------------------------------
-// <copyright file="OAuthIdentity.cs" company="Andrew Arnott">
-//     Copyright (c) Andrew Arnott. All rights reserved.
-// </copyright>
-//-----------------------------------------------------------------------
-
-namespace DotNetOpenAuth.ApplicationBlock {
-	using System;
-	using System.Runtime.InteropServices;
-	using System.Security.Principal;
-
-	/// <summary>
-	/// Represents an OAuth consumer that is impersonating a known user on the system.
-	/// </summary>
-	[Serializable]
-	[ComVisible(true)]
-	internal class OAuthIdentity : IIdentity {
-		/// <summary>
-		/// Initializes a new instance of the <see cref="OAuthIdentity"/> class.
-		/// </summary>
-		/// <param name="username">The username.</param>
-		internal OAuthIdentity(string username) {
-			if (String.IsNullOrEmpty(username)) {
-				throw new ArgumentNullException("username");
-			}
-
-			this.Name = username;
-		}
-
-		#region IIdentity Members
-
-		/// <summary>
-		/// Gets the type of authentication used.
-		/// </summary>
-		/// <value>The constant "OAuth"</value>
-		/// <returns>
-		/// The type of authentication used to identify the user.
-		/// </returns>
-		public string AuthenticationType {
-			get { return "OAuth"; }
-		}
-
-		/// <summary>
-		/// Gets a value indicating whether the user has been authenticated.
-		/// </summary>
-		/// <value>The value <c>true</c></value>
-		/// <returns>true if the user was authenticated; otherwise, false.
-		/// </returns>
-		public bool IsAuthenticated {
-			get { return true; }
-		}
-
-		/// <summary>
-		/// Gets the name of the user who authorized the OAuth token the consumer is using for authorization.
-		/// </summary>
-		/// <returns>
-		/// The name of the user on whose behalf the code is running.
-		/// </returns>
-		public string Name { get; private set; }
-
-		#endregion
-	}
-}