Latest example SAML metadata.

git-svn-id: https://subversion.switch.ch/svn/shibboleth/java-idp/trunk@1266 ab3bd59b-922f-494d-bb5f-6f0a3c29deca

diff --git a/src/conf/IQ-sites.xml b/src/conf/IQ-sites.xml
index 64cfa2a..501626b 100644 (file)
--- a/src/conf/IQ-sites.xml
+++ b/src/conf/IQ-sites.xml
@@ -1,39 +1,60 @@
-<SiteGroup Name="urn:mace:inqueue" xmlns="urn:mace:shibboleth:1.0">
+<EntitiesDescriptor
+    xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="urn:oasis:names:tc:SAML:2.0:metadata ../schemas/sstc-saml-schema-metadata-2.0.xsd urn:mace:shibboleth:metadata:1.0 ../schemas/shibboleth-metadata-1.0.xsd"
+    Name="urn:mace:inqueue"
+    validUntil="2010-01-01T00:00:00">
 
        <!--
-       This is a starter set of example and development origins used within the
+       This is a starter set of metadata for the example system used within the
        InQueue test federation. The InQueue deployment guide describes how to use
-       metadatatool and siterefresh to pick up the most current signed files.
+       metadatatool or siterefresh to pick up the most current signed files.
+       Ordinarily a single EntityDescriptor would contain IdP/AA or SP information,
+       but not both.
        -->
 
-       <OriginSite Name="urn:mace:inqueue:example.edu" ErrorURL="http://wayf.internet2.edu/InQueue/error.html">
-               <Alias>Example State University</Alias>
-               <Contact Type="technical" Name="InQueue Support" Email="inqueue-support@internet2.edu"/>
-               <HandleService Location="https://wayf.internet2.edu/shibboleth-1.2/HS" Name="wayf.internet2.edu"/>
-               <AttributeAuthority Location="https://wayf.internet2.edu/shibboleth-1.2/AA" Name="wayf.internet2.edu"/>
-               <Domain>example.edu</Domain>
-       </OriginSite>
+       <EntityDescriptor entityID="urn:mace:inqueue:example.edu">
+               <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
+                       <Extensions>
+                       <shib:Domain xmlns:shib="urn:mace:shibboleth:metadata:1.0">example.edu</shib:Domain>
+                       </Extensions>
+                       <KeyDescriptor use="signing">
+                           <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+                               <ds:KeyName>wayf.internet2.edu</ds:KeyName>
+                           </ds:KeyInfo>
+                       </KeyDescriptor>
+                       <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+                       <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest"
+                           Location="https://wayf.internet2.edu/shibboleth-1.2/HS"/>
+               </IDPSSODescriptor>
+               <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+                       <Extensions>
+                       <shib:Domain xmlns:shib="urn:mace:shibboleth:metadata:1.0">example.edu</shib:Domain>
+                       </Extensions>
+                       <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
+                           Location="https://wayf.internet2.edu/shibboleth-1.2/AA"/>
+                       <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+               </AttributeAuthorityDescriptor>
+               <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+                       <KeyDescriptor>
+                           <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+                               <ds:KeyName>wayf.internet2.edu</ds:KeyName>
+                           </ds:KeyInfo>
+                       </KeyDescriptor>
+                       <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+                   <AssertionConsumerService index="0"
+                       Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post"
+                       Location="https://wayf.internet2.edu/Shibboleth.shire"/>
+               </SPSSODescriptor>
+               <Organization>
+                   <OrganizationName xml:lang="en">Example State University</OrganizationName>
+                   <OrganizationDisplayName xml:lang="en">Example State University</OrganizationDisplayName>
+                   <OrganizationURL xml:lang="en">http://shibboleth.internet2.edu/</OrganizationURL>
+               </Organization>
+               <ContactPerson contactType="technical">
+                   <SurName>InQueue Support</SurName>
+                   <EmailAddress>inqueue-support@internet2.edu</EmailAddress>
+               </ContactPerson>
+       </EntityDescriptor>
 
-       <OriginSite Name="urn:mace:inqueue:shibdev.edu">
-               <Alias>Shibboleth Development Origin</Alias>
-               <Contact Type="technical" Name="Scott Cantor" Email="cantor.2@osu.edu"/>
-               <HandleService Location="https://shib2.internet2.edu/shibboleth/HS" Name="shib2.internet2.edu"/>
-               <AttributeAuthority Location="https://shib2.internet2.edu/shibboleth/AA" Name="shib2.internet2.edu"/>
-               <Domain>shibdev.edu</Domain>
-       </OriginSite>
-       
-       <DestinationSite Name="urn:mace:inqueue:example.edu">
-               <Alias>Example State University</Alias>
-               <Contact Type="technical" Name="InQueue Support" Email="inqueue-support@internet2.edu"/>
-               <AssertionConsumerServiceURL Location="https://wayf.internet2.edu/Shibboleth.shire"/>
-               <AttributeRequester Name="CN=wayf.internet2.edu, OU=TSG, O=University Corporation for Advanced Internet Development, L=Ann Arbor, ST=Michigan, C=US"/>
-       </DestinationSite>
-
-       <DestinationSite Name="urn:mace:inqueue:shibdev.edu">
-               <Alias>Shibboleth Development Target</Alias>
-               <Contact Type="technical" Name="Scott Cantor" Email="cantor.2@osu.edu"/>
-               <AssertionConsumerServiceURL Location="http://shib2.internet2.edu/Shibboleth.shire"/>
-               <AssertionConsumerServiceURL Location="https://shib2.internet2.edu/Shibboleth.shire"/>
-               <AttributeRequester Name="Email=root@shib2.internet2.edu, CN=shib2.internet2.edu, O=UCAID, L=Ann Arbor, ST=Michigan, C=US"/>
-       </DestinationSite>
-</SiteGroup>
+</EntitiesDescriptor>

diff --git a/src/conf/SAML2Metadata.xml b/src/conf/SAML2Metadata.xml
deleted file mode 100644 (file)
index 56a2c45..0000000
--- a/src/conf/SAML2Metadata.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<EntitiesDescriptor Name="urn:mace:inqueue"
-    xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="urn:oasis:names:tc:SAML:2.0:metadata ../schemas/sstc-saml-schema-metadata-2.0.xsd"
-       xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion"
-       xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-
-    <EntityDescriptor entityID="urn:mace:inqueue:example.edu">
-    
-        <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.0:protocol urn:mace:shibboleth:1.0"
-                errorURL="http://wayf.internet2.edu/InQueue/error.html">
-            <KeyDescriptor use="signing">
-                <ds:KeyInfo>
-                    <ds:KeyName>wayf.internet2.edu</ds:KeyName>
-                </ds:KeyInfo>
-            </KeyDescriptor>
-            <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-            <SingleSignOnService Binding="urn:mace:shibboleth:1.0"
-                       Location="https://wayf.internet2.edu/shibboleth-1.2/HS"/>
-        </IDPSSODescriptor>
-        
-        <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.0:protocol"
-                errorURL="http://wayf.internet2.edu/InQueue/error.html">
-            <KeyDescriptor use="signing">
-                <ds:KeyInfo>
-                    <ds:KeyName>wayf.internet2.edu</ds:KeyName>
-                </ds:KeyInfo>
-            </KeyDescriptor>
-            <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
-                Location="https://wayf.internet2.edu/shibboleth-1.2/AA"/>
-            <saml:Attribute NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"
-                Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" FriendlyName="eduPersonPrincipalName"/>
-            <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-        </AttributeAuthorityDescriptor>
-
-        <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.0:protocol">
-            <KeyDescriptor use="signing">
-                <ds:KeyInfo>
-                    <ds:KeyName>wayf.internet2.edu</ds:KeyName>
-                </ds:KeyInfo>
-            </KeyDescriptor>
-            <AssertionConsumerService isDefault="true" index="0"
-                Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post"
-                       Location="https://wayf.internet2.edu/Shibboleth.shire"/>
-        </SPSSODescriptor>
-
-        <AttributeConsumerDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.0:protocol">
-            <KeyDescriptor use="signing">
-                <ds:KeyInfo>
-                    <ds:KeyName>wayf.internet2.edu</ds:KeyName>
-                </ds:KeyInfo>
-            </KeyDescriptor>
-            <AttributeConsumingService index="0">
-                <ServiceName xml:lang="en">
-                InQueue Sample Service
-                </ServiceName>
-                <RequestedAttribute NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"
-                    Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" FriendlyName="eduPersonPrincipalName"/>
-            </AttributeConsumingService>
-        </AttributeConsumerDescriptor>
-        
-        <Organization>
-            <OrganizationName xml:lang="en">
-            Example State University
-            </OrganizationName>
-            <OrganizationDisplayName xml:lang="en">
-            Example State University
-            </OrganizationDisplayName>
-            <OrganizationURL xml:lang="en">
-            https://wayf.internet2.edu/
-            </OrganizationURL>
-        </Organization>
-
-        <ContactPerson contactType="technical">
-            <Company>Internet2</Company>
-            <GivenName>InQueue Support</GivenName>
-            <EmailAddress>mailto:inqueue-support@internet2.edu</EmailAddress>
-        </ContactPerson>
-    </EntityDescriptor>
-    
-</EntitiesDescriptor>