summaryrefslogtreecommitdiffstats
path: root/src/DotNetOpenId.TestWeb
diff options
context:
space:
mode:
Diffstat (limited to 'src/DotNetOpenId.TestWeb')
-rw-r--r--src/DotNetOpenId.TestWeb/Default.aspx2
-rw-r--r--src/DotNetOpenId.TestWeb/ProviderEndpoint.aspx.cs107
-rw-r--r--src/DotNetOpenId.TestWeb/htmldiscovery/html1020.aspx12
-rw-r--r--src/DotNetOpenId.TestWeb/htmldiscovery/html10both.aspx10
-rw-r--r--src/DotNetOpenId.TestWeb/htmldiscovery/html10del.aspx9
-rw-r--r--src/DotNetOpenId.TestWeb/htmldiscovery/html10prov.aspx9
-rw-r--r--src/DotNetOpenId.TestWeb/htmldiscovery/html2010.aspx12
-rw-r--r--src/DotNetOpenId.TestWeb/htmldiscovery/html2010combinedA.aspx10
-rw-r--r--src/DotNetOpenId.TestWeb/htmldiscovery/html2010combinedB.aspx10
-rw-r--r--src/DotNetOpenId.TestWeb/htmldiscovery/html2010combinedC.aspx10
-rw-r--r--src/DotNetOpenId.TestWeb/htmldiscovery/html20both.aspx10
-rw-r--r--src/DotNetOpenId.TestWeb/htmldiscovery/html20del.aspx9
-rw-r--r--src/DotNetOpenId.TestWeb/htmldiscovery/html20prov.aspx9
-rw-r--r--src/DotNetOpenId.TestWeb/htmldiscovery/html20relative.aspx9
-rw-r--r--src/DotNetOpenId.TestWeb/htmldiscovery/redirect.aspx9
-rw-r--r--src/DotNetOpenId.TestWeb/xrdsdiscovery/XrdsReferencedInHead.aspx17
-rw-r--r--src/DotNetOpenId.TestWeb/xrdsdiscovery/XrdsReferencedInHttpHeader.aspx20
-rw-r--r--src/DotNetOpenId.TestWeb/xrdsdiscovery/xrds-irrelevant.aspx12
-rw-r--r--src/DotNetOpenId.TestWeb/xrdsdiscovery/xrds10.aspx14
-rw-r--r--src/DotNetOpenId.TestWeb/xrdsdiscovery/xrds1020.aspx18
-rw-r--r--src/DotNetOpenId.TestWeb/xrdsdiscovery/xrds11.aspx13
-rw-r--r--src/DotNetOpenId.TestWeb/xrdsdiscovery/xrds20.aspx13
-rw-r--r--src/DotNetOpenId.TestWeb/xrdsdiscovery/xrds2010a.aspx18
-rw-r--r--src/DotNetOpenId.TestWeb/xrdsdiscovery/xrds2010b.aspx18
24 files changed, 2 insertions, 378 deletions
diff --git a/src/DotNetOpenId.TestWeb/Default.aspx b/src/DotNetOpenId.TestWeb/Default.aspx
index e8f6a1a..706baff 100644
--- a/src/DotNetOpenId.TestWeb/Default.aspx
+++ b/src/DotNetOpenId.TestWeb/Default.aspx
@@ -10,7 +10,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server">
<title>Untitled Page</title>
- <openid:XrdsPublisher runat="server" ID="xrdsPublisher" XrdsUrl="~/rp_xrds.aspx" />
+ <openid:XrdsPublisher runat="server" ID="xrdsPublisher" XrdsUrl="~/rp_xrds.aspx" XrdsAdvertisement=Both />
</head>
<body>
<form id="form1" runat="server">
diff --git a/src/DotNetOpenId.TestWeb/ProviderEndpoint.aspx.cs b/src/DotNetOpenId.TestWeb/ProviderEndpoint.aspx.cs
index 8eab9c7..362d4a8 100644
--- a/src/DotNetOpenId.TestWeb/ProviderEndpoint.aspx.cs
+++ b/src/DotNetOpenId.TestWeb/ProviderEndpoint.aspx.cs
@@ -8,99 +8,6 @@ using System.Globalization;
using DotNetOpenId;
public partial class ProviderEndpoint : System.Web.UI.Page {
- const string nicknameTypeUri = WellKnownAttributes.Name.Alias;
- const string emailTypeUri = WellKnownAttributes.Contact.Email;
-
- IDictionary<string, AttributeValues> storedAttributes {
- get {
- var atts = (Dictionary<string, AttributeValues>)Application["storedAttributes"];
- if (atts == null) {
- atts = new Dictionary<string, AttributeValues>();
- Application["storedAttributes"] = atts;
- }
- return atts;
- }
- }
-
- void respondToExtensions(DotNetOpenId.Provider.IRequest request, TestSupport.Scenarios scenario) {
- var sregRequest = request.GetExtension<ClaimsRequest>();
- var sregResponse = sregRequest != null ? sregRequest.CreateResponse() : null;
- var aeFetchRequest = request.GetExtension<FetchRequest>();
- var aeFetchResponse = new FetchResponse();
- var aeStoreRequest = request.GetExtension<StoreRequest>();
- var aeStoreResponse = new StoreResponse();
- var papeRequest = request.GetExtension<PolicyRequest>();
- var papeResponse = new PolicyResponse();
- switch (scenario) {
- case TestSupport.Scenarios.ExtensionFullCooperation:
- if (sregRequest != null) {
- if (sregRequest.FullName != SregDemandLevel.NoRequest)
- sregResponse.FullName = "Andrew Arnott";
- if (sregRequest.Email != SregDemandLevel.NoRequest)
- sregResponse.Email = "andrewarnott@gmail.com";
- }
- if (aeFetchRequest != null) {
- var att = aeFetchRequest.GetAttribute(nicknameTypeUri);
- if (att != null)
- aeFetchResponse.AddAttribute(att.Respond("Andrew"));
- att = aeFetchRequest.GetAttribute(emailTypeUri);
- if (att != null) {
- string[] emails = new[] { "a@a.com", "b@b.com" };
- string[] subset = new string[Math.Min(emails.Length, att.Count)];
- Array.Copy(emails, subset, subset.Length);
- aeFetchResponse.AddAttribute(att.Respond(subset));
- }
- foreach (var att2 in aeFetchRequest.Attributes) {
- if (storedAttributes.ContainsKey(att2.TypeUri))
- aeFetchResponse.AddAttribute(storedAttributes[att2.TypeUri]);
- }
- }
- if (papeRequest != null) {
- if (papeRequest.MaximumAuthenticationAge.HasValue) {
- papeResponse.AuthenticationTimeUtc = DateTime.UtcNow - (papeRequest.MaximumAuthenticationAge.Value - TimeSpan.FromSeconds(30));
- }
- if (papeRequest.PreferredAuthLevelTypes.Contains("http://csrc.nist.gov/publications/nistpubs/800-63/SP800-63V1_0_2.pdf")) {
- papeResponse.NistAssuranceLevel = NistAssuranceLevel.Level1;
- }
- }
- break;
- case TestSupport.Scenarios.ExtensionPartialCooperation:
- if (sregRequest != null) {
- if (sregRequest.FullName == SregDemandLevel.Require)
- sregResponse.FullName = "Andrew Arnott";
- if (sregRequest.Email == SregDemandLevel.Require)
- sregResponse.Email = "andrewarnott@gmail.com";
- }
- if (aeFetchRequest != null) {
- var att = aeFetchRequest.GetAttribute(nicknameTypeUri);
- if (att != null && att.IsRequired)
- aeFetchResponse.AddAttribute(att.Respond("Andrew"));
- att = aeFetchRequest.GetAttribute(emailTypeUri);
- if (att != null && att.IsRequired) {
- string[] emails = new[] { "a@a.com", "b@b.com" };
- string[] subset = new string[Math.Min(emails.Length, att.Count)];
- Array.Copy(emails, subset, subset.Length);
- aeFetchResponse.AddAttribute(att.Respond(subset));
- }
- foreach (var att2 in aeFetchRequest.Attributes) {
- if (att2.IsRequired && storedAttributes.ContainsKey(att2.TypeUri))
- aeFetchResponse.AddAttribute(storedAttributes[att2.TypeUri]);
- }
- }
- break;
- }
- if (aeStoreRequest != null) {
- foreach (var att in aeStoreRequest.Attributes) {
- storedAttributes[att.TypeUri] = att;
- }
- aeStoreResponse.Succeeded = true;
- }
- if (sregRequest != null) request.AddResponseExtension(sregResponse);
- if (aeFetchRequest != null) request.AddResponseExtension(aeFetchResponse);
- if (aeStoreRequest != null) request.AddResponseExtension(aeStoreResponse);
- if (papeRequest != null) request.AddResponseExtension(papeResponse);
- }
-
protected void ProviderEndpoint1_AuthenticationChallenge(object sender, DotNetOpenId.Provider.AuthenticationChallengeEventArgs e) {
if (!e.Request.IsReturnUrlDiscoverable) {
throw new ArgumentException(string.Format(CultureInfo.CurrentCulture,
@@ -110,25 +17,13 @@ public partial class ProviderEndpoint : System.Web.UI.Page {
new Uri(e.Request.LocalIdentifier).AbsolutePath.TrimStart('/'));
switch (scenario) {
case TestSupport.Scenarios.AutoApproval:
- // immediately approve
- e.Request.IsAuthenticated = true;
- break;
- case TestSupport.Scenarios.AutoApprovalAddFragment:
- e.Request.SetClaimedIdentifierFragment("frag");
e.Request.IsAuthenticated = true;
break;
case TestSupport.Scenarios.ApproveOnSetup:
e.Request.IsAuthenticated = !e.Request.Immediate;
break;
- case TestSupport.Scenarios.AlwaysDeny:
- e.Request.IsAuthenticated = false;
- break;
- case TestSupport.Scenarios.ExtensionFullCooperation:
- case TestSupport.Scenarios.ExtensionPartialCooperation:
- respondToExtensions(e.Request, scenario);
- e.Request.IsAuthenticated = true;
- break;
default:
+ // All other scenarios are done programmatically only.
throw new InvalidOperationException("Unrecognized scenario");
}
e.Request.Response.Send();
diff --git a/src/DotNetOpenId.TestWeb/htmldiscovery/html1020.aspx b/src/DotNetOpenId.TestWeb/htmldiscovery/html1020.aspx
deleted file mode 100644
index 7c6c15e..0000000
--- a/src/DotNetOpenId.TestWeb/htmldiscovery/html1020.aspx
+++ /dev/null
@@ -1,12 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
- <title>Untitled Page</title>
- <link rel="openid.server" href="http://e/f" />
- <link rel="openid.delegate" href="http://g/h" />
- <link rel="openid2.provider" href="http://a/b" />
- <link rel="openid2.local_id" href="http://c/d" />
-</head>
-<body>
-</body>
-</html>
diff --git a/src/DotNetOpenId.TestWeb/htmldiscovery/html10both.aspx b/src/DotNetOpenId.TestWeb/htmldiscovery/html10both.aspx
deleted file mode 100644
index e97803e..0000000
--- a/src/DotNetOpenId.TestWeb/htmldiscovery/html10both.aspx
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
- <title>Untitled Page</title>
- <link rel="openid.server" href="http://a/b" />
- <link rel="openid.delegate" href="http://c/d" />
-</head>
-<body>
-</body>
-</html>
diff --git a/src/DotNetOpenId.TestWeb/htmldiscovery/html10del.aspx b/src/DotNetOpenId.TestWeb/htmldiscovery/html10del.aspx
deleted file mode 100644
index ddf121a..0000000
--- a/src/DotNetOpenId.TestWeb/htmldiscovery/html10del.aspx
+++ /dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
- <title>Untitled Page</title>
- <link rel="openid.delegate" href="http://c/d" />
-</head>
-<body>
-</body>
-</html>
diff --git a/src/DotNetOpenId.TestWeb/htmldiscovery/html10prov.aspx b/src/DotNetOpenId.TestWeb/htmldiscovery/html10prov.aspx
deleted file mode 100644
index 1b198f9..0000000
--- a/src/DotNetOpenId.TestWeb/htmldiscovery/html10prov.aspx
+++ /dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
- <title>Untitled Page</title>
- <link rel="openid.server" href="http://a/b" />
-</head>
-<body>
-</body>
-</html>
diff --git a/src/DotNetOpenId.TestWeb/htmldiscovery/html2010.aspx b/src/DotNetOpenId.TestWeb/htmldiscovery/html2010.aspx
deleted file mode 100644
index 9fa3738..0000000
--- a/src/DotNetOpenId.TestWeb/htmldiscovery/html2010.aspx
+++ /dev/null
@@ -1,12 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
- <title>Untitled Page</title>
- <link rel="openid2.provider" href="http://a/b" />
- <link rel="openid2.local_id" href="http://c/d" />
- <link rel="openid.server" href="http://e/f" />
- <link rel="openid.delegate" href="http://g/h" />
-</head>
-<body>
-</body>
-</html>
diff --git a/src/DotNetOpenId.TestWeb/htmldiscovery/html2010combinedA.aspx b/src/DotNetOpenId.TestWeb/htmldiscovery/html2010combinedA.aspx
deleted file mode 100644
index c057b67..0000000
--- a/src/DotNetOpenId.TestWeb/htmldiscovery/html2010combinedA.aspx
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
- <title>Untitled Page</title>
- <link rel="openid2.provider B openid.server" href="http://a/b" />
- <link rel="openid2.local_id B openid.delegate" href="http://c/d" />
-</head>
-<body>
-</body>
-</html>
diff --git a/src/DotNetOpenId.TestWeb/htmldiscovery/html2010combinedB.aspx b/src/DotNetOpenId.TestWeb/htmldiscovery/html2010combinedB.aspx
deleted file mode 100644
index 3a86d4c..0000000
--- a/src/DotNetOpenId.TestWeb/htmldiscovery/html2010combinedB.aspx
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
- <title>Untitled Page</title>
- <link rel="A openid2.provider openid.server" href="http://a/b" />
- <link rel="A openid2.local_id openid.delegate" href="http://c/d" />
-</head>
-<body>
-</body>
-</html>
diff --git a/src/DotNetOpenId.TestWeb/htmldiscovery/html2010combinedC.aspx b/src/DotNetOpenId.TestWeb/htmldiscovery/html2010combinedC.aspx
deleted file mode 100644
index 13a3185..0000000
--- a/src/DotNetOpenId.TestWeb/htmldiscovery/html2010combinedC.aspx
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
- <title>Untitled Page</title>
- <link rel="openid.server B openid2.provider" href="http://a/b" />
- <link rel="openid.delegate B openid2.local_id" href="http://c/d" />
-</head>
-<body>
-</body>
-</html>
diff --git a/src/DotNetOpenId.TestWeb/htmldiscovery/html20both.aspx b/src/DotNetOpenId.TestWeb/htmldiscovery/html20both.aspx
deleted file mode 100644
index f41e66a..0000000
--- a/src/DotNetOpenId.TestWeb/htmldiscovery/html20both.aspx
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
- <title>Untitled Page</title>
- <link rel="openid2.provider" href="http://a/b" />
- <link rel="openid2.local_id" href="http://c/d" />
-</head>
-<body>
-</body>
-</html>
diff --git a/src/DotNetOpenId.TestWeb/htmldiscovery/html20del.aspx b/src/DotNetOpenId.TestWeb/htmldiscovery/html20del.aspx
deleted file mode 100644
index 20852c0..0000000
--- a/src/DotNetOpenId.TestWeb/htmldiscovery/html20del.aspx
+++ /dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
- <title>Untitled Page</title>
- <link rel="openid2.local_id" href="http://c/d" />
-</head>
-<body>
-</body>
-</html>
diff --git a/src/DotNetOpenId.TestWeb/htmldiscovery/html20prov.aspx b/src/DotNetOpenId.TestWeb/htmldiscovery/html20prov.aspx
deleted file mode 100644
index f0e673e..0000000
--- a/src/DotNetOpenId.TestWeb/htmldiscovery/html20prov.aspx
+++ /dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
- <title>Untitled Page</title>
- <link rel="openid2.provider" href="http://a/b" />
-</head>
-<body>
-</body>
-</html>
diff --git a/src/DotNetOpenId.TestWeb/htmldiscovery/html20relative.aspx b/src/DotNetOpenId.TestWeb/htmldiscovery/html20relative.aspx
deleted file mode 100644
index b13520c..0000000
--- a/src/DotNetOpenId.TestWeb/htmldiscovery/html20relative.aspx
+++ /dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
- <title>Untitled Page</title>
- <link rel="openid2.provider" href="../a/b" />
-</head>
-<body>
-</body>
-</html>
diff --git a/src/DotNetOpenId.TestWeb/htmldiscovery/redirect.aspx b/src/DotNetOpenId.TestWeb/htmldiscovery/redirect.aspx
deleted file mode 100644
index 8b0373d..0000000
--- a/src/DotNetOpenId.TestWeb/htmldiscovery/redirect.aspx
+++ /dev/null
@@ -1,9 +0,0 @@
-<%@ Page Language="C#" %>
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<script runat="server">
- protected override void OnLoad(EventArgs e) {
- Response.Redirect(Request.QueryString["target"]);
- }
-</script>
diff --git a/src/DotNetOpenId.TestWeb/xrdsdiscovery/XrdsReferencedInHead.aspx b/src/DotNetOpenId.TestWeb/xrdsdiscovery/XrdsReferencedInHead.aspx
deleted file mode 100644
index fabb2aa..0000000
--- a/src/DotNetOpenId.TestWeb/xrdsdiscovery/XrdsReferencedInHead.aspx
+++ /dev/null
@@ -1,17 +0,0 @@
-<%@ Page Language="C#" %>
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<script runat="server">
-</script>
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head runat="server">
- <title>Untitled Page</title>
- <meta http-equiv="X-XRDS-Location" content="<%=Util.GetFullUrl("xrds1020.aspx")%>"/>
-</head>
-<body>
- <form id="form1" runat="server">
- </form>
-</body>
-</html>
diff --git a/src/DotNetOpenId.TestWeb/xrdsdiscovery/XrdsReferencedInHttpHeader.aspx b/src/DotNetOpenId.TestWeb/xrdsdiscovery/XrdsReferencedInHttpHeader.aspx
deleted file mode 100644
index b31c707..0000000
--- a/src/DotNetOpenId.TestWeb/xrdsdiscovery/XrdsReferencedInHttpHeader.aspx
+++ /dev/null
@@ -1,20 +0,0 @@
-<%@ Page Language="C#" %>
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<script runat="server">
- protected override void OnLoad(EventArgs e) {
- base.OnLoad(e);
- Response.AddHeader("X-XRDS-Location", Util.GetFullUrl("xrds1020.aspx").AbsoluteUri);
- }
-</script>
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head runat="server">
- <title>Untitled Page</title>
-</head>
-<body>
- <form id="form1" runat="server">
- </form>
-</body>
-</html>
diff --git a/src/DotNetOpenId.TestWeb/xrdsdiscovery/xrds-irrelevant.aspx b/src/DotNetOpenId.TestWeb/xrdsdiscovery/xrds-irrelevant.aspx
deleted file mode 100644
index 3cdebab..0000000
--- a/src/DotNetOpenId.TestWeb/xrdsdiscovery/xrds-irrelevant.aspx
+++ /dev/null
@@ -1,12 +0,0 @@
-<%@ Page Language="C#" AutoEventWireup="true" ContentType="application/xrds+xml" %><?xml version="1.0" encoding="UTF-8"?>
-<xrds:XRDS
- xmlns:xrds="xri://$xrds"
- xmlns:openid="http://openid.net/xmlns/1.0"
- xmlns="xri://$xrd*($v*2.0)">
- <XRD>
- <Service priority="10">
- <Type>junk</Type>
- <URI>http://a/b</URI>
- </Service>
- </XRD>
-</xrds:XRDS>
diff --git a/src/DotNetOpenId.TestWeb/xrdsdiscovery/xrds10.aspx b/src/DotNetOpenId.TestWeb/xrdsdiscovery/xrds10.aspx
deleted file mode 100644
index 89cbd88..0000000
--- a/src/DotNetOpenId.TestWeb/xrdsdiscovery/xrds10.aspx
+++ /dev/null
@@ -1,14 +0,0 @@
-<%@ Page Language="C#" AutoEventWireup="true" ContentType="application/xrds+xml" %><?xml version="1.0" encoding="UTF-8"?>
-<xrds:XRDS
- xmlns:xrds="xri://$xrds"
- xmlns:openid="http://openid.net/xmlns/1.0"
- xmlns="xri://$xrd*($v*2.0)">
- <XRD>
- <Service priority="10">
- <Type>http://openid.net/signon/1.0</Type>
- <!-- this next sreg one is deliberately an unofficial (but supported) sreg/1.0 typeUri, so we test it. -->
- <Type>http://openid.net/sreg/1.0</Type>
- <URI>http://a/b</URI>
- </Service>
- </XRD>
-</xrds:XRDS>
diff --git a/src/DotNetOpenId.TestWeb/xrdsdiscovery/xrds1020.aspx b/src/DotNetOpenId.TestWeb/xrdsdiscovery/xrds1020.aspx
deleted file mode 100644
index acd982a..0000000
--- a/src/DotNetOpenId.TestWeb/xrdsdiscovery/xrds1020.aspx
+++ /dev/null
@@ -1,18 +0,0 @@
-<%@ Page Language="C#" AutoEventWireup="true" ContentType="application/xrds+xml" %><?xml version="1.0" encoding="UTF-8"?>
-<xrds:XRDS
- xmlns:xrds="xri://$xrds"
- xmlns:openid="http://openid.net/xmlns/1.0"
- xmlns="xri://$xrd*($v*2.0)">
- <XRD>
- <Service priority="10">
- <Type>http://openid.net/signon/1.0</Type>
- <Type>http://openid.net/extensions/sreg/1.1</Type>
- <URI>http://a/b</URI>
- </Service>
- <Service priority="20">
- <Type>http://specs.openid.net/auth/2.0/signon</Type>
- <Type>http://openid.net/extensions/sreg/1.1</Type>
- <URI>http://c/d</URI>
- </Service>
- </XRD>
-</xrds:XRDS>
diff --git a/src/DotNetOpenId.TestWeb/xrdsdiscovery/xrds11.aspx b/src/DotNetOpenId.TestWeb/xrdsdiscovery/xrds11.aspx
deleted file mode 100644
index 7a757b2..0000000
--- a/src/DotNetOpenId.TestWeb/xrdsdiscovery/xrds11.aspx
+++ /dev/null
@@ -1,13 +0,0 @@
-<%@ Page Language="C#" AutoEventWireup="true" ContentType="application/xrds+xml" %><?xml version="1.0" encoding="UTF-8"?>
-<xrds:XRDS
- xmlns:xrds="xri://$xrds"
- xmlns:openid="http://openid.net/xmlns/1.0"
- xmlns="xri://$xrd*($v*2.0)">
- <XRD>
- <Service priority="10">
- <Type>http://openid.net/signon/1.1</Type>
- <Type>http://openid.net/extensions/sreg/1.1</Type>
- <URI>http://a/b</URI>
- </Service>
- </XRD>
-</xrds:XRDS>
diff --git a/src/DotNetOpenId.TestWeb/xrdsdiscovery/xrds20.aspx b/src/DotNetOpenId.TestWeb/xrdsdiscovery/xrds20.aspx
deleted file mode 100644
index 24a832b..0000000
--- a/src/DotNetOpenId.TestWeb/xrdsdiscovery/xrds20.aspx
+++ /dev/null
@@ -1,13 +0,0 @@
-<%@ Page Language="C#" AutoEventWireup="true" ContentType="application/xrds+xml" %><?xml version="1.0" encoding="UTF-8"?>
-<xrds:XRDS
- xmlns:xrds="xri://$xrds"
- xmlns:openid="http://openid.net/xmlns/1.0"
- xmlns="xri://$xrd*($v*2.0)">
- <XRD>
- <Service priority="10">
- <Type>http://specs.openid.net/auth/2.0/signon</Type>
- <Type>http://openid.net/extensions/sreg/1.1</Type>
- <URI>http://a/b</URI>
- </Service>
- </XRD>
-</xrds:XRDS>
diff --git a/src/DotNetOpenId.TestWeb/xrdsdiscovery/xrds2010a.aspx b/src/DotNetOpenId.TestWeb/xrdsdiscovery/xrds2010a.aspx
deleted file mode 100644
index 35f4de7..0000000
--- a/src/DotNetOpenId.TestWeb/xrdsdiscovery/xrds2010a.aspx
+++ /dev/null
@@ -1,18 +0,0 @@
-<%@ Page Language="C#" AutoEventWireup="true" ContentType="application/xrds+xml" %><?xml version="1.0" encoding="UTF-8"?>
-<xrds:XRDS
- xmlns:xrds="xri://$xrds"
- xmlns:openid="http://openid.net/xmlns/1.0"
- xmlns="xri://$xrd*($v*2.0)">
- <XRD>
- <Service priority="10">
- <Type>http://specs.openid.net/auth/2.0/signon</Type>
- <Type>http://openid.net/extensions/sreg/1.1</Type>
- <URI>http://a/b</URI>
- </Service>
- <Service priority="20">
- <Type>http://openid.net/signon/1.0</Type>
- <Type>http://openid.net/extensions/sreg/1.1</Type>
- <URI>http://c/d</URI>
- </Service>
- </XRD>
-</xrds:XRDS>
diff --git a/src/DotNetOpenId.TestWeb/xrdsdiscovery/xrds2010b.aspx b/src/DotNetOpenId.TestWeb/xrdsdiscovery/xrds2010b.aspx
deleted file mode 100644
index aa8d20a..0000000
--- a/src/DotNetOpenId.TestWeb/xrdsdiscovery/xrds2010b.aspx
+++ /dev/null
@@ -1,18 +0,0 @@
-<%@ Page Language="C#" AutoEventWireup="true" ContentType="application/xrds+xml" %><?xml version="1.0" encoding="UTF-8"?>
-<xrds:XRDS
- xmlns:xrds="xri://$xrds"
- xmlns:openid="http://openid.net/xmlns/1.0"
- xmlns="xri://$xrd*($v*2.0)">
- <XRD>
- <Service priority="20">
- <Type>http://openid.net/signon/1.0</Type>
- <Type>http://openid.net/extensions/sreg/1.1</Type>
- <URI>http://c/d</URI>
- </Service>
- <Service priority="10">
- <Type>http://specs.openid.net/auth/2.0/signon</Type>
- <Type>http://openid.net/extensions/sreg/1.1</Type>
- <URI>http://a/b</URI>
- </Service>
- </XRD>
-</xrds:XRDS>