[java-identity-provider COMMIT] /trunk/idp-schema/src/main/resources/schema/shibboleth-afp-mf-saml.xsd

[noreply at shibboleth.net]

Author: scantor
Date: Sun Dec  7 15:28:20 2014
New Revision: 7050

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7050&view=rev
Log:
Add deprecation and unsupported comments, fix docs.

Modified:
    trunk/idp-schema/src/main/resources/schema/shibboleth-afp-mf-saml.xsd

Modified: trunk/idp-schema/src/main/resources/schema/shibboleth-afp-mf-saml.xsd
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-schema/src/main/resources/schema/shibboleth-afp-mf-saml.xsd?rev=7050&r1=7049&r2=7050&view=diff
==============================================================================
--- trunk/idp-schema/src/main/resources/schema/shibboleth-afp-mf-saml.xsd (original)
+++ trunk/idp-schema/src/main/resources/schema/shibboleth-afp-mf-saml.xsd Sun Dec  7 15:28:20 2014
@@ -15,6 +15,8 @@
             <documentation>
                 A match function that checks if the attribute issuer contains an entity attribute with the
                 specified value.
+                
+                Not supported in V3. 
             </documentation>
         </annotation>
         <complexContent>
@@ -23,18 +25,6 @@
     </complexType>
 
     <complexType name="EntityAttributeExactMatch">
-        <annotation>
-            <documentation>
-                A match function that checks if the attribute issuer contains an entity attribute with the
-                specified value.
-            </documentation>
-        </annotation>
-        <complexContent>
-            <extension base="saml:EntityAttributeExactMatchType"/>
-        </complexContent>
-    </complexType>
-
-    <complexType name="AttributeRequesterEntityAttributeExactMatch">
         <annotation>
             <documentation>
                 A match function that checks if the attribute requester contains an entity attribute with the
@@ -46,6 +36,20 @@
         </complexContent>
     </complexType>
 
+    <complexType name="AttributeRequesterEntityAttributeExactMatch">
+        <annotation>
+            <documentation>
+                A match function that checks if the attribute requester contains an entity attribute with the
+                specified value.
+                
+                Deprecated in favor of "EntityAttributeExactMatch".
+            </documentation>
+        </annotation>
+        <complexContent>
+            <extension base="saml:EntityAttributeExactMatchType"/>
+        </complexContent>
+    </complexType>
+
     <complexType name="EntityAttributeExactMatchType" abstract="true">
         <complexContent>
             <extension base="afp:MatchFunctorType">
@@ -73,6 +77,8 @@
             <documentation>
                 A match function that checks if the attribute issuer contains an entity attribute with a
                 value that matches the given regular expression.
+                
+                Not supported in V3.
             </documentation>
         </annotation>
         <complexContent>
@@ -81,18 +87,6 @@
     </complexType>
 
     <complexType name="EntityAttributeRegexMatch">
-        <annotation>
-            <documentation>
-                A match function that checks if the attribute issuer contains an entity attribute with a
-                value that matches the given regular expression.
-            </documentation>
-        </annotation>
-        <complexContent>
-            <extension base="saml:EntityAttributeRegexMatchType"/>
-        </complexContent>
-    </complexType>
-
-    <complexType name="AttributeRequesterEntityAttributeRegexMatch">
         <annotation>
             <documentation>
                 A match function that checks if the attribute requester contains an entity attribute with a
@@ -104,6 +98,20 @@
         </complexContent>
     </complexType>
 
+    <complexType name="AttributeRequesterEntityAttributeRegexMatch">
+        <annotation>
+            <documentation>
+                A match function that checks if the attribute requester contains an entity attribute with a
+                value that matches the given regular expression.
+                
+                Deprecated in favor of "EntityAttributeRegexMatch".
+            </documentation>
+        </annotation>
+        <complexContent>
+            <extension base="saml:EntityAttributeRegexMatchType"/>
+        </complexContent>
+    </complexType>
+
     <complexType name="EntityAttributeRegexMatchType" abstract="true">
         <complexContent>
             <extension base="afp:MatchFunctorType">
@@ -132,6 +140,8 @@
             <documentation>
                 A match function that evaluates to true if the attribute issuer supports a specified
                 NameID format.
+                
+                Not supported in V3.
             </documentation>
         </annotation>
         <complexContent>
@@ -140,18 +150,6 @@
     </complexType>
 
     <complexType name="NameIDFormatExactMatch">
-        <annotation>
-            <documentation>
-                A match function that evaluates to true if the attribute issuer supports a specified
-                NameID format.

[... 67 lines stripped ...]