Fixed inconsistent shib metadata prefix.

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

diff --git a/src/conf/IQ-metadata.xml b/src/conf/IQ-metadata.xml
index ecc44b8..310d843 100644 (file)
--- a/src/conf/IQ-metadata.xml
+++ b/src/conf/IQ-metadata.xml
@@ -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 ../schemas/saml-schema-metadata-2.0.xsd urn:mace:shibboleth:metadata:1.0 ../schemas/shibboleth-metadata-1.0.xsd http://www.w3.org/2000/09/xmldsig# ../schemas/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>
 
        <!--
@@ -91,7 +91,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>
                        
                        <!--
@@ -125,7 +125,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/src/conf/example-metadata.xml b/src/conf/example-metadata.xml
index 2ca6edb..5753951 100644 (file)
--- a/src/conf/example-metadata.xml
+++ b/src/conf/example-metadata.xml
@@ -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 ../schemas/saml-schema-metadata-2.0.xsd urn:mace:shibboleth:metadata:1.0 ../schemas/shibboleth-metadata-1.0.xsd http://www.w3.org/2000/09/xmldsig# ../schemas/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 xmlns:shib="urn:mace:shibboleth:metadata:1.0">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 xmlns:shib="urn:mace:shibboleth:metadata:1.0">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 xmlns:shib="urn:mace:shibboleth:metadata:1.0">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 xmlns:shib="urn:mace:shibboleth:metadata:1.0">example.edu</shibmd:Scope>
                        </Extensions>
                        
                        <!-- The certificate has to be repeated here (or a different one specified if necessary). -->