example.org
authorgilbert <gilbert@ab3bd59b-922f-494d-bb5f-6f0a3c29deca>
Mon, 28 Mar 2005 01:30:26 +0000 (01:30 +0000)
committergilbert <gilbert@ab3bd59b-922f-494d-bb5f-6f0a3c29deca>
Mon, 28 Mar 2005 01:30:26 +0000 (01:30 +0000)
git-svn-id: https://subversion.switch.ch/svn/shibboleth/java-idp/trunk@1341 ab3bd59b-922f-494d-bb5f-6f0a3c29deca

src/conf/ExampleMetadata.xml
src/conf/IdP.xml
src/conf/SP.xml

index e673852..68a54f5 100644 (file)
@@ -5,41 +5,41 @@
     Name="urn:mace:inqueue"
     validUntil="2010-01-01T00:00:00Z">
 
-       <EntityDescriptor entityID="urn:mace:inqueue:example.edu">
+       <EntityDescriptor entityID="urn:mace:inqueue:example.org">
                <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
                        <Extensions>
-                       <shib:Scope xmlns:shib="urn:mace:shibboleth:metadata:1.0">example.edu</shib:Scope>
+                       <shib:Scope xmlns:shib="urn:mace:shibboleth:metadata:1.0">example.org</shib:Scope>
                        </Extensions>
                        <KeyDescriptor use="signing">
                            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-                               <ds:KeyName>wayf.internet2.edu</ds:KeyName>
+                               <ds:KeyName>shibboleth.example.org</ds:KeyName>
                            </ds:KeyInfo>
                        </KeyDescriptor>
                        <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
                        <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest"
-                           Location="https://shibboleth.example.edu:8080/shibboleth/HS"/>
+                           Location="https://shibboleth.example.org:8080/shibboleth/HS"/>
                </IDPSSODescriptor>
                <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
                        <Extensions>
-                       <shib:Scope xmlns:shib="urn:mace:shibboleth:metadata:1.0">example.edu</shib:Scope>
+                       <shib:Scope xmlns:shib="urn:mace:shibboleth:metadata:1.0">example.org</shib:Scope>
                        </Extensions>
                        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
-                           Location="https://shibboleth.example.edu:8080/shibboleth/AA"/>
+                           Location="https://shibboleth.example.org:8080/shibboleth/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:KeyName>shibboleth.example.org</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://shibboleth.example.edu:8080/shibboleth/Shibboleth.shire"/>
+                       Location="https://shibboleth.example.org:8080/shibboleth/Shibboleth.shire"/>
                </SPSSODescriptor>
                <Organization>
-                   <OrganizationName xml:lang="en">Example State University</OrganizationName>
+                   <OrganizationName xml:lang="en">Example Entity</OrganizationName>
                    <OrganizationDisplayName xml:lang="en">Example State University</OrganizationDisplayName>
                    <OrganizationURL xml:lang="en">http://shibboleth.internet2.edu/</OrganizationURL>
                </Organization>
index 39471fa..e0ee33f 100644 (file)
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!-- Test IdP configuration file for Example State University 
-        There is one Metadata Entity: urn:mace:inqueue:example.edu
+        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
 -->
 
 <IdPConfig 
        xmlns:name="urn:mace:shibboleth:namemapper:1.0" 
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
        xsi:schemaLocation="urn:mace:shibboleth:idp:config:1.0 shibboleth-idpconfig-1.0.xsd" 
-       AAUrl="https://shibboleth.example.edu:8080/shibboleth/AA" 
+       AAUrl="https://shibboleth.example.org:8080/shibboleth/AA" 
        resolverConfig="/conf/resolver.xml"
-       defaultRelyingParty="urn:mace:inqueue:example.edu" 
-       providerId="urn:mace:inqueue:example.edu">
+       defaultRelyingParty="urn:mace:inqueue:example.org" 
+       providerId="urn:mace:inqueue:example.org">
 
-       <RelyingParty name="urn:mace:inqueue:example.edu" signingCredential="foo">
+       <RelyingParty name="urn:mace:inqueue:example.org" signingCredential="foo">
                <HSNameFormat nameMapping="shm"/>
        </RelyingParty>
 
index 0fef6e3..907633b 100644 (file)
@@ -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
+        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"
     <SHIRE>
         <RequestMapProvider type="edu.internet2.middleware.shibboleth.serviceprovider.XMLRequestMap">
             <RequestMap applicationId="default">
-               <Host name="shibdev.sample.edu" scheme="https">
+               <Host name="shibboleth.example.org" 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="http://shibboleth.example.org/shibboleth">
 
         <!--
         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/HS"
+            shireURL="http://shibboleth.example.org:8080/shibboleth/Shibboleth.shire" 
                        shireSSL="false"/>
 
         <!--
         <!-- 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"/>
 
         <!--
         Revocation using X.509 CRLs is an optional feature in some trust metadata or you may