Renamed ITokenCarryingRequest to IAuthorizationCarryingRequest.

11 files changed, 39 insertions, 130 deletions

diff --git a/src/DotNetOpenAuth/DotNetOpenAuth.csproj b/src/DotNetOpenAuth/DotNetOpenAuth.csproj
index 1cbdabe..60f2b8e 100644
--- a/src/DotNetOpenAuth/DotNetOpenAuth.csproj
+++ b/src/DotNetOpenAuth/DotNetOpenAuth.csproj
@@ -370,7 +370,7 @@ http://opensource.org/licenses/ms-pl.html
     <Compile Include="OAuth2\ChannelElements\ScopeEncoder.cs" />
     <Compile Include="Messaging\UriStyleMessageFormatter.cs" />
     <Compile Include="OAuth2\ChannelElements\IAuthorizationDescription.cs" />
-    <Compile Include="OAuth2\ChannelElements\ITokenCarryingRequest.cs" />
+    <Compile Include="OAuth2\ChannelElements\IAuthorizationCarryingRequest.cs" />
     <Compile Include="OAuth2\ChannelElements\OAuth2ResourceServerChannel.cs" />
     <Compile Include="Messaging\StandardMessageFactoryChannel.cs" />
     <Compile Include="OAuth2\ChannelElements\RefreshToken.cs" />
diff --git a/src/DotNetOpenAuth/OAuth2/AuthorizationServer.cs b/src/DotNetOpenAuth/OAuth2/AuthorizationServer.cs
index b2e1dc5..e95835c 100644
--- a/src/DotNetOpenAuth/OAuth2/AuthorizationServer.cs
+++ b/src/DotNetOpenAuth/OAuth2/AuthorizationServer.cs
@@ -220,7 +220,7 @@ namespace DotNetOpenAuth.OAuth2 {
 			Contract.Requires<ArgumentNullException>(request != null);
 			Contract.Requires<ArgumentNullException>(accessTokenEncryptingPublicKey != null);
 
-			var tokenRequest = (ITokenCarryingRequest)request;
+			var tokenRequest = (IAuthorizationCarryingRequest)request;
 			using (var crypto = this.AuthorizationServerServices.CreateAccessTokenSigningCryptoServiceProvider()) {
 				var accessTokenFormatter = AccessToken.CreateFormatter(crypto, accessTokenEncryptingPublicKey);
 				var accessToken = new AccessToken(tokenRequest.AuthorizationDescription, accessTokenLifetime);
diff --git a/src/DotNetOpenAuth/OAuth2/ChannelElements/AccessRequestBindingElement.cs b/src/DotNetOpenAuth/OAuth2/ChannelElements/AccessRequestBindingElement.cs
index cc4bfef..0210bd1 100644
--- a/src/DotNetOpenAuth/OAuth2/ChannelElements/AccessRequestBindingElement.cs
+++ b/src/DotNetOpenAuth/OAuth2/ChannelElements/AccessRequestBindingElement.cs
@@ -53,7 +53,7 @@ namespace DotNetOpenAuth.OAuth2.ChannelElements {
 		/// <see cref="MessagePartAttribute.RequiredProtection"/> properties where applicable.
 		/// </remarks>
 		public override MessageProtections? ProcessOutgoingMessage(IProtocolMessage message) {
-			var response = message as ITokenCarryingRequest;
+			var response = message as IAuthorizationCarryingRequest;
 			if (response != null) {
 				switch (response.CodeOrTokenType) {
 					case CodeOrTokenType.AuthorizationCode:
@@ -96,7 +96,7 @@ namespace DotNetOpenAuth.OAuth2.ChannelElements {
 		/// <see cref="MessagePartAttribute.RequiredProtection"/> properties where applicable.
 		/// </remarks>
 		public override MessageProtections? ProcessIncomingMessage(IProtocolMessage message) {
-			var tokenRequest = message as ITokenCarryingRequest;
+			var tokenRequest = message as IAuthorizationCarryingRequest;
 			if (tokenRequest != null) {
 				try {
 					switch (tokenRequest.CodeOrTokenType) {
diff --git a/src/DotNetOpenAuth/OAuth2/ChannelElements/AuthorizationCodeBindingElement.cs b/src/DotNetOpenAuth/OAuth2/ChannelElements/AuthorizationCodeBindingElement.cs
index 58f3d42..31322a0 100644
--- a/src/DotNetOpenAuth/OAuth2/ChannelElements/AuthorizationCodeBindingElement.cs
+++ b/src/DotNetOpenAuth/OAuth2/ChannelElements/AuthorizationCodeBindingElement.cs
@@ -59,7 +59,7 @@ namespace DotNetOpenAuth.OAuth2.ChannelElements {
 			if (response != null) {
 				var directResponse = (IDirectResponseProtocolMessage)response;
 				var request = (EndUserAuthorizationRequest)directResponse.OriginatingRequest;
-				ITokenCarryingRequest tokenCarryingResponse = response;
+				IAuthorizationCarryingRequest tokenCarryingResponse = response;
 				tokenCarryingResponse.AuthorizationDescription = new AuthorizationCode(request.ClientIdentifier, request.Callback, request.Scope, response.AuthorizingUsername);
 
 				return MessageProtections.None;
@@ -88,7 +88,7 @@ namespace DotNetOpenAuth.OAuth2.ChannelElements {
 		public override MessageProtections? ProcessIncomingMessage(IProtocolMessage message) {
 			var request = message as AccessTokenAuthorizationCodeRequest;
 			if (request != null) {
-				ITokenCarryingRequest tokenRequest = request;
+				IAuthorizationCarryingRequest tokenRequest = request;
 				((AuthorizationCode)tokenRequest.AuthorizationDescription).VerifyCallback(request.Callback);
 
 				return MessageProtections.None;
diff --git a/src/DotNetOpenAuth/OAuth2/ChannelElements/ITokenCarryingRequest.cs b/src/DotNetOpenAuth/OAuth2/ChannelElements/IAuthorizationCarryingRequest.cs
index 4c8d33f..e450131 100644
--- a/src/DotNetOpenAuth/OAuth2/ChannelElements/ITokenCarryingRequest.cs
+++ b/src/DotNetOpenAuth/OAuth2/ChannelElements/IAuthorizationCarryingRequest.cs
@@ -1,5 +1,5 @@
 //-----------------------------------------------------------------------
-// <copyright file="ITokenCarryingRequest.cs" company="Andrew Arnott">
+// <copyright file="IAuthorizationCarryingRequest.cs" company="Andrew Arnott">
 //     Copyright (c) Andrew Arnott. All rights reserved.
 // </copyright>
 //-----------------------------------------------------------------------
@@ -33,7 +33,7 @@ namespace DotNetOpenAuth.OAuth2.ChannelElements {
 	/// <summary>
 	/// A message that carries some kind of token from the client to the authorization or resource server.
 	/// </summary>
-	internal interface ITokenCarryingRequest : IDirectedProtocolMessage {
+	internal interface IAuthorizationCarryingRequest : IDirectedProtocolMessage {
 		/// <summary>
 		/// Gets or sets the verification code or refresh/access token.
 		/// </summary>
diff --git a/src/DotNetOpenAuth/OAuth2/Messages/AccessProtectedResourceRequest.cs b/src/DotNetOpenAuth/OAuth2/Messages/AccessProtectedResourceRequest.cs
index 410592f..461ed08 100644
--- a/src/DotNetOpenAuth/OAuth2/Messages/AccessProtectedResourceRequest.cs
+++ b/src/DotNetOpenAuth/OAuth2/Messages/AccessProtectedResourceRequest.cs
@@ -15,7 +15,7 @@ namespace DotNetOpenAuth.OAuth2.Messages {
 	/// <summary>
 	/// A message that accompanies an HTTP request to a resource server that provides authorization.
 	/// </summary>
-	internal class AccessProtectedResourceRequest : MessageBase, ITokenCarryingRequest {
+	internal class AccessProtectedResourceRequest : MessageBase, IAuthorizationCarryingRequest {
 		/// <summary>
 		/// Initializes a new instance of the <see cref="AccessProtectedResourceRequest"/> class.
 		/// </summary>
@@ -29,7 +29,7 @@ namespace DotNetOpenAuth.OAuth2.Messages {
 		/// Gets the type of the code or token.
 		/// </summary>
 		/// <value>The type of the code or token.</value>
-		CodeOrTokenType ITokenCarryingRequest.CodeOrTokenType {
+		CodeOrTokenType IAuthorizationCarryingRequest.CodeOrTokenType {
 			get { return CodeOrTokenType.AccessToken; }
 		}
 
@@ -37,7 +37,7 @@ namespace DotNetOpenAuth.OAuth2.Messages {
 		/// Gets or sets the verification code or refresh/access token.
 		/// </summary>
 		/// <value>The code or token.</value>
-		string ITokenCarryingRequest.CodeOrToken {
+		string IAuthorizationCarryingRequest.CodeOrToken {
 			get { return this.AccessToken; }
 			set { this.AccessToken = value; }
 		}
@@ -45,7 +45,7 @@ namespace DotNetOpenAuth.OAuth2.Messages {
 		/// <summary>
 		/// Gets or sets the authorization that the token describes.
 		/// </summary>
-		IAuthorizationDescription ITokenCarryingRequest.AuthorizationDescription { get; set; }
+		IAuthorizationDescription IAuthorizationCarryingRequest.AuthorizationDescription { get; set; }
 
 		/// <summary>
 		/// Gets or sets the access token.
diff --git a/src/DotNetOpenAuth/OAuth2/Messages/AccessTokenAuthorizationCodeRequest.cs b/src/DotNetOpenAuth/OAuth2/Messages/AccessTokenAuthorizationCodeRequest.cs
index 3c7202e..b45b7ad 100644
--- a/src/DotNetOpenAuth/OAuth2/Messages/AccessTokenAuthorizationCodeRequest.cs
+++ b/src/DotNetOpenAuth/OAuth2/Messages/AccessTokenAuthorizationCodeRequest.cs
@@ -17,7 +17,7 @@ namespace DotNetOpenAuth.OAuth2.Messages {
 	/// <summary>
 	/// A request from a Client to an Authorization Server to exchange an authorization code for an access token.
 	/// </summary>
-	internal class AccessTokenAuthorizationCodeRequest : AccessTokenRequestBase, ITokenCarryingRequest {
+	internal class AccessTokenAuthorizationCodeRequest : AccessTokenRequestBase, IAuthorizationCarryingRequest {
 		/// <summary>
 		/// Initializes a new instance of the <see cref="AccessTokenAuthorizationCodeRequest"/> class.
 		/// </summary>
@@ -41,7 +41,7 @@ namespace DotNetOpenAuth.OAuth2.Messages {
 		/// Gets the type of the code or token.
 		/// </summary>
 		/// <value>The type of the code or token.</value>
-		CodeOrTokenType ITokenCarryingRequest.CodeOrTokenType {
+		CodeOrTokenType IAuthorizationCarryingRequest.CodeOrTokenType {
 			get { return CodeOrTokenType.AuthorizationCode; }
 		}
 
@@ -49,7 +49,7 @@ namespace DotNetOpenAuth.OAuth2.Messages {
 		/// Gets or sets the verification code or refresh/access token.
 		/// </summary>
 		/// <value>The code or token.</value>
-		string ITokenCarryingRequest.CodeOrToken {
+		string IAuthorizationCarryingRequest.CodeOrToken {
 			get { return this.AuthorizationCode; }
 			set { this.AuthorizationCode = value; }
 		}
@@ -57,7 +57,7 @@ namespace DotNetOpenAuth.OAuth2.Messages {
 		/// <summary>
 		/// Gets or sets the authorization that the token describes.
 		/// </summary>
-		IAuthorizationDescription ITokenCarryingRequest.AuthorizationDescription { get; set; }
+		IAuthorizationDescription IAuthorizationCarryingRequest.AuthorizationDescription { get; set; }
 
 		/// <summary>
 		/// Gets the type of the grant.
diff --git a/src/DotNetOpenAuth/OAuth2/Messages/AccessTokenRefreshRequest.cs b/src/DotNetOpenAuth/OAuth2/Messages/AccessTokenRefreshRequest.cs
index 66b2497..22354e4 100644
--- a/src/DotNetOpenAuth/OAuth2/Messages/AccessTokenRefreshRequest.cs
+++ b/src/DotNetOpenAuth/OAuth2/Messages/AccessTokenRefreshRequest.cs
@@ -14,7 +14,7 @@ namespace DotNetOpenAuth.OAuth2.Messages {
 	/// A request from the client to the token endpoint for a new access token
 	/// in exchange for a refresh token that the client has previously obtained.
 	/// </summary>
-	internal class AccessTokenRefreshRequest : ScopedAccessTokenRequest, ITokenCarryingRequest {
+	internal class AccessTokenRefreshRequest : ScopedAccessTokenRequest, IAuthorizationCarryingRequest {
 		/// <summary>
 		/// Initializes a new instance of the <see cref="AccessTokenRefreshRequest"/> class.
 		/// </summary>
@@ -36,7 +36,7 @@ namespace DotNetOpenAuth.OAuth2.Messages {
 		/// Gets the type of the code or token.
 		/// </summary>
 		/// <value>The type of the code or token.</value>
-		CodeOrTokenType ITokenCarryingRequest.CodeOrTokenType {
+		CodeOrTokenType IAuthorizationCarryingRequest.CodeOrTokenType {
 			get { return CodeOrTokenType.RefreshToken; }
 		}
 
@@ -44,7 +44,7 @@ namespace DotNetOpenAuth.OAuth2.Messages {
 		/// Gets or sets the verification code or refresh/access token.
 		/// </summary>
 		/// <value>The code or token.</value>
-		string ITokenCarryingRequest.CodeOrToken {
+		string IAuthorizationCarryingRequest.CodeOrToken {
 			get { return this.RefreshToken; }
 			set { this.RefreshToken = value; }
 		}
@@ -52,7 +52,7 @@ namespace DotNetOpenAuth.OAuth2.Messages {
 		/// <summary>
 		/// Gets or sets the authorization that the token describes.
 		/// </summary>
-		IAuthorizationDescription ITokenCarryingRequest.AuthorizationDescription { get; set; }
+		IAuthorizationDescription IAuthorizationCarryingRequest.AuthorizationDescription { get; set; }
 
 		/// <summary>
 		/// Gets or sets the refresh token.
diff --git a/src/DotNetOpenAuth/OAuth2/Messages/EndUserAuthorizationSuccessAccessTokenResponse.cs b/src/DotNetOpenAuth/OAuth2/Messages/EndUserAuthorizationSuccessAccessTokenResponse.cs
index 975f0b0..f5edfa8 100644
--- a/src/DotNetOpenAuth/OAuth2/Messages/EndUserAuthorizationSuccessAccessTokenResponse.cs
+++ b/src/DotNetOpenAuth/OAuth2/Messages/EndUserAuthorizationSuccessAccessTokenResponse.cs
@@ -19,7 +19,7 @@ namespace DotNetOpenAuth.OAuth2.Messages {
 	/// to indicate that user authorization was granted, carrying only an access token,
 	/// and to return the user to the Client where they started their experience.
 	/// </summary>
-	internal class EndUserAuthorizationSuccessAccessTokenResponse : EndUserAuthorizationSuccessResponseBase, ITokenCarryingRequest, IHttpIndirectResponse {
+	internal class EndUserAuthorizationSuccessAccessTokenResponse : EndUserAuthorizationSuccessResponseBase, IAuthorizationCarryingRequest, IHttpIndirectResponse {
 		/// <summary>
 		/// Initializes a new instance of the <see cref="EndUserAuthorizationSuccessAccessTokenResponse"/> class.
 		/// </summary>
@@ -49,7 +49,7 @@ namespace DotNetOpenAuth.OAuth2.Messages {
 		/// Gets or sets the verification code or refresh/access token.
 		/// </summary>
 		/// <value>The code or token.</value>
-		string ITokenCarryingRequest.CodeOrToken {
+		string IAuthorizationCarryingRequest.CodeOrToken {
 			get { return this.AccessToken; }
 			set { this.AccessToken = value; }
 		}
@@ -58,7 +58,7 @@ namespace DotNetOpenAuth.OAuth2.Messages {
 		/// Gets the type of the code or token.
 		/// </summary>
 		/// <value>The type of the code or token.</value>
-		CodeOrTokenType ITokenCarryingRequest.CodeOrTokenType {
+		CodeOrTokenType IAuthorizationCarryingRequest.CodeOrTokenType {
 			get { return CodeOrTokenType.AccessToken; }
 		}
 
@@ -66,7 +66,7 @@ namespace DotNetOpenAuth.OAuth2.Messages {
 		/// Gets or sets the authorization that the token describes.
 		/// </summary>
 		/// <value></value>
-		IAuthorizationDescription ITokenCarryingRequest.AuthorizationDescription { get; set; }
+		IAuthorizationDescription IAuthorizationCarryingRequest.AuthorizationDescription { get; set; }
 
 		#endregion
 
diff --git a/src/DotNetOpenAuth/OAuth2/Messages/EndUserAuthorizationSuccessAuthCodeResponse.cs b/src/DotNetOpenAuth/OAuth2/Messages/EndUserAuthorizationSuccessAuthCodeResponse.cs
index 6302304..af7f913 100644
--- a/src/DotNetOpenAuth/OAuth2/Messages/EndUserAuthorizationSuccessAuthCodeResponse.cs
+++ b/src/DotNetOpenAuth/OAuth2/Messages/EndUserAuthorizationSuccessAuthCodeResponse.cs
@@ -16,7 +16,7 @@ namespace DotNetOpenAuth.OAuth2.Messages {
 	/// to indicate that user authorization was granted, carrying an authorization code and possibly an access token,
 	/// and to return the user to the Client where they started their experience.
 	/// </summary>
-	internal class EndUserAuthorizationSuccessAuthCodeResponse : EndUserAuthorizationSuccessResponseBase, ITokenCarryingRequest {
+	internal class EndUserAuthorizationSuccessAuthCodeResponse : EndUserAuthorizationSuccessResponseBase, IAuthorizationCarryingRequest {
 		/// <summary>
 		/// Initializes a new instance of the <see cref="EndUserAuthorizationSuccessAuthCodeResponse"/> class.
 		/// </summary>
@@ -46,7 +46,7 @@ namespace DotNetOpenAuth.OAuth2.Messages {
 		/// Gets or sets the verification code or refresh/access token.
 		/// </summary>
 		/// <value>The code or token.</value>
-		string ITokenCarryingRequest.CodeOrToken {
+		string IAuthorizationCarryingRequest.CodeOrToken {
 			get { return this.AuthorizationCode; }
 			set { this.AuthorizationCode = value; }
 		}
@@ -55,14 +55,14 @@ namespace DotNetOpenAuth.OAuth2.Messages {
 		/// Gets the type of the code or token.
 		/// </summary>
 		/// <value>The type of the code or token.</value>
-		CodeOrTokenType ITokenCarryingRequest.CodeOrTokenType {
+		CodeOrTokenType IAuthorizationCarryingRequest.CodeOrTokenType {
 			get { return CodeOrTokenType.AuthorizationCode; }
 		}
 
 		/// <summary>
 		/// Gets or sets the authorization that the token describes.
 		/// </summary>
-		IAuthorizationDescription ITokenCarryingRequest.AuthorizationDescription { get; set; }
+		IAuthorizationDescription IAuthorizationCarryingRequest.AuthorizationDescription { get; set; }
 
 		#endregion
 
diff --git a/src/DotNetOpenAuth/OAuth2/Messages/OAuth 2 Messages.cd b/src/DotNetOpenAuth/OAuth2/Messages/OAuth 2 Messages.cd
index caacdff..9ddd0cc 100644
--- a/src/DotNetOpenAuth/OAuth2/Messages/OAuth 2 Messages.cd
+++ b/src/DotNetOpenAuth/OAuth2/Messages/OAuth 2 Messages.cd
@@ -10,28 +10,14 @@
   </Class>
   <Class Name="DotNetOpenAuth.OAuth2.Messages.AccessTokenAuthorizationCodeRequest" Collapsed="true">
     <Position X="6.75" Y="6.75" Width="3" />
-    <InheritanceLine Type="DotNetOpenAuth.OAuth2.Messages.AccessTokenRequestBase" FixedFromPoint="true" FixedToPoint="true">
-      <Path>
-        <Point X="6.5" Y="6.441" />
-        <Point X="6.5" Y="7.062" />
-        <Point X="6.75" Y="7.062" />
-      </Path>
-    </InheritanceLine>
-    <TypeIdentifier>
-      <HashCode>CCAAAAAAAAACAAAAAAAAAAAQAAAAAAAAAAAAAAAAQAA=</HashCode>
+    <TypeIdentifier>
+      <HashCode>ACAAEAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAgAAAARAA=</HashCode>
       <FileName>OAuth2\Messages\AccessTokenAuthorizationCodeRequest.cs</FileName>
     </TypeIdentifier>
     <Lollipop Position="0.2" />
   </Class>
   <Class Name="DotNetOpenAuth.OAuth2.Messages.AccessTokenClientCredentialsRequest" Collapsed="true">
     <Position X="8.5" Y="8.75" Width="2.75" />
-    <InheritanceLine Type="DotNetOpenAuth.OAuth2.Messages.ScopedAccessTokenRequest" FixedToPoint="true">
-      <Path>
-        <Point X="7.875" Y="8.441" />
-        <Point X="7.875" Y="9.062" />
-        <Point X="8.5" Y="9.062" />
-      </Path>
-    </InheritanceLine>
     <TypeIdentifier>
       <HashCode>AAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAA=</HashCode>
       <FileName>OAuth2\Messages\AccessTokenClientCredentialsRequest.cs</FileName>
@@ -39,13 +25,6 @@
   </Class>
   <Class Name="DotNetOpenAuth.OAuth2.Messages.AccessTokenFailedResponse" Collapsed="true">
     <Position X="3.25" Y="8.5" Width="2.25" />
-    <InheritanceLine Type="DotNetOpenAuth.OAuth2.Messages.MessageBase" FixedToPoint="true">
-      <Path>
-        <Point X="1.25" Y="1.062" />
-        <Point X="1.25" Y="8.812" />
-        <Point X="3.25" Y="8.812" />
-      </Path>
-    </InheritanceLine>
     <TypeIdentifier>
       <HashCode>AAAAAIAAAAAAAQAAAABAAAQAAAAAAAEQAAAAAAAAAAA=</HashCode>
       <FileName>OAuth2\Messages\AccessTokenFailedResponse.cs</FileName>
@@ -54,28 +33,14 @@
   </Class>
   <Class Name="DotNetOpenAuth.OAuth2.Messages.AccessTokenRefreshRequest" Collapsed="true">
     <Position X="8.5" Y="9.75" Width="2.25" />
-    <InheritanceLine Type="DotNetOpenAuth.OAuth2.Messages.ScopedAccessTokenRequest" FixedToPoint="true">
-      <Path>
-        <Point X="7.875" Y="8.441" />
-        <Point X="7.875" Y="10.125" />
-        <Point X="8.5" Y="10.125" />
-      </Path>
-    </InheritanceLine>
-    <TypeIdentifier>
-      <HashCode>CCAAAAAAQAACACAAAAAAAAAQAAAAAAAAAAAAAAAAAAA=</HashCode>
+    <TypeIdentifier>
+      <HashCode>AAAAEAAAQAAAAAAAAAAAAAAQAAAAAAAAAAAgAAAABAA=</HashCode>
       <FileName>OAuth2\Messages\AccessTokenRefreshRequest.cs</FileName>
     </TypeIdentifier>
     <Lollipop Position="0.2" />
   </Class>
   <Class Name="DotNetOpenAuth.OAuth2.Messages.AccessTokenRequestBase" Collapsed="true">
     <Position X="5.75" Y="5.75" Width="2" />
-    <InheritanceLine Type="DotNetOpenAuth.OAuth2.Messages.AuthenticatedClientRequestBase" FixedFromPoint="true">
-      <Path>
-        <Point X="4.375" Y="5.941" />
-        <Point X="4.375" Y="6.096" />
-        <Point X="5.75" Y="6.096" />
-      </Path>
-    </InheritanceLine>
     <TypeIdentifier>
       <HashCode>AAAAAAAAQAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAA=</HashCode>
       <FileName>OAuth2\Messages\AccessTokenRequestBase.cs</FileName>
@@ -84,19 +49,12 @@
   <Class Name="DotNetOpenAuth.OAuth2.Messages.AccessTokenResourceOwnerPasswordCredentialsRequest" Collapsed="true">
     <Position X="8.5" Y="10.5" Width="4" />
     <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAACAAAAAAAAAQAAAAAAACAQAAAAAAAAA=</HashCode>
+      <HashCode>AAAAAAAAAAAAAAAAAAAAAAAQAAAAAAACAQAAAAAAAAA=</HashCode>
       <FileName>OAuth2\Messages\AccessTokenResourceOwnerPasswordCredentialsRequest.cs</FileName>
     </TypeIdentifier>
   </Class>
   <Class Name="DotNetOpenAuth.OAuth2.Messages.AccessTokenSuccessResponse" Collapsed="true">
     <Position X="3.25" Y="7.5" Width="2.25" />
-    <InheritanceLine Type="DotNetOpenAuth.OAuth2.Messages.MessageBase" FixedToPoint="true">
-      <Path>
-        <Point X="1.25" Y="1.062" />
-        <Point X="1.25" Y="7.812" />
-        <Point X="3.25" Y="7.812" />
-      </Path>
-    </InheritanceLine>
     <TypeIdentifier>
       <HashCode>AAAAAAAAQAAAACAAAAAAAAQAEAAAAAAQAEAAAAAAAgA=</HashCode>
       <FileName>OAuth2\Messages\AccessTokenSuccessResponse.cs</FileName>
@@ -112,13 +70,6 @@
   </Class>
   <Class Name="DotNetOpenAuth.OAuth2.Messages.EndUserAuthorizationFailedResponse" Collapsed="true">
     <Position X="3.25" Y="4.5" Width="2.75" />
-    <InheritanceLine Type="DotNetOpenAuth.OAuth2.Messages.MessageBase" FixedToPoint="true">
-      <Path>
-        <Point X="1.25" Y="1.062" />
-        <Point X="1.25" Y="4.875" />
-        <Point X="3.25" Y="4.875" />
-      </Path>
-    </InheritanceLine>
     <TypeIdentifier>
       <HashCode>AAAAAIAAAAAAAQAAAAAAAAgAAAAAAAEAAAAAAAAAAAA=</HashCode>
       <FileName>OAuth2\Messages\EndUserAuthorizationFailedResponse.cs</FileName>
@@ -134,43 +85,22 @@
   </Class>
   <Class Name="DotNetOpenAuth.OAuth2.Messages.EndUserAuthorizationSuccessAccessTokenResponse" Collapsed="true">
     <Position X="6.25" Y="3.75" Width="3.75" />
-    <InheritanceLine Type="DotNetOpenAuth.OAuth2.Messages.EndUserAuthorizationSuccessResponseBase" FixedToPoint="true">
-      <Path>
-        <Point X="4.625" Y="2.191" />
-        <Point X="4.625" Y="4.062" />
-        <Point X="6.25" Y="4.062" />
-      </Path>
-    </InheritanceLine>
-    <TypeIdentifier>
-      <HashCode>CCAAAAAAAAACAAAAAAAAAAACEAAAAAAAAAAAAAAAAgA=</HashCode>
+    <TypeIdentifier>
+      <HashCode>AAAAEAAAAAAAAAAAAAAAAAACEAAAAAAAAAAgAAAABgA=</HashCode>
       <FileName>OAuth2\Messages\EndUserAuthorizationSuccessAccessTokenResponse.cs</FileName>
     </TypeIdentifier>
     <Lollipop Position="0.2" />
   </Class>
   <Class Name="DotNetOpenAuth.OAuth2.Messages.EndUserAuthorizationSuccessAuthCodeResponse" Collapsed="true">
     <Position X="6.25" Y="2.5" Width="3.5" />
-    <InheritanceLine Type="DotNetOpenAuth.OAuth2.Messages.EndUserAuthorizationSuccessResponseBase" FixedToPoint="true">
-      <Path>
-        <Point X="4.625" Y="2.191" />
-        <Point X="4.625" Y="2.875" />
-        <Point X="6.25" Y="2.875" />
-      </Path>
-    </InheritanceLine>
-    <TypeIdentifier>
-      <HashCode>CCAAAAAAAAACAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAA=</HashCode>
+    <TypeIdentifier>
+      <HashCode>ACAAEAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAgAAAABAA=</HashCode>
       <FileName>OAuth2\Messages\EndUserAuthorizationSuccessAuthCodeResponse.cs</FileName>
     </TypeIdentifier>
     <Lollipop Position="0.2" />
   </Class>
   <Class Name="DotNetOpenAuth.OAuth2.Messages.EndUserAuthorizationSuccessResponseBase" Collapsed="true">
     <Position X="3.25" Y="1.5" Width="2.75" />
-    <InheritanceLine Type="DotNetOpenAuth.OAuth2.Messages.MessageBase" FixedToPoint="true">
-      <Path>
-        <Point X="1.25" Y="1.062" />
-        <Point X="1.25" Y="1.75" />
-        <Point X="3.25" Y="1.75" />
-      </Path>
-    </InheritanceLine>
     <TypeIdentifier>
       <HashCode>AAACAAAAAAAAACAAAAAAAAgAAAAAAAAAAEAAAAAAAAA=</HashCode>
       <FileName>OAuth2\Messages\EndUserAuthorizationSuccessResponseBase.cs</FileName>
@@ -179,28 +109,14 @@
   </Class>
   <Class Name="DotNetOpenAuth.OAuth2.Messages.AccessProtectedResourceRequest" Collapsed="true">
     <Position X="3.25" Y="9.75" Width="2.5" />
-    <InheritanceLine Type="DotNetOpenAuth.OAuth2.Messages.MessageBase" FixedToPoint="true">
-      <Path>
-        <Point X="1.25" Y="1.062" />
-        <Point X="1.25" Y="10" />
-        <Point X="3.25" Y="10" />
-      </Path>
-    </InheritanceLine>
-    <TypeIdentifier>
-      <HashCode>CCAAAAAAQAACAAAAAAACAAAAEAAAAAAAAAEAAAQACAE=</HashCode>
+    <TypeIdentifier>
+      <HashCode>AAAAEAAAQAAAAAAAAAACAAAAEAAAAAAAAAEgAAQADAE=</HashCode>
       <FileName>OAuth2\Messages\AccessProtectedResourceRequest.cs</FileName>
     </TypeIdentifier>
     <Lollipop Position="0.2" />
   </Class>
   <Class Name="DotNetOpenAuth.OAuth2.Messages.UnauthorizedResponse" Collapsed="true">
     <Position X="3.25" Y="10.75" Width="2" />
-    <InheritanceLine Type="DotNetOpenAuth.OAuth2.Messages.MessageBase" FixedToPoint="true">
-      <Path>
-        <Point X="1.25" Y="1.062" />
-        <Point X="1.25" Y="11.125" />
-        <Point X="3.25" Y="11.125" />
-      </Path>
-    </InheritanceLine>
     <TypeIdentifier>
       <HashCode>AUABAAAAAAAAACAAAAAAAAQIAAAAAAAQAAAAAAAAABA=</HashCode>
       <FileName>OAuth2\Messages\UnauthorizedResponse.cs</FileName>
@@ -209,13 +125,6 @@
   </Class>
   <Class Name="DotNetOpenAuth.OAuth2.Messages.ScopedAccessTokenRequest" Collapsed="true">
     <Position X="6.75" Y="7.75" Width="2.25" />
-    <InheritanceLine Type="DotNetOpenAuth.OAuth2.Messages.AccessTokenRequestBase" FixedFromPoint="true" FixedToPoint="true">
-      <Path>
-        <Point X="6.5" Y="6.441" />
-        <Point X="6.5" Y="8.125" />
-        <Point X="6.75" Y="8.125" />
-      </Path>
-    </InheritanceLine>
     <TypeIdentifier>
       <HashCode>AAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
       <FileName>OAuth2\Messages\ScopedAccessTokenRequest.cs</FileName>