Update metadata and example key references

[java-idp.git] / src / conf / SP.xml

diff --git a/src/conf/SP.xml b/src/conf/SP.xml
index 0fef6e3..cd1b2cf 100644 (file)
--- a/src/conf/SP.xml
+++ b/src/conf/SP.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- Test SP configuration file for Example State University 
-        There is one Metadata Entity: urn:mace:inqueue:example.edu
+<!-- Test SP configuration file for Example Entity 
+        There is one Metadata Entity: urn:mace:inqueue:example.org
         It has both IdP and SP Roles.
-        It has one server: //shibboleth.example.edu:8080
+        It has one server: //shibboleth.example.org:8080
         The endpoints are in the /shibboleth context on the server
         
         Dependencies:
         Must agreed with referenced external ExampleMetadata file.
         Endpoints must agree with Servlet mappings in web.xml
         Certificates must be generated for these names
-        The "hosts" file maps shibboleth.example.edu to 127.0.0.1
+        The "hosts" file maps shibboleth.example.org to 127.0.0.1
 -->
 
 <ShibbolethTargetConfig xmlns="urn:mace:shibboleth:target:config:1.0"
@@ -26,10 +26,10 @@
     <SHIRE>
         <RequestMapProvider type="edu.internet2.middleware.shibboleth.serviceprovider.XMLRequestMap">
             <RequestMap applicationId="default">
-               <Host name="shibdev.sample.edu" scheme="https">
+               <Host name="shibboleth.example.org" port="8443" scheme="https">
                     <Path name="secure" requireSession="true" exportAssertion="true" />
                 </Host>
-                <Host name="shibdev.sample.edu" port="8080" scheme="http">
+                <Host name="shibboleth.example.org" port="8080" scheme="http">
                     <Path name="secure" requireSession="true" exportAssertion="true"/>
                 </Host>
             </RequestMap>
@@ -37,7 +37,7 @@
     </SHIRE>
 
     <Applications xmlns:saml="urn:oasis:names:tc:SAML:1.0:assertion"
-        id="default" providerId="http://shibdev.sample.edu/shibboleth">
+        id="default" providerId="urn:mace:inqueue:example.org">
 
         <!--
         Controls session lifetimes, address checks, cookie handling, WAYF, and the SHIRE location.
@@ -49,8 +49,8 @@
         Change to https://localhost/shibboleth/HS for internal testing against your own origin.
         -->
         <Sessions lifetime="7200" timeout="3600" checkAddress="true"
-            wayfURL="http://shibdev.sample.edu:8080/shibboleth/HS"
-            shireURL="http://shibdev.sample.edu:8080/shibboleth/Shibboleth.shire" 
+            wayfURL="http://shibboleth.example.org:8080/shibboleth/SSO"
+            shireURL="http://shibboleth.example.org:8080/shibboleth/Shibboleth.shire" 
                        shireSSL="false"/>
 
         <!--
@@ -83,44 +83,11 @@
 
         <!-- Metadata consists of site/operational metadata, trust, revocation providers. Can be external or inline. -->
         <FederationProvider type="edu.internet2.middleware.shibboleth.common.provider.XMLMetadata"
-            uri="/conf/ExampleMetadata.xml"/>
-                       
-               <!-- Creater an inline just to test the inline parse logic -->  
-        <FederationProvider type="edu.internet2.middleware.shibboleth.common.provider.XMLMetadata">
-                       <SiteGroup Name="https://bogus.org/shibboleth" xmlns="urn:mace:shibboleth:1.0">
-                               <OriginSite Name="https://bogus.org/shibboleth/origin">
-                                       <Alias>Localhost Test Deployment</Alias>
-                                       <Contact Type="technical" Name="Your Name Here" Email="root@localhost"/>
-                                       <HandleService Location="https://localhost/shibboleth/HS" Name="CN=localhost, O=Shibboleth Project, C=US"/>
-                                       <AttributeAuthority Location="https://localhost/shibboleth/AA" Name="CN=localhost, O=Shibboleth Project, C=US"/>
-                                       <Domain>localhost</Domain>
-                               </OriginSite>
-                       
-                               <DestinationSite Name="https://bogus.org/shibboleth/target">
-                                       <Alias>Localhost Test Deployment</Alias>
-                                       <Contact Type="technical" Name="Your Name Here" Email="root@localhost"/>
-                                       <AssertionConsumerServiceURL Location="https://localhost/Shibboleth.shire"/>
-                                       <AttributeRequester Name="CN=localhost, O=Shibboleth Project, C=US"/>
-                               </DestinationSite>
-                       </SiteGroup>
-               </FederationProvider>
-                       
-                       
-
-        <TrustProvider type="edu.internet2.middleware.shibboleth.common.provider.XMLTrust"
-            uri="/conf/testtrust.xml"/>
+            uri="/conf/example-sites.xml"/>
 
-        <!--
-        Revocation using X.509 CRLs is an optional feature in some trust metadata or you may
-        supply your own revocation information locally.
-        -->
-        <!--
-        <RevocationProvider type="edu.internet2.middleware.shibboleth.common.provider.XMLRevocation"
-            uri="/conf/IQ-trust.xml"/>
-        -->
 
         <!-- zero or more SAML Audience condition matches -->
-        <saml:Audience>urn:mace:shibdev</saml:Audience>
+        <saml:Audience>urn:mace:inqueue:example.org</saml:Audience>
 
 
     </Applications>
@@ -130,10 +97,10 @@
         <Credentials xmlns="urn:mace:shibboleth:credentials:1.0">
             <FileResolver Id="defcreds">
                 <Key format="PEM">
-                    <Path>/conf/localhost.key</Path>
+                    <Path>/conf/sp-example.key</Path>
                 </Key>
                 <Certificate format="PEM">
-                    <Path>/conf/localhost.crt</Path>
+                    <Path>/conf/sp-example.crt</Path>
                 </Certificate>
             </FileResolver>
         </Credentials>