From: cantor <cantor@cb58f699-b61c-0410-a6fe-9272a202ed29>
Date: Thu, 9 Jun 2005 20:28:13 +0000 (+0000)
Subject: Fixed inconsistent shib metadata prefix.
X-Git-Tag: 2.4~1315
X-Git-Url: http://www.project-moonshot.org/gitweb/?a=commitdiff_plain;h=8c8ee4f9d1940480087543f73aebf3c467b064a4;p=shibboleth%2Fsp.git

Fixed inconsistent shib metadata prefix.


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

diff --git a/configs/IQ-metadata.xml.in b/configs/IQ-metadata.xml.in
index 10c60ee..a5313e8 100644
--- a/configs/IQ-metadata.xml.in
+++ b/configs/IQ-metadata.xml.in
@@ -2,14 +2,14 @@
     xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-    xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0"
+    xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
     xsi:schemaLocation="urn:oasis:names:tc:SAML:2.0:metadata @-PKGXMLDIR-@/saml-schema-metadata-2.0.xsd urn:mace:shibboleth:metadata:1.0 @-PKGXMLDIR-@/shibboleth-metadata-1.0.xsd http://www.w3.org/2000/09/xmldsig# @-PKGXMLDIR-@/xmldsig-core-schema.xsd"
     Name="urn:mace:inqueue"
     validUntil="2010-01-01T00:00:00Z">
 
     <Extensions>
         <!-- This extension contains the list of CAs used by InQueue entities.  -->
-        <shibmeta:KeyAuthority VerifyDepth="1">
+        <shibmd:KeyAuthority VerifyDepth="1">
             <!-- Verisign -->
             <ds:KeyInfo>
                 <ds:X509Data>
@@ -75,7 +75,7 @@ M4SJ6gjGf83y9axPpuHcjwxQ5fLqZfnvrWH+1owJhQ==
                     </ds:X509Certificate>
                  </ds:X509Data>
             </ds:KeyInfo>
-        </shibmeta:KeyAuthority>
+        </shibmd:KeyAuthority>
     </Extensions>
 
 	<!--
@@ -93,7 +93,7 @@ M4SJ6gjGf83y9axPpuHcjwxQ5fLqZfnvrWH+1owJhQ==
 		<IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
 			<Extensions>
 				<!-- This is a Shibboleth extension to express attribute scope rules. -->
-		        <shib:Scope xmlns:shib="urn:mace:shibboleth:metadata:1.0">example.edu</shib:Scope>
+				<shibmd:Scope>example.edu</shibmd:Scope>
 			</Extensions>
 			
 			<!--
@@ -127,7 +127,7 @@ M4SJ6gjGf83y9axPpuHcjwxQ5fLqZfnvrWH+1owJhQ==
 		<AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
 			<Extensions>
 				<!-- This is a Shibboleth extension to express attribute scope rules. -->
-		        <shib:Scope xmlns:shib="urn:mace:shibboleth:metadata:1.0">example.edu</shib:Scope>
+				<shibmd:Scope>example.edu</shibmd:Scope>
 			</Extensions>
 			
 			<!--
diff --git a/configs/example-metadata.xml.in b/configs/example-metadata.xml.in
index 7a5af07..691c370 100644
--- a/configs/example-metadata.xml.in
+++ b/configs/example-metadata.xml.in
@@ -2,7 +2,7 @@
     xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-    xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0"
+    xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
     xsi:schemaLocation="urn:oasis:names:tc:SAML:2.0:metadata @-PKGXMLDIR-@/saml-schema-metadata-2.0.xsd urn:mace:shibboleth:metadata:1.0 @-PKGXMLDIR-@/shibboleth-metadata-1.0.xsd http://www.w3.org/2000/09/xmldsig# @-PKGXMLDIR-@/xmldsig-core-schema.xsd"
     Name="urn:mace:shibboleth:examples"
     validUntil="2010-01-01T00:00:00Z">
@@ -43,9 +43,9 @@
 		<IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
 			<Extensions>
 				<!-- This is a Shibboleth extension to express attribute scope rules. -->
-				<shib:Scope xmlns:shib="urn:mace:shibboleth:metadata:1.0">example.org</shib:Scope>
+				<shibmd:Scope>example.org</shibmd:Scope>
 				<!-- This enables testing against Internet2's test site. -->
-				<shib:Scope xmlns:shib="urn:mace:shibboleth:metadata:1.0">example.edu</shib:Scope>
+				<shibmd:Scope>example.edu</shibmd:Scope>
 			</Extensions>
 			
 			<!--
@@ -143,9 +143,9 @@ AtThLg==
 		<AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
 			<Extensions>
 				<!-- This is a Shibboleth extension to express attribute scope rules. -->
-				<shib:Scope xmlns:shib="urn:mace:shibboleth:metadata:1.0">example.org</shib:Scope>
+				<shibmd:Scope>example.org</shibmd:Scope>
 				<!-- This enables testing against Internet2's test site. -->
-				<shib:Scope xmlns:shib="urn:mace:shibboleth:metadata:1.0">example.edu</shib:Scope>
+				<shibmd:Scope>example.edu</shibmd:Scope>
 			</Extensions>
 			
 			<!-- The certificate has to be repeated here (or a different one specified if necessary). -->