Sync back up to other copy.
authorcantor <cantor@ab3bd59b-922f-494d-bb5f-6f0a3c29deca>
Mon, 26 Apr 2004 17:13:52 +0000 (17:13 +0000)
committercantor <cantor@ab3bd59b-922f-494d-bb5f-6f0a3c29deca>
Mon, 26 Apr 2004 17:13:52 +0000 (17:13 +0000)
git-svn-id: https://subversion.switch.ch/svn/shibboleth/java-idp/trunk@1014 ab3bd59b-922f-494d-bb5f-6f0a3c29deca

src/schemas/shibboleth.xsd

index d9f099f..392fed4 100644 (file)
@@ -4,13 +4,14 @@
        xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
        xmlns:xml="http://www.w3.org/XML/1998/namespace"
        xmlns:shib="urn:mace:shibboleth:1.0"
+       xmlns:saml="urn:oasis:names:tc:SAML:1.0:assertion"
        elementFormDefault="qualified"
        attributeFormDefault="unqualified"
        version="1.2">
 
     <import namespace="http://www.w3.org/2000/09/xmldsig#" schemaLocation="xmldsig-core-schema.xsd"/>
     <import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="xml.xsd"/>
-    
+    <import namespace="urn:oasis:names:tc:SAML:1.0:assertion" schemaLocation="cs-sstc-schema-assertion-1.1.xsd"/>
     
     <!-- Status-Related Information -->
     
             Used with samlp:Requester, signals AA did not recognize handle as valid
     -->
 
-    <!-- Relaxes SAML AttributeValue type definition -->
+    <!--
+    Relaxes SAML AttributeValue type definition. Xerces-C has a bug that prevents
+    anyAttribute content appearing on anyType. It works in 2.2 but not in later versions.
+    -->
 
        <complexType name="AttributeValueType" mixed="true">
                <annotation>
-                       <documentation xml:lang="en">By convention, all Shibboleth attribute values carry this unconstrained xsi:type.</documentation>
+                       <documentation xml:lang="en">
+                       By convention, all Shibboleth 1.1 origin attribute values carry this unconstrained xsi:type.
+                       </documentation>
                </annotation>
-               <sequence>
-                       <any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-               </sequence>
-               <anyAttribute namespace="##any" processContents="lax"/>
+               <complexContent>
+                       <extension base="anyType"/>
+               </complexContent>
        </complexType>
     
     <!-- Attribute Acceptance Policies -->
@@ -51,7 +56,7 @@
                         <extension base="string">
                                <attribute name="Accept" type="boolean" use="optional" default="true"/>
                             <attribute name="Type" type="shib:AttributeRuleValueType" use="optional" default="literal"/>
-                            <anyAttribute namespace="##any" processContents="lax"/>
+                            <anyAttribute namespace="##other" processContents="lax"/>
                         </extension>
                     </simpleContent>
                        </complexType>
@@ -60,7 +65,7 @@
                        <element name="AnyValue">
                                <complexType>
                                        <sequence/>
-                                       <anyAttribute namespace="##any" processContents="lax"/>
+                                       <anyAttribute namespace="##other" processContents="lax"/>
                                </complexType>
                        </element>
                    <element name="Value" maxOccurs="unbounded">
@@ -68,7 +73,7 @@
                            <simpleContent>
                                <extension base="string">
                                    <attribute name="Type" type="shib:AttributeRuleValueType" use="optional" default="literal"/>
-                                   <anyAttribute namespace="##any" processContents="lax"/>
+                                   <anyAttribute namespace="##other" processContents="lax"/>
                                </extension>
                            </simpleContent>
                        </complexType>
@@ -83,7 +88,7 @@
             <complexContent>
                 <extension base="shib:SiteRuleType">
                     <attribute name="Name" type="string" use="required"/>
-                    <anyAttribute namespace="##any" processContents="lax"/>
+                    <anyAttribute namespace="##other" processContents="lax"/>
                 </extension>
             </complexContent>
         </complexType>
         <attribute name="Factory" type="string" use="optional"/>
         <attribute name="Alias" type="string" use="optional"/>
                <attribute name="Header" type="string" use="optional"/>
-               <anyAttribute namespace="##any" processContents="lax"/>
+               <anyAttribute namespace="##other" processContents="lax"/>
     </complexType>
 
     <element name="AttributeRule" type="shib:AttributeRuleType">
     <element name="AttributeAcceptancePolicy">
         <complexType>
             <sequence>
+                <element name="AnyAttribute" minOccurs="0">
+                    <complexType>
+                       <sequence/>
+                    </complexType>
+                </element>
                 <element ref="shib:AttributeRule" minOccurs="0" maxOccurs="unbounded"/>
             </sequence>
-            <anyAttribute namespace="##any" processContents="lax"/>
+            <anyAttribute namespace="##other" processContents="lax"/>
         </complexType>
     </element>