Switched to InQueue federation name.

git-svn-id: https://svn.middleware.georgetown.edu/cpp-sp/trunk@504 cb58f699-b61c-0410-a6fe-9272a202ed29

diff --git a/configs/AAP.xml b/configs/AAP.xml
index dd42c47..079a49d 100644 (file)
--- a/configs/AAP.xml
+++ b/configs/AAP.xml
@@ -40,11 +40,11 @@
                </AnySite>
                -->
                
-               <!-- Specific rules for an origin site, these are just InCommon development/sample sites. -->
-               <SiteRule Name="urn:mace:incommon:pilot:example.edu">
+               <!-- Specific rules for an origin site, these are just InQueue development/sample sites. -->
+               <SiteRule Name="urn:mace:inqueue:example.edu">
                        <Value Type="regexp">^urn:mace:.+$</Value>
                </SiteRule>
-               <SiteRule Name="urn:mace:incommon:pilot:shibdev.edu">
+               <SiteRule Name="urn:mace:inqueue:shibdev.edu">
                        <Value Type="regexp">^urn:mace:.+$</Value>
                </SiteRule>
        </AttributeRule>

diff --git a/configs/shibboleth.ini b/configs/shibboleth.ini
index c772b61..747e4f4 100644 (file)
--- a/configs/shibboleth.ini
+++ b/configs/shibboleth.ini
@@ -13,7 +13,7 @@ supportContact=admin@your.site
 logoLocation=/logo.gif
 
 # Mandatory
-wayfURL = https://wayf.internet2.edu/InCommon/WAYF
+wayfURL = https://wayf.internet2.edu/InQueue/WAYF
 cookieName = shib-cookie
 shireSSLOnly = false
 shireError=/opt/shibboleth/etc/shibboleth/shireError.html
@@ -65,7 +65,7 @@ urn:mace:dir:attribute-def:eduPersonEntitlement=simple
 [policies]
 # This is a sample policy URI used by the InCommon pilot origins.
 # You can filter incoming users at a high level by listing the policies to allow.
-InCommonPilot=urn:mace:incommon:pilot
+InCommonPilot=urn:mace:inqueue
 
 [my.server.name]
 # list of attributes to request for server "my.server.name"

diff --git a/configs/sites.xml b/configs/sites.xml
index 4fa0938..8c7fbb2 100644 (file)
--- a/configs/sites.xml
+++ b/configs/sites.xml
@@ -1,11 +1,11 @@
-<SiteGroup Name="urn:mace:incommon:pilot" xmlns="urn:mace:shibboleth:1.0" xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-    <OriginSite Name="urn:mace:incommon:pilot:example.edu">
+<SiteGroup Name="urn:mace:inqueue" xmlns="urn:mace:shibboleth:1.0" xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+    <OriginSite Name="urn:mace:inqueue:example.edu" ErrorURL="http://wayf.internet2.edu/InQueue/error.html">
         <Alias>Example State University</Alias>
         <Contact Type="technical" Name="Alfred E. Neuman" Email="(no email)"/>
-        <HandleService Location="https://wayf.internet2.edu/InCommon/HS" Name="wayf.internet2.edu"/>
+        <HandleService Location="https://wayf.internet2.edu/InQueue/HS" Name="wayf.internet2.edu"/>
         <Domain>example.edu</Domain>
     </OriginSite>
-    <OriginSite Name="urn:mace:incommon:pilot:shibdev.edu">
+    <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"/>

diff --git a/configs/trust.xml b/configs/trust.xml
index 2cba98c..e0184a8 100644 (file)
--- a/configs/trust.xml
+++ b/configs/trust.xml
@@ -193,7 +193,7 @@ sWyoXwRuy7Lauk+P
 </ds:X509Certificate>
             </ds:X509Data>
         </ds:KeyInfo>
-        <Subject regexp="true">^urn:mace:incommon:pilot:.+$</Subject>
+        <Subject regexp="true">^urn:mace:inqueue:.+$</Subject>
     </KeyAuthority>
 
 </Trust>