Updated Java LoginTest and test metadata.

5 files changed, 81 insertions, 1 deletions

diff --git a/tests/data/idp1-la/metadata.xml b/tests/data/idp1-la/metadata.xml
index e90eff17..cace78c5 100644
--- a/tests/data/idp1-la/metadata.xml
+++ b/tests/data/idp1-la/metadata.xml
@@ -9,11 +9,28 @@
   <SingleSignOnProtocolProfile>http://projectliberty.org/profiles/brws-post</SingleSignOnProtocolProfile>
 
   <SingleLogoutServiceURL>https://idp1:1998/singleLogout</SingleLogoutServiceURL>
+  <SingleLogoutServiceReturnURL>https://idp1:1998/singleLogoutReturn</SingleLogoutServiceReturnURL>
   <SingleLogoutProtocolProfile>http://projectliberty.org/profiles/slo-idp-soap</SingleLogoutProtocolProfile>
+  <SingleLogoutProtocolProfile>http://projectliberty.org/profiles/slo-idp-http</SingleLogoutProtocolProfile>
+  <SingleLogoutProtocolProfile>http://projectliberty.org/profiles/slo-sp-soap</SingleLogoutProtocolProfile>
+  <SingleLogoutProtocolProfile>http://projectliberty.org/profiles/slo-sp-http</SingleLogoutProtocolProfile>
+
+  <FederationTerminationServiceURL>https://idp1:1998/federationTermination</FederationTerminationServiceURL>
+  <FederationTerminationServiceReturnURL>https://idp1:1998/federationTerminationReturn</FederationTerminationServiceReturnURL>
+  <FederationTerminationNotificationProtocolProfile>http://projectliberty.org/profiles/fedterm-idp-soap</FederationTerminationNotificationProtocolProfile>
+  <FederationTerminationNotificationProtocolProfile>http://projectliberty.org/profiles/fedterm-idp-http</FederationTerminationNotificationProtocolProfile>
+  <FederationTerminationNotificationProtocolProfile>http://projectliberty.org/profiles/fedterm-sp-soap</FederationTerminationNotificationProtocolProfile>
+  <FederationTerminationNotificationProtocolProfile>http://projectliberty.org/profiles/fedterm-sp-http</FederationTerminationNotificationProtocolProfile>
 
   <RegisterNameIdentifierServiceURL>https://idp1:1998/registerNameIdentifier</RegisterNameIdentifierServiceURL>
+  <RegisterNameIdentifierServiceReturnURL>https://idp1:1998/registerNameIdentifierReturn</RegisterNameIdentifierServiceReturnURL>
+  <RegisterNameIdentifierProtocolProfile>http://projectliberty.org/profiles/rni-idp-soap</RegisterNameIdentifierProtocolProfile>
+  <RegisterNameIdentifierProtocolProfile>http://projectliberty.org/profiles/rni-idp-http</RegisterNameIdentifierProtocolProfile>
+  <RegisterNameIdentifierProtocolProfile>http://projectliberty.org/profiles/rni-sp-soap</RegisterNameIdentifierProtocolProfile>
   <RegisterNameIdentifierProtocolProfile>http://projectliberty.org/profiles/rni-sp-http</RegisterNameIdentifierProtocolProfile>
 
+  <NameIdentifierMappingProtocolProfile>http://projectliberty.org/profiles/nim-sp-http</NameIdentifierMappingProtocolProfile>
+
   <SoapEndpoint>https://idp1:1998/soapEndpoint</SoapEndpoint>
 
 </IDPDescriptor>
diff --git a/tests/data/idp2-la/metadata.xml b/tests/data/idp2-la/metadata.xml
index 24a744ca..6013ef8d 100644
--- a/tests/data/idp2-la/metadata.xml
+++ b/tests/data/idp2-la/metadata.xml
@@ -5,12 +5,28 @@
  <IDPDescriptor>
 
   <SingleSignOnServiceURL>https://idp2:2000/singleSignOn</SingleSignOnServiceURL>
-  <SingleSignOnProtocolProfile>http://projectliberty.org/profiles/sso-get</SingleSignOnProtocolProfile>
+  <SingleSignOnProtocolProfile>http://projectliberty.org/profiles/brws-art</SingleSignOnProtocolProfile>
+  <SingleSignOnProtocolProfile>http://projectliberty.org/profiles/brws-post</SingleSignOnProtocolProfile>
 
   <SingleLogoutServiceURL>https://idp2:2000/singleLogout</SingleLogoutServiceURL>
+  <SingleLogoutServiceReturnURL>https://idp2:2000/singleLogoutReturn</SingleLogoutServiceReturnURL>
   <SingleLogoutProtocolProfile>http://projectliberty.org/profiles/slo-idp-soap</SingleLogoutProtocolProfile>
+  <SingleLogoutProtocolProfile>http://projectliberty.org/profiles/slo-idp-http</SingleLogoutProtocolProfile>
+  <SingleLogoutProtocolProfile>http://projectliberty.org/profiles/slo-sp-soap</SingleLogoutProtocolProfile>
+  <SingleLogoutProtocolProfile>http://projectliberty.org/profiles/slo-sp-http</SingleLogoutProtocolProfile>
+
+  <FederationTerminationServiceURL>https://idp2:2000/federationTermination</FederationTerminationServiceURL>
+  <FederationTerminationServiceReturnURL>https://idp2:2000/federationTerminationReturn</FederationTerminationServiceReturnURL>
+  <FederationTerminationNotificationProtocolProfile>http://projectliberty.org/profiles/fedterm-idp-soap</FederationTerminationNotificationProtocolProfile>
+  <FederationTerminationNotificationProtocolProfile>http://projectliberty.org/profiles/fedterm-idp-http</FederationTerminationNotificationProtocolProfile>
+  <FederationTerminationNotificationProtocolProfile>http://projectliberty.org/profiles/fedterm-sp-soap</FederationTerminationNotificationProtocolProfile>
+  <FederationTerminationNotificationProtocolProfile>http://projectliberty.org/profiles/fedterm-sp-http</FederationTerminationNotificationProtocolProfile>
 
   <RegisterNameIdentifierServiceURL>https://idp2:2000/registerNameIdentifier</RegisterNameIdentifierServiceURL>
+  <RegisterNameIdentifierServiceReturnURL>https://idp2:2000/registerNameIdentifierReturn</RegisterNameIdentifierServiceReturnURL>
+  <RegisterNameIdentifierProtocolProfile>http://projectliberty.org/profiles/rni-idp-soap</RegisterNameIdentifierProtocolProfile>
+  <RegisterNameIdentifierProtocolProfile>http://projectliberty.org/profiles/rni-idp-http</RegisterNameIdentifierProtocolProfile>
+  <RegisterNameIdentifierProtocolProfile>http://projectliberty.org/profiles/rni-sp-soap</RegisterNameIdentifierProtocolProfile>
   <RegisterNameIdentifierProtocolProfile>http://projectliberty.org/profiles/rni-sp-http</RegisterNameIdentifierProtocolProfile>
 
   <SoapEndpoint>https://idp2:2000/soapEndpoint</SoapEndpoint>
diff --git a/tests/data/sp1-la/metadata.xml b/tests/data/sp1-la/metadata.xml
index ec28fa48..df9cdf7e 100644
--- a/tests/data/sp1-la/metadata.xml
+++ b/tests/data/sp1-la/metadata.xml
@@ -7,10 +7,27 @@
   <AssertionConsumerServiceURL id="AssertionConsumerServiceURL1" isDefault="true">https://sp1:2006/assertionConsumer</AssertionConsumerServiceURL>
 
   <SingleLogoutServiceURL>https://sp1:2006/singleLogout</SingleLogoutServiceURL>
+  <SingleLogoutServiceReturnURL>https://sp1:2006/singleLogoutReturn</SingleLogoutServiceReturnURL>
   <SingleLogoutProtocolProfile>http://projectliberty.org/profiles/slo-idp-soap</SingleLogoutProtocolProfile>
+  <SingleLogoutProtocolProfile>http://projectliberty.org/profiles/slo-idp-http</SingleLogoutProtocolProfile>
+  <SingleLogoutProtocolProfile>http://projectliberty.org/profiles/slo-sp-soap</SingleLogoutProtocolProfile>
+  <SingleLogoutProtocolProfile>http://projectliberty.org/profiles/slo-sp-http</SingleLogoutProtocolProfile>
+
+  <FederationTerminationServiceURL>https://sp1:2006/federationTermination</FederationTerminationServiceURL>
+  <FederationTerminationServiceReturnURL>https://sp1:2006/federationTerminationReturn</FederationTerminationServiceReturnURL>
+  <FederationTerminationNotificationProtocolProfile>http://projectliberty.org/profiles/fedterm-idp-soap</FederationTerminationNotificationProtocolProfile>
+  <FederationTerminationNotificationProtocolProfile>http://projectliberty.org/profiles/fedterm-idp-http</FederationTerminationNotificationProtocolProfile>
+  <FederationTerminationNotificationProtocolProfile>http://projectliberty.org/profiles/fedterm-sp-soap</FederationTerminationNotificationProtocolProfile>
+  <FederationTerminationNotificationProtocolProfile>http://projectliberty.org/profiles/fedterm-sp-http</FederationTerminationNotificationProtocolProfile>
 
   <RegisterNameIdentifierServiceURL>https://sp1:2006/registerNameIdentifier</RegisterNameIdentifierServiceURL>
+  <RegisterNameIdentifierServiceReturnURL>https://sp1:2006/registerNameIdentifierReturn</RegisterNameIdentifierServiceReturnURL>
+  <RegisterNameIdentifierProtocolProfile>http://projectliberty.org/profiles/rni-idp-soap</RegisterNameIdentifierProtocolProfile>
+  <RegisterNameIdentifierProtocolProfile>http://projectliberty.org/profiles/rni-idp-http</RegisterNameIdentifierProtocolProfile>
   <RegisterNameIdentifierProtocolProfile>http://projectliberty.org/profiles/rni-sp-soap</RegisterNameIdentifierProtocolProfile>
+  <RegisterNameIdentifierProtocolProfile>http://projectliberty.org/profiles/rni-sp-http</RegisterNameIdentifierProtocolProfile>
+
+  <NameIdentifierMappingProtocolProfile>http://projectliberty.org/profiles/nim-sp-http</NameIdentifierMappingProtocolProfile>
 
   <SoapEndpoint>https://sp1:2006/soapEndpoint</SoapEndpoint>
 
diff --git a/tests/data/sp2-la/metadata.xml b/tests/data/sp2-la/metadata.xml
index 414799cb..a1342a43 100644
--- a/tests/data/sp2-la/metadata.xml
+++ b/tests/data/sp2-la/metadata.xml
@@ -7,10 +7,25 @@
   <AssertionConsumerServiceURL id="AssertionConsumerServiceURL1" isDefault="true">https://sp2:2008/assertionConsumer</AssertionConsumerServiceURL>
 
   <SingleLogoutServiceURL>https://sp2:2008/singleLogout</SingleLogoutServiceURL>
+  <SingleLogoutServiceReturnURL>https://sp2:2008/singleLogoutReturn</SingleLogoutServiceReturnURL>
   <SingleLogoutProtocolProfile>http://projectliberty.org/profiles/slo-idp-soap</SingleLogoutProtocolProfile>
+  <SingleLogoutProtocolProfile>http://projectliberty.org/profiles/slo-idp-http</SingleLogoutProtocolProfile>
+  <SingleLogoutProtocolProfile>http://projectliberty.org/profiles/slo-sp-soap</SingleLogoutProtocolProfile>
+  <SingleLogoutProtocolProfile>http://projectliberty.org/profiles/slo-sp-http</SingleLogoutProtocolProfile>
+
+  <FederationTerminationServiceURL>https://sp2:2008/federationTermination</FederationTerminationServiceURL>
+  <FederationTerminationServiceReturnURL>https://sp2:2008/federationTerminationReturn</FederationTerminationServiceReturnURL>
+  <FederationTerminationNotificationProtocolProfile>http://projectliberty.org/profiles/fedterm-idp-soap</FederationTerminationNotificationProtocolProfile>
+  <FederationTerminationNotificationProtocolProfile>http://projectliberty.org/profiles/fedterm-idp-http</FederationTerminationNotificationProtocolProfile>
+  <FederationTerminationNotificationProtocolProfile>http://projectliberty.org/profiles/fedterm-sp-soap</FederationTerminationNotificationProtocolProfile>
+  <FederationTerminationNotificationProtocolProfile>http://projectliberty.org/profiles/fedterm-sp-http</FederationTerminationNotificationProtocolProfile>
 
   <RegisterNameIdentifierServiceURL>https://sp2:2008/registerNameIdentifier</RegisterNameIdentifierServiceURL>
+  <RegisterNameIdentifierServiceReturnURL>https://sp2:2008/registerNameIdentifierReturn</RegisterNameIdentifierServiceReturnURL>
+  <RegisterNameIdentifierProtocolProfile>http://projectliberty.org/profiles/rni-idp-soap</RegisterNameIdentifierProtocolProfile>
+  <RegisterNameIdentifierProtocolProfile>http://projectliberty.org/profiles/rni-idp-http</RegisterNameIdentifierProtocolProfile>
   <RegisterNameIdentifierProtocolProfile>http://projectliberty.org/profiles/rni-sp-soap</RegisterNameIdentifierProtocolProfile>
+  <RegisterNameIdentifierProtocolProfile>http://projectliberty.org/profiles/rni-sp-http</RegisterNameIdentifierProtocolProfile>
 
   <SoapEndpoint>https://sp2:2008/soapEndpoint</SoapEndpoint>
 
diff --git a/tests/data/sp3-la/metadata.xml b/tests/data/sp3-la/metadata.xml
index 1dcedf46..ef36fa5b 100644
--- a/tests/data/sp3-la/metadata.xml
+++ b/tests/data/sp3-la/metadata.xml
@@ -7,10 +7,25 @@
   <AssertionConsumerServiceURL id="AssertionConsumerServiceURL1" isDefault="true">https://sp3:2010/assertionConsumer</AssertionConsumerServiceURL>
 
   <SingleLogoutServiceURL>https://sp3:2010/singleLogout</SingleLogoutServiceURL>
+  <SingleLogoutServiceReturnURL>https://sp3:2010/singleLogoutReturn</SingleLogoutServiceReturnURL>
   <SingleLogoutProtocolProfile>http://projectliberty.org/profiles/slo-idp-soap</SingleLogoutProtocolProfile>
+  <SingleLogoutProtocolProfile>http://projectliberty.org/profiles/slo-idp-http</SingleLogoutProtocolProfile>
+  <SingleLogoutProtocolProfile>http://projectliberty.org/profiles/slo-sp-soap</SingleLogoutProtocolProfile>
+  <SingleLogoutProtocolProfile>http://projectliberty.org/profiles/slo-sp-http</SingleLogoutProtocolProfile>
+
+  <FederationTerminationServiceURL>https://sp3:2010/federationTermination</FederationTerminationServiceURL>
+  <FederationTerminationServiceReturnURL>https://sp3:2010/federationTerminationReturn</FederationTerminationServiceReturnURL>
+  <FederationTerminationNotificationProtocolProfile>http://projectliberty.org/profiles/fedterm-idp-soap</FederationTerminationNotificationProtocolProfile>
+  <FederationTerminationNotificationProtocolProfile>http://projectliberty.org/profiles/fedterm-idp-http</FederationTerminationNotificationProtocolProfile>
+  <FederationTerminationNotificationProtocolProfile>http://projectliberty.org/profiles/fedterm-sp-soap</FederationTerminationNotificationProtocolProfile>
+  <FederationTerminationNotificationProtocolProfile>http://projectliberty.org/profiles/fedterm-sp-http</FederationTerminationNotificationProtocolProfile>
 
   <RegisterNameIdentifierServiceURL>https://sp3:2010/registerNameIdentifier</RegisterNameIdentifierServiceURL>
+  <RegisterNameIdentifierServiceReturnURL>https://sp3:2010/registerNameIdentifierReturn</RegisterNameIdentifierServiceReturnURL>
+  <RegisterNameIdentifierProtocolProfile>http://projectliberty.org/profiles/rni-idp-soap</RegisterNameIdentifierProtocolProfile>
+  <RegisterNameIdentifierProtocolProfile>http://projectliberty.org/profiles/rni-idp-http</RegisterNameIdentifierProtocolProfile>
   <RegisterNameIdentifierProtocolProfile>http://projectliberty.org/profiles/rni-sp-soap</RegisterNameIdentifierProtocolProfile>
+  <RegisterNameIdentifierProtocolProfile>http://projectliberty.org/profiles/rni-sp-http</RegisterNameIdentifierProtocolProfile>
 
   <SoapEndpoint>https://sp3:2010/soapEndpoint</SoapEndpoint>