7 files changed, 46 insertions, 11 deletions
diff --git a/src/DotNetOpenAuth.Core/Configuration/TypeConfigurationCollection.cs b/src/DotNetOpenAuth.Core/Configuration/TypeConfigurationCollection.cs
index 08bd2a1..0eab939 100644
--- a/src/DotNetOpenAuth.Core/Configuration/TypeConfigurationCollection.cs
+++ b/src/DotNetOpenAuth.Core/Configuration/TypeConfigurationCollection.cs
@@ -42,10 +42,10 @@ namespace DotNetOpenAuth.Configuration {
 		/// </summary>
 		/// <param name="allowInternals">if set to <c>true</c> then internal types may be instantiated.</param>
 		/// <returns>A sequence of instances generated from types in this collection.  May be empty, but never null.</returns>
-		internal IEnumerable<T> CreateInstances(bool allowInternals) {
+		internal IEnumerable<T> CreateInstances(bool allowInternals, IHostFactories hostFactories) {
 			return from element in this.Cast<TypeConfigurationElement<T>>()
 			       where !element.IsEmpty
-			       select element.CreateInstance(default(T), allowInternals);
+			       select element.CreateInstance(default(T), allowInternals, hostFactories);
 		}
 
 		/// <summary>
diff --git a/src/DotNetOpenAuth.Core/Configuration/TypeConfigurationElement.cs b/src/DotNetOpenAuth.Core/Configuration/TypeConfigurationElement.cs
index d554832..8b3efe0 100644
--- a/src/DotNetOpenAuth.Core/Configuration/TypeConfigurationElement.cs
+++ b/src/DotNetOpenAuth.Core/Configuration/TypeConfigurationElement.cs
@@ -76,8 +76,8 @@ namespace DotNetOpenAuth.Configuration {
 		/// </summary>
 		/// <param name="defaultValue">The value to return if no type is given in the .config file.</param>
 		/// <returns>The newly instantiated type.</returns>
-		public T CreateInstance(T defaultValue) {
-			return this.CreateInstance(defaultValue, false);
+		public T CreateInstance(T defaultValue, IHostFactories hostFactories) {
+			return this.CreateInstance(defaultValue, false, hostFactories);
 		}
 
 		/// <summary>
@@ -85,9 +85,13 @@ namespace DotNetOpenAuth.Configuration {
 		/// </summary>
 		/// <param name="defaultValue">The value to return if no type is given in the .config file.</param>
 		/// <param name="allowInternals">if set to <c>true</c> then internal types may be instantiated.</param>
-		/// <returns>The newly instantiated type.</returns>
+		/// <param name="hostFactories">The host factories.</param>
+		/// <returns>
+		/// The newly instantiated type.
+		/// </returns>
 		[SuppressMessage("Microsoft.Reliability", "CA2000:Dispose objects before losing scope", Justification = "No apparent problem.  False positive?")]
-		public T CreateInstance(T defaultValue, bool allowInternals) {
+		public T CreateInstance(T defaultValue, bool allowInternals, IHostFactories hostFactories) {
+			T instance;
 			if (this.CustomType != null) {
 				if (!allowInternals) {
 					// Although .NET will usually prevent our instantiating non-public types,
@@ -95,7 +99,7 @@ namespace DotNetOpenAuth.Configuration {
 					// But we don't want the host site to be able to do this, so we check ourselves.
 					ErrorUtilities.VerifyArgument((this.CustomType.Attributes & TypeAttributes.Public) != 0, Strings.ConfigurationTypeMustBePublic, this.CustomType.FullName);
 				}
-				return (T)Activator.CreateInstance(this.CustomType);
+				instance = (T)Activator.CreateInstance(this.CustomType);
 			} else if (!string.IsNullOrEmpty(this.XamlSource)) {
 				string source = this.XamlSource;
 				if (source.StartsWith("~/", StringComparison.Ordinal)) {
@@ -103,11 +107,18 @@ namespace DotNetOpenAuth.Configuration {
 					source = HttpContext.Current.Server.MapPath(source);
 				}
 				using (Stream xamlFile = File.OpenRead(source)) {
-					return CreateInstanceFromXaml(xamlFile);
+					instance = CreateInstanceFromXaml(xamlFile);
 				}
 			} else {
-				return defaultValue;
+				instance = defaultValue;
+			}
+
+			var requiresHostFactories = instance as IRequireHostFactories;
+			if (requiresHostFactories != null) {
+				requiresHostFactories.HostFactories = hostFactories;
 			}
+
+			return instance;
 		}
 
 		/// <summary>
diff --git a/src/DotNetOpenAuth.Core/DotNetOpenAuth.Core.csproj b/src/DotNetOpenAuth.Core/DotNetOpenAuth.Core.csproj
index e539ea1..ccba40f 100644
--- a/src/DotNetOpenAuth.Core/DotNetOpenAuth.Core.csproj
+++ b/src/DotNetOpenAuth.Core/DotNetOpenAuth.Core.csproj
@@ -21,6 +21,7 @@
   <ItemGroup>
     <Compile Include="Assumes.cs" />
     <Compile Include="IHostFactories.cs" />
+    <Compile Include="IRequireHostFactories.cs" />
     <Compile Include="Messaging\Base64WebEncoder.cs" />
     <Compile Include="Messaging\Bindings\AsymmetricCryptoKeyStoreWrapper.cs" />
     <Compile Include="Messaging\Bindings\CryptoKey.cs" />
diff --git a/src/DotNetOpenAuth.Core/IRequireHostFactories.cs b/src/DotNetOpenAuth.Core/IRequireHostFactories.cs
new file mode 100644
index 0000000..b2d7af8
--- /dev/null
+++ b/src/DotNetOpenAuth.Core/IRequireHostFactories.cs
@@ -0,0 +1,11 @@
+//-----------------------------------------------------------------------
+// <copyright file="IRequireHostFactories.cs" company="Andrew Arnott">
+//     Copyright (c) Andrew Arnott. All rights reserved.
+// </copyright>
+//-----------------------------------------------------------------------
+
+namespace DotNetOpenAuth {
+	public interface IRequireHostFactories {
+		IHostFactories HostFactories { get; set; }
+	}
+}
diff --git a/src/DotNetOpenAuth.Core/Strings.Designer.cs b/src/DotNetOpenAuth.Core/Strings.Designer.cs
index b0e66d2..9eefd62 100644
--- a/src/DotNetOpenAuth.Core/Strings.Designer.cs
+++ b/src/DotNetOpenAuth.Core/Strings.Designer.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.17622
+//     Runtime Version:4.0.30319.18010
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -97,6 +97,15 @@ namespace DotNetOpenAuth {
         }
         
         /// <summary>
+        ///   Looks up a localized string similar to The HostFactories property must be set first..
+        /// </summary>
+        internal static string HostFactoriesRequired {
+            get {
+                return ResourceManager.GetString("HostFactoriesRequired", resourceCulture);
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized string similar to The argument has an unexpected value..
         /// </summary>
         internal static string InvalidArgument {
diff --git a/src/DotNetOpenAuth.Core/Strings.resx b/src/DotNetOpenAuth.Core/Strings.resx
index f4d61d1..133fe6f 100644
--- a/src/DotNetOpenAuth.Core/Strings.resx
+++ b/src/DotNetOpenAuth.Core/Strings.resx
@@ -141,4 +141,7 @@
   <data name="ResponseBodyNotSupported" xml:space="preserve">
     <value>This object contains a response body, which is not supported.</value>
   </data>
+  <data name="HostFactoriesRequired" xml:space="preserve">
+    <value>The HostFactories property must be set first.</value>
+  </data>
 </root>
 \ No newline at end of file
diff --git a/src/DotNetOpenAuth.Core/Util.cs b/src/DotNetOpenAuth.Core/Util.cs
index ec28c50..279b7d3 100644
--- a/src/DotNetOpenAuth.Core/Util.cs
+++ b/src/DotNetOpenAuth.Core/Util.cs
@@ -30,7 +30,7 @@ namespace DotNetOpenAuth {
 		/// <summary>
 		/// The web.config file-specified provider of web resource URLs.
 		/// </summary>
-		private static IEmbeddedResourceRetrieval embeddedResourceRetrieval = MessagingElement.Configuration.EmbeddedResourceRetrievalProvider.CreateInstance(null, false);
+		private static IEmbeddedResourceRetrieval embeddedResourceRetrieval = MessagingElement.Configuration.EmbeddedResourceRetrievalProvider.CreateInstance(null, false, null);
 
 		/// <summary>
 		/// Gets a human-readable description of the library name and version, including