Got rid of very bad schema hack.

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

diff --git a/schemas/cs-sstc-schema-assertion-1.1.xsd b/schemas/cs-sstc-schema-assertion-1.1.xsd
index 96cde08..26f9458 100644 (file)
--- a/schemas/cs-sstc-schema-assertion-1.1.xsd
+++ b/schemas/cs-sstc-schema-assertion-1.1.xsd
@@ -201,10 +201,5 @@
                        </extension>
                </complexContent>
        </complexType>
-       <element name="AttributeValue" type="saml:AttributeValueType"/>
-       <complexType name="AttributeValueType">
-               <complexContent>
-                       <extension base="anyType"/>
-               </complexContent>
-       </complexType>
+       <element name="AttributeValue" type="anyType"/>
 </schema>

diff --git a/schemas/shibboleth.xsd b/schemas/shibboleth.xsd
index 4dd4cb9..5c73ce8 100644 (file)
--- a/schemas/shibboleth.xsd
+++ b/schemas/shibboleth.xsd
@@ -24,11 +24,7 @@
 
     <!--
     Relaxes SAML AttributeValue type definition. Xerces-C has a bug that prevents
-    anyAttribute content appearing on anyType. As a hack, we define the SAML schema
-    such that AttributeValue now derives from an extended type, and we then extend
-    that type here. 1.1 origins will specify this xsi:type. 1.2 origins will leave
-    it out, and the SAML schema hack will allow it to validate.
-    In 1.1 targets, this type was defined differently.
+    anyAttribute content appearing on anyType. It works in 2.2 but not in later versions.
     -->
 
        <complexType name="AttributeValueType" mixed="true">
@@ -38,7 +34,7 @@
                        </documentation>
                </annotation>
                <complexContent>
-                       <extension base="saml:AttributeValueType"/>
+                       <extension base="anyType"/>
                </complexContent>
        </complexType>