Namespace and public api fixes to OpenID extensions after the DLL refactoring.

5 files changed, 35 insertions, 16 deletions

diff --git a/src/DotNetOpenAuth.OpenId.RelyingParty/DotNetOpenAuth.OpenId.RelyingParty.csproj b/src/DotNetOpenAuth.OpenId.RelyingParty/DotNetOpenAuth.OpenId.RelyingParty.csproj
index 46cc5b5..cab4f75 100644
--- a/src/DotNetOpenAuth.OpenId.RelyingParty/DotNetOpenAuth.OpenId.RelyingParty.csproj
+++ b/src/DotNetOpenAuth.OpenId.RelyingParty/DotNetOpenAuth.OpenId.RelyingParty.csproj
@@ -28,8 +28,7 @@
     <Compile Include="OpenId\ChannelElements\RelyingPartySecurityOptions.cs" />
     <Compile Include="OpenId\ChannelElements\RelyingPartySigningBindingElement.cs" />
     <Compile Include="OpenId\ChannelElements\ReturnToNonceBindingElement.cs" />
-    <Compile Include="OpenId\Extensions\ExtensionsInteropRelyingPartyHelper.cs" />
-    <Compile Include="OpenId\Extensions\UI\UIUtilities.cs" />
+    <Compile Include="OpenId\RelyingParty\Extensions\ExtensionsInteropHelper.cs" />
     <Compile Include="OpenId\HostMetaDiscoveryService.cs" />
     <Compile Include="OpenId\Interop\AuthenticationResponseShim.cs" />
     <Compile Include="OpenId\Interop\ClaimsResponseShim.cs" />
@@ -40,6 +39,7 @@
     <Compile Include="OpenId\Messages\IAssociateSuccessfulResponseRelyingParty.cs" />
     <Compile Include="OpenId\Messages\AssociateUnencryptedResponseRelyingParty.cs" />
     <Compile Include="OpenId\RelyingParty\CryptoKeyStoreAsRelyingPartyAssociationStore.cs" />
+    <Compile Include="OpenId\RelyingParty\Extensions\UIUtilities.cs" />
     <Compile Include="OpenId\RelyingParty\IRelyingPartyAssociationStore.cs" />
     <Compile Include="OpenId\RelyingParty\Associations.cs" />
     <Compile Include="OpenId\RelyingParty\AssociationManager.cs" />
diff --git a/src/DotNetOpenAuth.OpenId.RelyingParty/OpenId/Extensions/ExtensionsInteropRelyingPartyHelper.cs b/src/DotNetOpenAuth.OpenId.RelyingParty/OpenId/RelyingParty/Extensions/ExtensionsInteropHelper.cs
index 134aa16..745d849 100644
--- a/src/DotNetOpenAuth.OpenId.RelyingParty/OpenId/Extensions/ExtensionsInteropRelyingPartyHelper.cs
+++ b/src/DotNetOpenAuth.OpenId.RelyingParty/OpenId/RelyingParty/Extensions/ExtensionsInteropHelper.cs
@@ -4,7 +4,7 @@
 // </copyright>
 //-----------------------------------------------------------------------
 
-namespace DotNetOpenAuth.OpenId.Extensions {
+namespace DotNetOpenAuth.OpenId.RelyingParty.Extensions {
 	using System;
 	using System.Collections.Generic;
 	using System.Diagnostics.CodeAnalysis;
@@ -19,7 +19,7 @@ namespace DotNetOpenAuth.OpenId.Extensions {
 	/// A set of methods designed to assist in improving interop across different
 	/// OpenID implementations and their extensions.
 	/// </summary>
-	public static class ExtensionsInteropRelyingPartyHelper {
+	public static class ExtensionsInteropHelper {
 		/// <summary>
 		/// Adds an Attribute Exchange (AX) extension to the authentication request
 		/// that asks for the same attributes as the Simple Registration (sreg) extension
diff --git a/src/DotNetOpenAuth.OpenId.RelyingParty/OpenId/Extensions/UI/UIUtilities.cs b/src/DotNetOpenAuth.OpenId.RelyingParty/OpenId/RelyingParty/Extensions/UIUtilities.cs
index a24aaba..4caf9f9 100644
--- a/src/DotNetOpenAuth.OpenId.RelyingParty/OpenId/Extensions/UI/UIUtilities.cs
+++ b/src/DotNetOpenAuth.OpenId.RelyingParty/OpenId/RelyingParty/Extensions/UIUtilities.cs
@@ -4,7 +4,7 @@
 // </copyright>
 //-----------------------------------------------------------------------
 
-namespace DotNetOpenAuth.OpenId.Extensions.UI {
+namespace DotNetOpenAuth.OpenId.RelyingParty.Extensions.UI {
 	using System;
 	using System.Diagnostics.Contracts;
 	using System.Globalization;
@@ -14,17 +14,7 @@ namespace DotNetOpenAuth.OpenId.Extensions.UI {
 	/// <summary>
 	/// Constants used in implementing support for the UI extension.
 	/// </summary>
-	public static class UIUtilities {
-		/// <summary>
-		/// The required width of the popup window the relying party creates for the provider.
-		/// </summary>
-		public const int PopupWidth = 500; // UI extension calls for 450px, but Yahoo needs 500px
-
-		/// <summary>
-		/// The required height of the popup window the relying party creates for the provider.
-		/// </summary>
-		public const int PopupHeight = 500;
-
+	internal static class UIUtilities {
 		/// <summary>
 		/// Gets the <c>window.open</c> javascript snippet to use to open a popup window
 		/// compliant with the UI extension.
diff --git a/src/DotNetOpenAuth.OpenId/DotNetOpenAuth.OpenId.csproj b/src/DotNetOpenAuth.OpenId/DotNetOpenAuth.OpenId.csproj
index a5d04e1..e02ecf8 100644
--- a/src/DotNetOpenAuth.OpenId/DotNetOpenAuth.OpenId.csproj
+++ b/src/DotNetOpenAuth.OpenId/DotNetOpenAuth.OpenId.csproj
@@ -85,6 +85,7 @@
     <Compile Include="OpenId\Extensions\UI\UIConstants.cs" />
     <Compile Include="OpenId\Extensions\UI\UIModes.cs" />
     <Compile Include="OpenId\Extensions\UI\UIRequest.cs" />
+    <Compile Include="OpenId\Extensions\UI\UIUtilities.cs" />
     <Compile Include="OpenId\Identifier.cs" />
     <Compile Include="OpenId\IdentifierContract.cs" />
     <Compile Include="OpenId\Extensions\ExtensionsInteropHelper.cs" />
diff --git a/src/DotNetOpenAuth.OpenId/OpenId/Extensions/UI/UIUtilities.cs b/src/DotNetOpenAuth.OpenId/OpenId/Extensions/UI/UIUtilities.cs
new file mode 100644
index 0000000..478666b
--- /dev/null
+++ b/src/DotNetOpenAuth.OpenId/OpenId/Extensions/UI/UIUtilities.cs
@@ -0,0 +1,28 @@
+//-----------------------------------------------------------------------
+// <copyright file="UIUtilities.cs" company="Andrew Arnott">
+//     Copyright (c) Andrew Arnott. All rights reserved.
+// </copyright>
+//-----------------------------------------------------------------------
+
+namespace DotNetOpenAuth.OpenId.Extensions.UI {
+	using System;
+	using System.Diagnostics.Contracts;
+	using System.Globalization;
+	using DotNetOpenAuth.Messaging;
+	using DotNetOpenAuth.OpenId.RelyingParty;
+
+	/// <summary>
+	/// Constants used in implementing support for the UI extension.
+	/// </summary>
+	public static class UIUtilities {
+		/// <summary>
+		/// The required width of the popup window the relying party creates for the provider.
+		/// </summary>
+		public const int PopupWidth = 500; // UI extension calls for 450px, but Yahoo needs 500px
+
+		/// <summary>
+		/// The required height of the popup window the relying party creates for the provider.
+		/// </summary>
+		public const int PopupHeight = 500;
+	}
+}