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

[noreply at shibboleth.net]

Author: rdw
Date: Mon Sep  7 12:19:26 2015
New Revision: 7731

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7731&view=rev
Log:
IDP-808 Collapse Filter configuration namespaces - Schema manipulation (2)

https://issues.shibboleth.net/jira/browse/IDP-808

strip from last schema change all the old style deprecated V2 Policy Rules (AttributeIssuerWhatever)
and all the SAML AttributeRequester PolicyRules

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

Modified: trunk/idp-schema/src/main/resources/schema/shibboleth-afp.xsd
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-schema/src/main/resources/schema/shibboleth-afp.xsd?rev=7731&r1=7730&r2=7731&view=diff
==============================================================================
--- trunk/idp-schema/src/main/resources/schema/shibboleth-afp.xsd	(original)
+++ trunk/idp-schema/src/main/resources/schema/shibboleth-afp.xsd	Mon Sep  7 12:19:26 2015
@@ -348,17 +348,6 @@
         </complexContent>
     </complexType>
 
-    <complexType name="AttributeIssuerString">
-        <annotation>
-            <documentation>
-                A match function that matches the attribute issuer against the specified value.
-            </documentation>
-        </annotation>
-        <complexContent>
-            <extension base="afp:StringMatchType"/>
-        </complexContent>
-    </complexType>
-
     <complexType name="PrincipalNameString">
         <annotation>
             <documentation>A match function that matches the principal name against the specified value.</documentation>
@@ -441,17 +430,6 @@
         <annotation>
             <documentation>
                 A match function that matches the attribute requester against the specified regular expression.
-            </documentation>
-        </annotation>
-        <complexContent>
-            <extension base="afp:RegexMatchType"/>
-        </complexContent>
-    </complexType>
-
-    <complexType name="AttributeIssuerRegex">
-        <annotation>
-            <documentation>
-                A match function that matches the attribute issuer against the specified regular expression.
             </documentation>
         </annotation>
         <complexContent>
@@ -598,20 +576,6 @@
 
     <!-- The old 'SAML' schema -->
 
-    <complexType name="AttributeIssuerEntityAttributeExactMatch">
-        <annotation>
-            <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>
-            <extension base="afp:EntityAttributeExactMatchType"/>
-        </complexContent>
-    </complexType>
-
     <complexType name="EntityAttributeExactMatch">
         <annotation>
             <documentation>
@@ -624,20 +588,6 @@
         </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="afp:EntityAttributeExactMatchType"/>
-        </complexContent>
-    </complexType>
-
     <complexType name="EntityAttributeExactMatchType" abstract="true">
         <complexContent>
             <extension base="afp:MatchFunctorType">
@@ -657,20 +607,6 @@
                     </annotation>
                 </attribute>
             </extension>
-        </complexContent>
-    </complexType>
-
-    <complexType name="AttributeIssuerEntityAttributeRegexMatch">
-        <annotation>
-            <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>
-            <extension base="afp:EntityAttributeRegexMatchType"/>
         </complexContent>
     </complexType>
 
@@ -686,20 +622,6 @@
         </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="afp:EntityAttributeRegexMatchType"/>
-        </complexContent>
-    </complexType>
-

[... 87 lines stripped ...]