53 files changed, 74 insertions, 35 deletions
diff --git a/samples/Consumer/App_WebReferences/SampleServiceProvider/DataApi.disco b/samples/Consumer/App_WebReferences/SampleServiceProvider/DataApi.disco
deleted file mode 100644
index 1c29f1d..0000000
--- a/samples/Consumer/App_WebReferences/SampleServiceProvider/DataApi.disco
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<discovery xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.xmlsoap.org/disco/">
-  <contractRef ref="http://localhost:65169/ServiceProvider/DataApi.svc?wsdl" docRef="http://localhost:65169/ServiceProvider/DataApi.svc" xmlns="http://schemas.xmlsoap.org/disco/scl/" />
-</discovery>
-\ No newline at end of file
diff --git a/samples/Consumer/App_WebReferences/SampleServiceProvider/configuration.svcinfo b/samples/Consumer/App_WebReferences/SampleServiceProvider/configuration.svcinfo
deleted file mode 100644
index 5716423..0000000
--- a/samples/Consumer/App_WebReferences/SampleServiceProvider/configuration.svcinfo
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configurationSnapshot xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:schemas-microsoft-com:xml-wcfconfigurationsnapshot">
-  <behaviors />
-  <bindings>
-    <binding digest="System.ServiceModel.Configuration.WSHttpBindingElement, System.ServiceModel, Version=3.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089:&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-16&quot;?&gt;&lt;Data hostNameComparisonMode=&quot;StrongWildcard&quot; messageEncoding=&quot;Text&quot; name=&quot;WSHttpBinding_IDataApi&quot; textEncoding=&quot;utf-8&quot; transactionFlow=&quot;false&quot;&gt;&lt;readerQuotas maxArrayLength=&quot;16384&quot; maxBytesPerRead=&quot;4096&quot; maxDepth=&quot;32&quot; maxNameTableCharCount=&quot;16384&quot; maxStringContentLength=&quot;8192&quot; /&gt;&lt;reliableSession enabled=&quot;false&quot; inactivityTimeout=&quot;00:10:00&quot; ordered=&quot;true&quot; /&gt;&lt;security mode=&quot;Message&quot;&gt;&lt;message algorithmSuite=&quot;Default&quot; clientCredentialType=&quot;Windows&quot; establishSecurityContext=&quot;true&quot; negotiateServiceCredential=&quot;true&quot; /&gt;&lt;transport clientCredentialType=&quot;Windows&quot; proxyCredentialType=&quot;None&quot; realm=&quot;&quot; /&gt;&lt;/security&gt;&lt;/Data&gt;" bindingType="wsHttpBinding" name="WSHttpBinding_IDataApi" />
-  </bindings>
-  <endpoints>
-    <endpoint normalizedDigest="&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-16&quot;?&gt;&lt;Data address=&quot;http://localhost:65169/ServiceProvider/DataApi.svc&quot; binding=&quot;wsHttpBinding&quot; bindingConfiguration=&quot;WSHttpBinding_IDataApi&quot; contract=&quot;SampleServiceProvider.IDataApi&quot; name=&quot;WSHttpBinding_IDataApi&quot;&gt;&lt;identity&gt;&lt;dns value=&quot;localhost&quot; /&gt;&lt;/identity&gt;&lt;/Data&gt;" digest="&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-16&quot;?&gt;&lt;Data address=&quot;http://localhost:65169/ServiceProvider/DataApi.svc&quot; binding=&quot;wsHttpBinding&quot; bindingConfiguration=&quot;WSHttpBinding_IDataApi&quot; contract=&quot;SampleServiceProvider.IDataApi&quot; name=&quot;WSHttpBinding_IDataApi&quot;&gt;&lt;identity&gt;&lt;dns value=&quot;localhost&quot; /&gt;&lt;/identity&gt;&lt;/Data&gt;" contractName="SampleServiceProvider.IDataApi" name="WSHttpBinding_IDataApi" />
-  </endpoints>
-</configurationSnapshot>
-\ No newline at end of file
diff --git a/samples/Consumer/App_Code/InMemoryTokenManager.cs b/samples/OAuthConsumer/App_Code/InMemoryTokenManager.cs
index f36a396..f36a396 100644
--- a/samples/Consumer/App_Code/InMemoryTokenManager.cs
+++ b/samples/OAuthConsumer/App_Code/InMemoryTokenManager.cs
diff --git a/samples/Consumer/App_Code/Logging.cs b/samples/OAuthConsumer/App_Code/Logging.cs
index e97ff37..e97ff37 100644
--- a/samples/Consumer/App_Code/Logging.cs
+++ b/samples/OAuthConsumer/App_Code/Logging.cs
diff --git a/samples/Consumer/App_Code/TracePageAppender.cs b/samples/OAuthConsumer/App_Code/TracePageAppender.cs
index 93ec9e3..93ec9e3 100644
--- a/samples/Consumer/App_Code/TracePageAppender.cs
+++ b/samples/OAuthConsumer/App_Code/TracePageAppender.cs
diff --git a/samples/OAuthConsumer/App_WebReferences/SampleServiceProvider/DataApi.disco b/samples/OAuthConsumer/App_WebReferences/SampleServiceProvider/DataApi.disco
new file mode 100644
index 0000000..a3cecd3
--- /dev/null
+++ b/samples/OAuthConsumer/App_WebReferences/SampleServiceProvider/DataApi.disco
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<discovery xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.xmlsoap.org/disco/">
+  <contractRef ref="http://localhost:65169/OAuthServiceProvider/DataApi.svc?wsdl" docRef="http://localhost:65169/OAuthServiceProvider/DataApi.svc" xmlns="http://schemas.xmlsoap.org/disco/scl/" />
+</discovery>
+\ No newline at end of file
diff --git a/samples/Consumer/App_WebReferences/SampleServiceProvider/DataApi.wsdl b/samples/OAuthConsumer/App_WebReferences/SampleServiceProvider/DataApi.wsdl
index 3f1206e..46a07e1 100644
--- a/samples/Consumer/App_WebReferences/SampleServiceProvider/DataApi.wsdl
+++ b/samples/OAuthConsumer/App_WebReferences/SampleServiceProvider/DataApi.wsdl
@@ -222,9 +222,9 @@
   </wsp:Policy>
   <wsdl:types>
     <xsd:schema targetNamespace="http://tempuri.org/Imports">
-      <xsd:import schemaLocation="http://localhost:65169/ServiceProvider/DataApi.svc?xsd=xsd0" namespace="http://tempuri.org/" />
-      <xsd:import schemaLocation="http://localhost:65169/ServiceProvider/DataApi.svc?xsd=xsd1" namespace="http://schemas.microsoft.com/2003/10/Serialization/" />
-      <xsd:import schemaLocation="http://localhost:65169/ServiceProvider/DataApi.svc?xsd=xsd2" namespace="http://schemas.microsoft.com/2003/10/Serialization/Arrays" />
+      <xsd:import schemaLocation="http://localhost:65169/OAuthServiceProvider/DataApi.svc?xsd=xsd0" namespace="http://tempuri.org/" />
+      <xsd:import schemaLocation="http://localhost:65169/OAuthServiceProvider/DataApi.svc?xsd=xsd1" namespace="http://schemas.microsoft.com/2003/10/Serialization/" />
+      <xsd:import schemaLocation="http://localhost:65169/OAuthServiceProvider/DataApi.svc?xsd=xsd2" namespace="http://schemas.microsoft.com/2003/10/Serialization/Arrays" />
     </xsd:schema>
   </wsdl:types>
   <wsdl:message name="IDataApi_GetAge_InputMessage">
@@ -298,9 +298,9 @@
   </wsdl:binding>
   <wsdl:service name="DataApi">
     <wsdl:port name="WSHttpBinding_IDataApi" binding="tns:WSHttpBinding_IDataApi">
-      <soap12:address location="http://localhost:65169/ServiceProvider/DataApi.svc" />
+      <soap12:address location="http://localhost:65169/OAuthServiceProvider/DataApi.svc" />
       <wsa10:EndpointReference>
-        <wsa10:Address>http://localhost:65169/ServiceProvider/DataApi.svc</wsa10:Address>
+        <wsa10:Address>http://localhost:65169/OAuthServiceProvider/DataApi.svc</wsa10:Address>
         <Identity xmlns="http://schemas.xmlsoap.org/ws/2006/02/addressingidentity">
           <Dns>localhost</Dns>
         </Identity>
diff --git a/samples/Consumer/App_WebReferences/SampleServiceProvider/DataApi.xsd b/samples/OAuthConsumer/App_WebReferences/SampleServiceProvider/DataApi.xsd
index d58e7f3..d58e7f3 100644
--- a/samples/Consumer/App_WebReferences/SampleServiceProvider/DataApi.xsd
+++ b/samples/OAuthConsumer/App_WebReferences/SampleServiceProvider/DataApi.xsd
diff --git a/samples/Consumer/App_WebReferences/SampleServiceProvider/DataApi1.xsd b/samples/OAuthConsumer/App_WebReferences/SampleServiceProvider/DataApi1.xsd
index 0853058..bcb9ef8 100644
--- a/samples/Consumer/App_WebReferences/SampleServiceProvider/DataApi1.xsd
+++ b/samples/OAuthConsumer/App_WebReferences/SampleServiceProvider/DataApi1.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xs:schema xmlns:tns="http://tempuri.org/" elementFormDefault="qualified" targetNamespace="http://tempuri.org/" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-  <xs:import schemaLocation="http://localhost:65169/ServiceProvider/DataApi.svc?xsd=xsd2" namespace="http://schemas.microsoft.com/2003/10/Serialization/Arrays" />
+  <xs:import schemaLocation="http://localhost:65169/OAuthServiceProvider/DataApi.svc?xsd=xsd2" namespace="http://schemas.microsoft.com/2003/10/Serialization/Arrays" />
   <xs:element name="GetAge">
     <xs:complexType>
       <xs:sequence />
diff --git a/samples/Consumer/App_WebReferences/SampleServiceProvider/DataApi2.xsd b/samples/OAuthConsumer/App_WebReferences/SampleServiceProvider/DataApi2.xsd
index 04a74a4..04a74a4 100644
--- a/samples/Consumer/App_WebReferences/SampleServiceProvider/DataApi2.xsd
+++ b/samples/OAuthConsumer/App_WebReferences/SampleServiceProvider/DataApi2.xsd
diff --git a/samples/Consumer/App_WebReferences/SampleServiceProvider/Reference.svcmap b/samples/OAuthConsumer/App_WebReferences/SampleServiceProvider/Reference.svcmap
index 4302f14..c3f76fc 100644
--- a/samples/Consumer/App_WebReferences/SampleServiceProvider/Reference.svcmap
+++ b/samples/OAuthConsumer/App_WebReferences/SampleServiceProvider/Reference.svcmap
@@ -17,14 +17,14 @@
     <ServiceContractMappings />
   </ClientOptions>
   <MetadataSources>
-    <MetadataSource Address="http://localhost:65169/ServiceProvider/DataApi.svc" Protocol="http" SourceId="1" />
+    <MetadataSource Address="http://localhost:65169/OAuthServiceProvider/DataApi.svc" Protocol="http" SourceId="1" />
   </MetadataSources>
   <Metadata>
-    <MetadataFile FileName="DataApi2.xsd" MetadataType="Schema" ID="232b71c0-94e9-43eb-9b23-fe9a229dce94" SourceId="1" SourceUrl="http://localhost:65169/ServiceProvider/DataApi.svc?xsd=xsd2" />
-    <MetadataFile FileName="DataApi.xsd" MetadataType="Schema" ID="fdc9f289-8c10-4fc6-abeb-052bc1116679" SourceId="1" SourceUrl="http://localhost:65169/ServiceProvider/DataApi.svc?xsd=xsd1" />
-    <MetadataFile FileName="DataApi.wsdl" MetadataType="Wsdl" ID="182a10fe-d606-4fc0-b64c-3e682dcae89d" SourceId="1" SourceUrl="http://localhost:65169/ServiceProvider/DataApi.svc?wsdl" />
-    <MetadataFile FileName="DataApi1.xsd" MetadataType="Schema" ID="80d06927-f2e7-4d1d-8c7a-f3dc74f4d3d6" SourceId="1" SourceUrl="http://localhost:65169/ServiceProvider/DataApi.svc?xsd=xsd0" />
-    <MetadataFile FileName="DataApi.disco" MetadataType="Disco" ID="25047770-8993-4bf3-acee-64b5f3598f2c" SourceId="1" SourceUrl="http://localhost:65169/ServiceProvider/DataApi.svc?disco" />
+    <MetadataFile FileName="DataApi.wsdl" MetadataType="Wsdl" ID="182a10fe-d606-4fc0-b64c-3e682dcae89d" SourceId="1" SourceUrl="http://localhost:65169/OAuthServiceProvider/DataApi.svc?wsdl" />
+    <MetadataFile FileName="DataApi2.xsd" MetadataType="Schema" ID="232b71c0-94e9-43eb-9b23-fe9a229dce94" SourceId="1" SourceUrl="http://localhost:65169/OAuthServiceProvider/DataApi.svc?xsd=xsd2" />
+    <MetadataFile FileName="DataApi1.xsd" MetadataType="Schema" ID="80d06927-f2e7-4d1d-8c7a-f3dc74f4d3d6" SourceId="1" SourceUrl="http://localhost:65169/OAuthServiceProvider/DataApi.svc?xsd=xsd0" />
+    <MetadataFile FileName="DataApi.disco" MetadataType="Disco" ID="25047770-8993-4bf3-acee-64b5f3598f2c" SourceId="1" SourceUrl="http://localhost:65169/OAuthServiceProvider/DataApi.svc?disco" />
+    <MetadataFile FileName="DataApi.xsd" MetadataType="Schema" ID="fdc9f289-8c10-4fc6-abeb-052bc1116679" SourceId="1" SourceUrl="http://localhost:65169/OAuthServiceProvider/DataApi.svc?xsd=xsd1" />
   </Metadata>
   <Extensions>
     <ExtensionFile FileName="configuration91.svcinfo" Name="configuration91.svcinfo" />
diff --git a/samples/OAuthConsumer/App_WebReferences/SampleServiceProvider/configuration.svcinfo b/samples/OAuthConsumer/App_WebReferences/SampleServiceProvider/configuration.svcinfo
new file mode 100644
index 0000000..d014dc9
--- /dev/null
+++ b/samples/OAuthConsumer/App_WebReferences/SampleServiceProvider/configuration.svcinfo
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configurationSnapshot xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:schemas-microsoft-com:xml-wcfconfigurationsnapshot">
+  <behaviors />
+  <bindings>
+    <binding digest="System.ServiceModel.Configuration.WSHttpBindingElement, System.ServiceModel, Version=3.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089:&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-16&quot;?&gt;&lt;Data hostNameComparisonMode=&quot;StrongWildcard&quot; messageEncoding=&quot;Text&quot; name=&quot;WSHttpBinding_IDataApi1&quot; textEncoding=&quot;utf-8&quot; transactionFlow=&quot;false&quot;&gt;&lt;readerQuotas maxArrayLength=&quot;16384&quot; maxBytesPerRead=&quot;4096&quot; maxDepth=&quot;32&quot; maxNameTableCharCount=&quot;16384&quot; maxStringContentLength=&quot;8192&quot; /&gt;&lt;reliableSession enabled=&quot;false&quot; inactivityTimeout=&quot;00:10:00&quot; ordered=&quot;true&quot; /&gt;&lt;security mode=&quot;Message&quot;&gt;&lt;message algorithmSuite=&quot;Default&quot; clientCredentialType=&quot;Windows&quot; establishSecurityContext=&quot;true&quot; negotiateServiceCredential=&quot;true&quot; /&gt;&lt;transport clientCredentialType=&quot;Windows&quot; proxyCredentialType=&quot;None&quot; realm=&quot;&quot; /&gt;&lt;/security&gt;&lt;/Data&gt;" bindingType="wsHttpBinding" name="WSHttpBinding_IDataApi1" />
+  </bindings>
+  <endpoints>
+    <endpoint normalizedDigest="&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-16&quot;?&gt;&lt;Data address=&quot;http://localhost:65169/OAuthServiceProvider/DataApi.svc&quot; binding=&quot;wsHttpBinding&quot; bindingConfiguration=&quot;WSHttpBinding_IDataApi1&quot; contract=&quot;SampleServiceProvider.IDataApi&quot; name=&quot;WSHttpBinding_IDataApi1&quot;&gt;&lt;identity&gt;&lt;dns value=&quot;localhost&quot; /&gt;&lt;/identity&gt;&lt;/Data&gt;" digest="&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-16&quot;?&gt;&lt;Data address=&quot;http://localhost:65169/OAuthServiceProvider/DataApi.svc&quot; binding=&quot;wsHttpBinding&quot; bindingConfiguration=&quot;WSHttpBinding_IDataApi1&quot; contract=&quot;SampleServiceProvider.IDataApi&quot; name=&quot;WSHttpBinding_IDataApi1&quot;&gt;&lt;identity&gt;&lt;dns value=&quot;localhost&quot; /&gt;&lt;/identity&gt;&lt;/Data&gt;" contractName="SampleServiceProvider.IDataApi" name="WSHttpBinding_IDataApi1" />
+  </endpoints>
+</configurationSnapshot>
+\ No newline at end of file
diff --git a/samples/Consumer/App_WebReferences/SampleServiceProvider/configuration91.svcinfo b/samples/OAuthConsumer/App_WebReferences/SampleServiceProvider/configuration91.svcinfo
index bf2c6c8..0dba466 100644
--- a/samples/Consumer/App_WebReferences/SampleServiceProvider/configuration91.svcinfo
+++ b/samples/OAuthConsumer/App_WebReferences/SampleServiceProvider/configuration91.svcinfo
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<SavedWcfConfigurationInformation xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" Version="9.1" CheckSum="Gtb7NAD474X6NPnHmitA0NiFc2w=">
+<SavedWcfConfigurationInformation xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" Version="9.1" CheckSum="ieaabeY3T59437Mou0eeT4Hleso=">
   <bindingConfigurations>
-    <bindingConfiguration bindingType="wsHttpBinding" name="WSHttpBinding_IDataApi">
+    <bindingConfiguration bindingType="wsHttpBinding" name="WSHttpBinding_IDataApi1">
       <properties>
         <property path="/name" isComplexType="false" isExplicitlyDefined="true" clrType="System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-          <serializedValue>WSHttpBinding_IDataApi</serializedValue>
+          <serializedValue>WSHttpBinding_IDataApi1</serializedValue>
         </property>
         <property path="/closeTimeout" isComplexType="false" isExplicitlyDefined="true" clrType="System.TimeSpan, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
           <serializedValue>00:01:00</serializedValue>
@@ -96,6 +96,18 @@
         <property path="/security/transport/realm" isComplexType="false" isExplicitlyDefined="true" clrType="System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
           <serializedValue />
         </property>
+        <property path="/security/transport/extendedProtectionPolicy" isComplexType="true" isExplicitlyDefined="false" clrType="System.Security.Authentication.ExtendedProtection.Configuration.ExtendedProtectionPolicyElement, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+          <serializedValue>System.Security.Authentication.ExtendedProtection.Configuration.ExtendedProtectionPolicyElement</serializedValue>
+        </property>
+        <property path="/security/transport/extendedProtectionPolicy/policyEnforcement" isComplexType="false" isExplicitlyDefined="false" clrType="System.Security.Authentication.ExtendedProtection.PolicyEnforcement, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+          <serializedValue>Never</serializedValue>
+        </property>
+        <property path="/security/transport/extendedProtectionPolicy/protectionScenario" isComplexType="false" isExplicitlyDefined="false" clrType="System.Security.Authentication.ExtendedProtection.ProtectionScenario, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+          <serializedValue>TransportSelected</serializedValue>
+        </property>
+        <property path="/security/transport/extendedProtectionPolicy/customServiceNames" isComplexType="true" isExplicitlyDefined="false" clrType="System.Security.Authentication.ExtendedProtection.Configuration.ServiceNameElementCollection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+          <serializedValue>(Collection)</serializedValue>
+        </property>
         <property path="/security/message" isComplexType="true" isExplicitlyDefined="false" clrType="System.ServiceModel.Configuration.NonDualMessageSecurityOverHttpElement, System.ServiceModel, Version=3.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
           <serializedValue>System.ServiceModel.Configuration.NonDualMessageSecurityOverHttpElement</serializedValue>
         </property>
@@ -115,10 +127,10 @@
     </bindingConfiguration>
   </bindingConfigurations>
   <endpoints>
-    <endpoint name="WSHttpBinding_IDataApi" contract="SampleServiceProvider.IDataApi" bindingType="wsHttpBinding" address="http://localhost:65169/ServiceProvider/DataApi.svc" bindingConfiguration="WSHttpBinding_IDataApi">
+    <endpoint name="WSHttpBinding_IDataApi1" contract="SampleServiceProvider.IDataApi" bindingType="wsHttpBinding" address="http://localhost:65169/OAuthServiceProvider/DataApi.svc" bindingConfiguration="WSHttpBinding_IDataApi1">
       <properties>
         <property path="/address" isComplexType="false" isExplicitlyDefined="true" clrType="System.Uri, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-          <serializedValue>http://localhost:65169/ServiceProvider/DataApi.svc</serializedValue>
+          <serializedValue>http://localhost:65169/OAuthServiceProvider/DataApi.svc</serializedValue>
         </property>
         <property path="/behaviorConfiguration" isComplexType="false" isExplicitlyDefined="false" clrType="System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
           <serializedValue />
@@ -127,7 +139,7 @@
           <serializedValue>wsHttpBinding</serializedValue>
         </property>
         <property path="/bindingConfiguration" isComplexType="false" isExplicitlyDefined="true" clrType="System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-          <serializedValue>WSHttpBinding_IDataApi</serializedValue>
+          <serializedValue>WSHttpBinding_IDataApi1</serializedValue>
         </property>
         <property path="/contract" isComplexType="false" isExplicitlyDefined="true" clrType="System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
           <serializedValue>SampleServiceProvider.IDataApi</serializedValue>
@@ -190,7 +202,7 @@
           <serializedValue>False</serializedValue>
         </property>
         <property path="/name" isComplexType="false" isExplicitlyDefined="true" clrType="System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-          <serializedValue>WSHttpBinding_IDataApi</serializedValue>
+          <serializedValue>WSHttpBinding_IDataApi1</serializedValue>
         </property>
       </properties>
     </endpoint>
diff --git a/samples/Consumer/Default.aspx b/samples/OAuthConsumer/Default.aspx
index 20e0f94..20e0f94 100644
--- a/samples/Consumer/Default.aspx
+++ b/samples/OAuthConsumer/Default.aspx
diff --git a/samples/Consumer/Global.asax b/samples/OAuthConsumer/Global.asax
index fa4ca9b..fa4ca9b 100644
--- a/samples/Consumer/Global.asax
+++ b/samples/OAuthConsumer/Global.asax
diff --git a/samples/Consumer/GoogleAddressBook.aspx b/samples/OAuthConsumer/GoogleAddressBook.aspx
index 1c20954..1c20954 100644
--- a/samples/Consumer/GoogleAddressBook.aspx
+++ b/samples/OAuthConsumer/GoogleAddressBook.aspx
diff --git a/samples/Consumer/GoogleAddressBook.aspx.cs b/samples/OAuthConsumer/GoogleAddressBook.aspx.cs
index 838b286..838b286 100644
--- a/samples/Consumer/GoogleAddressBook.aspx.cs
+++ b/samples/OAuthConsumer/GoogleAddressBook.aspx.cs
diff --git a/samples/Consumer/MasterPage.master b/samples/OAuthConsumer/MasterPage.master
index 0044208..0044208 100644
--- a/samples/Consumer/MasterPage.master
+++ b/samples/OAuthConsumer/MasterPage.master
diff --git a/samples/Consumer/SampleWcf.aspx b/samples/OAuthConsumer/SampleWcf.aspx
index b3eda25..b3eda25 100644
--- a/samples/Consumer/SampleWcf.aspx
+++ b/samples/OAuthConsumer/SampleWcf.aspx
diff --git a/samples/Consumer/SampleWcf.aspx.cs b/samples/OAuthConsumer/SampleWcf.aspx.cs
index db58cea..db58cea 100644
--- a/samples/Consumer/SampleWcf.aspx.cs
+++ b/samples/OAuthConsumer/SampleWcf.aspx.cs
diff --git a/samples/Consumer/Settings.StyleCop b/samples/OAuthConsumer/Settings.StyleCop
index 7f55ce6..7f55ce6 100644
--- a/samples/Consumer/Settings.StyleCop
+++ b/samples/OAuthConsumer/Settings.StyleCop
diff --git a/samples/Consumer/TracePage.aspx b/samples/OAuthConsumer/TracePage.aspx
index 4d6ecc5..4d6ecc5 100644
--- a/samples/Consumer/TracePage.aspx
+++ b/samples/OAuthConsumer/TracePage.aspx
diff --git a/samples/Consumer/TracePage.aspx.cs b/samples/OAuthConsumer/TracePage.aspx.cs
index 7075ce3..7075ce3 100644
--- a/samples/Consumer/TracePage.aspx.cs
+++ b/samples/OAuthConsumer/TracePage.aspx.cs
diff --git a/samples/Consumer/Web.config b/samples/OAuthConsumer/Web.config
index 0997e8c..60efcee 100644
--- a/samples/Consumer/Web.config
+++ b/samples/OAuthConsumer/Web.config
@@ -141,7 +141,27 @@
       enabled="false" />
      <security mode="Message">
       <transport clientCredentialType="Windows" proxyCredentialType="None"
-       realm="" />
+       realm="">
+       <extendedProtectionPolicy policyEnforcement="Never" />
+      </transport>
+      <message clientCredentialType="Windows" negotiateServiceCredential="true"
+       algorithmSuite="Default" establishSecurityContext="true" />
+     </security>
+    </binding>
+    <binding name="WSHttpBinding_IDataApi1" closeTimeout="00:01:00"
+     openTimeout="00:01:00" receiveTimeout="00:10:00" sendTimeout="00:01:00"
+     bypassProxyOnLocal="false" transactionFlow="false" hostNameComparisonMode="StrongWildcard"
+     maxBufferPoolSize="524288" maxReceivedMessageSize="65536" messageEncoding="Text"
+     textEncoding="utf-8" useDefaultWebProxy="true" allowCookies="false">
+     <readerQuotas maxDepth="32" maxStringContentLength="8192" maxArrayLength="16384"
+      maxBytesPerRead="4096" maxNameTableCharCount="16384" />
+     <reliableSession ordered="true" inactivityTimeout="00:10:00"
+      enabled="false" />
+     <security mode="Message">
+      <transport clientCredentialType="Windows" proxyCredentialType="None"
+       realm="">
+       <extendedProtectionPolicy policyEnforcement="Never" />
+      </transport>
       <message clientCredentialType="Windows" negotiateServiceCredential="true"
        algorithmSuite="Default" establishSecurityContext="true" />
      </security>
@@ -149,13 +169,20 @@
    </wsHttpBinding>
   </bindings>
   <client>
-   <endpoint address="http://localhost:65169/ServiceProvider/DataApi.svc"
+   <endpoint address="http://localhost:65169/OAuthServiceProvider/DataApi.svc"
     binding="wsHttpBinding" bindingConfiguration="WSHttpBinding_IDataApi"
     contract="SampleServiceProvider.IDataApi" name="WSHttpBinding_IDataApi">
     <identity>
      <dns value="localhost" />
     </identity>
    </endpoint>
+   <endpoint address="http://localhost:65169/OAuthServiceProvider/DataApi.svc"
+    binding="wsHttpBinding" bindingConfiguration="WSHttpBinding_IDataApi1"
+    contract="SampleServiceProvider.IDataApi" name="WSHttpBinding_IDataApi1">
+    <identity>
+     <dns value="localhost" />
+    </identity>
+   </endpoint>
   </client>
  </system.serviceModel>
 </configuration>
diff --git a/samples/ServiceProvider/App_Code/Constants.cs b/samples/OAuthServiceProvider/App_Code/Constants.cs
index 7780e96..7780e96 100644
--- a/samples/ServiceProvider/App_Code/Constants.cs
+++ b/samples/OAuthServiceProvider/App_Code/Constants.cs
diff --git a/samples/ServiceProvider/App_Code/CustomOAuthTypeProvider.cs b/samples/OAuthServiceProvider/App_Code/CustomOAuthTypeProvider.cs
index a4397c1..a4397c1 100644
--- a/samples/ServiceProvider/App_Code/CustomOAuthTypeProvider.cs
+++ b/samples/OAuthServiceProvider/App_Code/CustomOAuthTypeProvider.cs
diff --git a/samples/ServiceProvider/App_Code/DataApi.cs b/samples/OAuthServiceProvider/App_Code/DataApi.cs
index a765159..a765159 100644
--- a/samples/ServiceProvider/App_Code/DataApi.cs
+++ b/samples/OAuthServiceProvider/App_Code/DataApi.cs
diff --git a/samples/ServiceProvider/App_Code/DataClasses.dbml b/samples/OAuthServiceProvider/App_Code/DataClasses.dbml
index 0b54d0d..0b54d0d 100644
--- a/samples/ServiceProvider/App_Code/DataClasses.dbml
+++ b/samples/OAuthServiceProvider/App_Code/DataClasses.dbml
diff --git a/samples/ServiceProvider/App_Code/DataClasses.dbml.layout b/samples/OAuthServiceProvider/App_Code/DataClasses.dbml.layout
index 1fc61cf..1fc61cf 100644
--- a/samples/ServiceProvider/App_Code/DataClasses.dbml.layout
+++ b/samples/OAuthServiceProvider/App_Code/DataClasses.dbml.layout
diff --git a/samples/ServiceProvider/App_Code/DataClasses.designer.cs b/samples/OAuthServiceProvider/App_Code/DataClasses.designer.cs
index 2fc532e..2fc532e 100644
--- a/samples/ServiceProvider/App_Code/DataClasses.designer.cs
+++ b/samples/OAuthServiceProvider/App_Code/DataClasses.designer.cs
diff --git a/samples/ServiceProvider/App_Code/DatabaseTokenManager.cs b/samples/OAuthServiceProvider/App_Code/DatabaseTokenManager.cs
index b5d8fdd..b5d8fdd 100644
--- a/samples/ServiceProvider/App_Code/DatabaseTokenManager.cs
+++ b/samples/OAuthServiceProvider/App_Code/DatabaseTokenManager.cs
diff --git a/samples/ServiceProvider/App_Code/Global.cs b/samples/OAuthServiceProvider/App_Code/Global.cs
index b343dcd..b343dcd 100644
--- a/samples/ServiceProvider/App_Code/Global.cs
+++ b/samples/OAuthServiceProvider/App_Code/Global.cs
diff --git a/samples/ServiceProvider/App_Code/IDataApi.cs b/samples/OAuthServiceProvider/App_Code/IDataApi.cs
index 350df35..350df35 100644
--- a/samples/ServiceProvider/App_Code/IDataApi.cs
+++ b/samples/OAuthServiceProvider/App_Code/IDataApi.cs
diff --git a/samples/ServiceProvider/App_Code/OAuthAuthorizationManager.cs b/samples/OAuthServiceProvider/App_Code/OAuthAuthorizationManager.cs
index fce1ad4..fce1ad4 100644
--- a/samples/ServiceProvider/App_Code/OAuthAuthorizationManager.cs
+++ b/samples/OAuthServiceProvider/App_Code/OAuthAuthorizationManager.cs
diff --git a/samples/ServiceProvider/App_Code/RequestScopedTokenMessage.cs b/samples/OAuthServiceProvider/App_Code/RequestScopedTokenMessage.cs
index b33a734..b33a734 100644
--- a/samples/ServiceProvider/App_Code/RequestScopedTokenMessage.cs
+++ b/samples/OAuthServiceProvider/App_Code/RequestScopedTokenMessage.cs
diff --git a/samples/ServiceProvider/App_Code/TokenAuthorizationState.cs b/samples/OAuthServiceProvider/App_Code/TokenAuthorizationState.cs
index 8d3c8ac..8d3c8ac 100644
--- a/samples/ServiceProvider/App_Code/TokenAuthorizationState.cs
+++ b/samples/OAuthServiceProvider/App_Code/TokenAuthorizationState.cs
diff --git a/samples/ServiceProvider/App_Code/TracePageAppender.cs b/samples/OAuthServiceProvider/App_Code/TracePageAppender.cs
index 7490f3d..7490f3d 100644
--- a/samples/ServiceProvider/App_Code/TracePageAppender.cs
+++ b/samples/OAuthServiceProvider/App_Code/TracePageAppender.cs
diff --git a/samples/ServiceProvider/DataApi.svc b/samples/OAuthServiceProvider/DataApi.svc
index 4e9e477..4e9e477 100644
--- a/samples/ServiceProvider/DataApi.svc
+++ b/samples/OAuthServiceProvider/DataApi.svc
diff --git a/samples/ServiceProvider/Default.aspx b/samples/OAuthServiceProvider/Default.aspx
index 67efe3a..67efe3a 100644
--- a/samples/ServiceProvider/Default.aspx
+++ b/samples/OAuthServiceProvider/Default.aspx
diff --git a/samples/ServiceProvider/Global.asax b/samples/OAuthServiceProvider/Global.asax
index e9ae062..e9ae062 100644
--- a/samples/ServiceProvider/Global.asax
+++ b/samples/OAuthServiceProvider/Global.asax
diff --git a/samples/ServiceProvider/Login.aspx b/samples/OAuthServiceProvider/Login.aspx
index d63b2c8..d63b2c8 100644
--- a/samples/ServiceProvider/Login.aspx
+++ b/samples/OAuthServiceProvider/Login.aspx
diff --git a/samples/ServiceProvider/MasterPage.master b/samples/OAuthServiceProvider/MasterPage.master
index 136dfc9..136dfc9 100644
--- a/samples/ServiceProvider/MasterPage.master
+++ b/samples/OAuthServiceProvider/MasterPage.master
diff --git a/samples/ServiceProvider/Members/Authorize.aspx b/samples/OAuthServiceProvider/Members/Authorize.aspx
index 0fd272c..0fd272c 100644
--- a/samples/ServiceProvider/Members/Authorize.aspx
+++ b/samples/OAuthServiceProvider/Members/Authorize.aspx
diff --git a/samples/ServiceProvider/Members/Authorize.aspx.cs b/samples/OAuthServiceProvider/Members/Authorize.aspx.cs
index 76eec26..76eec26 100644
--- a/samples/ServiceProvider/Members/Authorize.aspx.cs
+++ b/samples/OAuthServiceProvider/Members/Authorize.aspx.cs
diff --git a/samples/ServiceProvider/Members/AuthorizedConsumers.aspx b/samples/OAuthServiceProvider/Members/AuthorizedConsumers.aspx
index d6ea668..d6ea668 100644
--- a/samples/ServiceProvider/Members/AuthorizedConsumers.aspx
+++ b/samples/OAuthServiceProvider/Members/AuthorizedConsumers.aspx
diff --git a/samples/ServiceProvider/Members/AuthorizedConsumers.aspx.cs b/samples/OAuthServiceProvider/Members/AuthorizedConsumers.aspx.cs
index e7af629..e7af629 100644
--- a/samples/ServiceProvider/Members/AuthorizedConsumers.aspx.cs
+++ b/samples/OAuthServiceProvider/Members/AuthorizedConsumers.aspx.cs
diff --git a/samples/ServiceProvider/Members/Logoff.aspx b/samples/OAuthServiceProvider/Members/Logoff.aspx
index afa9dd9..afa9dd9 100644
--- a/samples/ServiceProvider/Members/Logoff.aspx
+++ b/samples/OAuthServiceProvider/Members/Logoff.aspx
diff --git a/samples/ServiceProvider/Members/Web.config b/samples/OAuthServiceProvider/Members/Web.config
index 50fab27..50fab27 100644
--- a/samples/ServiceProvider/Members/Web.config
+++ b/samples/OAuthServiceProvider/Members/Web.config
diff --git a/samples/ServiceProvider/OAuth.ashx b/samples/OAuthServiceProvider/OAuth.ashx
index 46a516f..46a516f 100644
--- a/samples/ServiceProvider/OAuth.ashx
+++ b/samples/OAuthServiceProvider/OAuth.ashx
diff --git a/samples/ServiceProvider/Settings.StyleCop b/samples/OAuthServiceProvider/Settings.StyleCop
index 7f55ce6..7f55ce6 100644
--- a/samples/ServiceProvider/Settings.StyleCop
+++ b/samples/OAuthServiceProvider/Settings.StyleCop
diff --git a/samples/ServiceProvider/TracePage.aspx b/samples/OAuthServiceProvider/TracePage.aspx
index 4d6ecc5..4d6ecc5 100644
--- a/samples/ServiceProvider/TracePage.aspx
+++ b/samples/OAuthServiceProvider/TracePage.aspx
diff --git a/samples/ServiceProvider/TracePage.aspx.cs b/samples/OAuthServiceProvider/TracePage.aspx.cs
index 52848f2..52848f2 100644
--- a/samples/ServiceProvider/TracePage.aspx.cs
+++ b/samples/OAuthServiceProvider/TracePage.aspx.cs
diff --git a/samples/ServiceProvider/Web.config b/samples/OAuthServiceProvider/Web.config
index f4bd208..f4bd208 100644
--- a/samples/ServiceProvider/Web.config
+++ b/samples/OAuthServiceProvider/Web.config