Merge branch 'v2.5' into monoorigin/mono

Conflicts:
	src/DotNetOpenId/Properties/AssemblyInfo.cs
	src/DotNetOpenId/RelyingParty/AuthenticationResponse.cs

1 files changed, 27 insertions, 0 deletions

diff --git a/src/DotNetOpenId/Configuration/ProviderSection.cs b/src/DotNetOpenId/Configuration/ProviderSection.cs
new file mode 100644
index 0000000..cfd6052
--- /dev/null
+++ b/src/DotNetOpenId/Configuration/ProviderSection.cs
@@ -0,0 +1,27 @@
+using System.Configuration;

+using DotNetOpenId.Provider;

+using IProviderAssociationStore = DotNetOpenId.IAssociationStore<DotNetOpenId.AssociationRelyingPartyType>;

+

+namespace DotNetOpenId.Configuration {

+	internal class ProviderSection : ConfigurationSection {

+		internal static ProviderSection Configuration {

+			get { return (ProviderSection)ConfigurationManager.GetSection("dotNetOpenId/provider") ?? new ProviderSection(); }

+		}

+

+		public ProviderSection() { }

+

+		const string securitySettingsConfigName = "security";

+		[ConfigurationProperty(securitySettingsConfigName)]

+		public ProviderSecuritySettingsElement SecuritySettings {

+			get { return (ProviderSecuritySettingsElement)this[securitySettingsConfigName] ?? new ProviderSecuritySettingsElement(); }

+			set { this[securitySettingsConfigName] = value; }

+		}

+

+		const string storeConfigName = "store";

+		[ConfigurationProperty(storeConfigName)]

+		public StoreConfigurationElement<IProviderAssociationStore> Store {

+			get { return (StoreConfigurationElement<IProviderAssociationStore>)this[storeConfigName] ?? new StoreConfigurationElement<IProviderAssociationStore>(); }

+			set { this[storeConfigName] = value; }

+		}

+	}

+}