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

[noreply at shibboleth.net]

Author: rdw
Date: Wed Sep 23 05:26:50 2015
New Revision: 7772

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7772&view=rev
Log:
IDP-808 Collapse namespaces

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

Rename some of the more verbose types in afp: (only)
Add explicit warn on the (legacy only) AtributeIssuer*.. Matchers

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=7772&r1=7771&r2=7772&view=diff
==============================================================================
--- trunk/idp-schema/src/main/resources/schema/shibboleth-afp.xsd	(original)
+++ trunk/idp-schema/src/main/resources/schema/shibboleth-afp.xsd	Wed Sep 23 05:26:50 2015
@@ -316,7 +316,7 @@
     </complexType>
 
     <!--  Literal String Match Functions -->
-    <complexType name="AttributeRequesterString">
+    <complexType name="Requester">
         <annotation>
             <documentation>
                 A match function that matches the attribute request against the specified value.
@@ -327,7 +327,7 @@
         </complexContent>
     </complexType>
 
-    <complexType name="PrincipalNameString">
+    <complexType name="PrincipalName">
         <annotation>
             <documentation>A match function that matches the principal name against the specified value.</documentation>
         </annotation>
@@ -336,7 +336,7 @@
         </complexContent>
     </complexType>
 
-    <complexType name="AuthenticationMethodString">
+    <complexType name="AuthenticationMethod">
         <annotation>
             <documentation>
                 A match function that matches the authentication method against the specified value.
@@ -347,7 +347,7 @@
         </complexContent>
     </complexType>
 
-    <complexType name="AttributeValueString">
+    <complexType name="Value">
         <annotation>
             <documentation>
                 A match function that matches the value of an attribute against the specified value. This match
@@ -355,22 +355,22 @@
             </documentation>
         </annotation>
         <complexContent>
-            <extension base="afp:AttributeTargetedStringMatchType"/>
-        </complexContent>
-    </complexType>
-
-    <complexType name="AttributeScopeString">
+            <extension base="afp:TargetedStringMatchType"/>
+        </complexContent>
+    </complexType>
+
+    <complexType name="Scope">
         <annotation>
             <documentation>
                 A match function that matches the attribute scope against the specified value.
             </documentation>
         </annotation>
         <complexContent>
-            <extension base="afp:AttributeTargetedStringMatchType"/>
-        </complexContent>
-    </complexType>
-
-    <complexType name="AttributeTargetedStringMatchType" abstract="true">
+            <extension base="afp:TargetedStringMatchType"/>
+        </complexContent>
+    </complexType>
+
+    <complexType name="TargetedStringMatchType" abstract="true">
         <complexContent>
             <extension base="afp:StringMatchType">
                 <attribute name="attributeID" type="string">
@@ -405,7 +405,7 @@
     </complexType>
 
     <!--  Regular Expression Match Functions -->
-    <complexType name="AttributeRequesterRegex">
+    <complexType name="RequesterRegex">
         <annotation>
             <documentation>
                 A match function that matches the attribute requester against the specified regular expression.
@@ -438,7 +438,7 @@
         </complexContent>
     </complexType>
 
-    <complexType name="AttributeValueRegex">
+    <complexType name="ValueRegex">
         <annotation>
             <documentation>
                 A match function that matches an attribute value against the specified regular expression. This function
@@ -446,22 +446,22 @@
             </documentation>
         </annotation>
         <complexContent>
-            <extension base="afp:AttributeTargetedRegexMatchType"/>
-        </complexContent>
-    </complexType>
-
-    <complexType name="AttributeScopeRegex">
+            <extension base="afp:TargetedRegexMatchType"/>
+        </complexContent>
+    </complexType>
+
+    <complexType name="ScopeRegex">
         <annotation>
             <documentation>
                 A match function that matches the attribute scope against the specified regular expression.
             </documentation>
         </annotation>
         <complexContent>
-            <extension base="afp:AttributeTargetedRegexMatchType"/>
-        </complexContent>
-    </complexType>
-
-    <complexType name="AttributeTargetedRegexMatchType" abstract="true">
+            <extension base="afp:TargetedRegexMatchType"/>
+        </complexContent>
+    </complexType>
+
+    <complexType name="TargetedRegexMatchType" abstract="true">
         <complexContent>
             <extension base="afp:RegexMatchType">

[... 2 lines stripped ...]