[java-identity-provider] 07/51: IDP-1121 Final schema tweaks after namespace removal

[Rod Widdowson]

This is an automated email from the git hooks/post-receive script.

rdw pushed a commit to branch master
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=7cc846db704c0aa011b3dd539f4ef0c2452547c7

commit 7cc846db704c0aa011b3dd539f4ef0c2452547c7
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Fri Nov 23 17:12:12 2018 +0000

    IDP-1121 Final schema tweaks after namespace removal
---
 .../schema/shibboleth-attribute-resolver.xsd       | 29 +++-------------------
 1 file changed, 3 insertions(+), 26 deletions(-)

diff --git a/idp-schema/src/main/resources/schema/shibboleth-attribute-resolver.xsd b/idp-schema/src/main/resources/schema/shibboleth-attribute-resolver.xsd
index 5cca087..da919ee 100644
--- a/idp-schema/src/main/resources/schema/shibboleth-attribute-resolver.xsd
+++ b/idp-schema/src/main/resources/schema/shibboleth-attribute-resolver.xsd
@@ -49,7 +49,7 @@
             </documentation>
         </annotation>
         <complexContent>
-            <extension base="resolver:FlattenedBaseResolutionPlugInType">
+            <extension base="resolver:BaseResolutionPlugInType">
                 <attribute name="dependencyOnly" type="string">
                     <annotation>
                         <documentation>
@@ -131,7 +131,7 @@
             </documentation>
         </annotation>
         <complexContent>
-            <extension base="resolver:FlattenedBaseResolutionPlugInType">
+            <extension base="resolver:BaseResolutionPlugInType">
                 <attribute name="noRetryDelay" type="string">
                     <annotation>
                         <documentation>Time to bypass connector after a failure before trying it again.</documentation>
@@ -164,7 +164,7 @@
         </complexContent>
     </complexType>
 
-    <complexType name="FlattenedBaseResolutionPlugInType" abstract="true">
+    <complexType name="BaseResolutionPlugInType" abstract="true">
         <annotation>
             <documentation>
                 A base type for all attribute resolver plugins: data and principal
@@ -208,21 +208,6 @@
         </attribute>
     </complexType>
 
-    <complexType name="BaseResolutionPlugInType" abstract="true">
-        <annotation>
-            <documentation>
-                A base type for all legacy attribute resolver plugins
-            </documentation>
-        </annotation>
-        <complexContent>
-        <extension base="resolver:FlattenedBaseResolutionPlugInType">
-            <sequence>
-                <element ref="resolver:Dependency" minOccurs="0" maxOccurs="unbounded"/>
-            </sequence>
-        </extension>
-        </complexContent>
-    </complexType>
-
     <element name="Dependency" type="resolver:PluginDependencyType">
         <annotation>
             <documentation>
@@ -328,8 +313,6 @@
         </sequence>
     </complexType>
 
-    <!--  Flatten the ad: namespace into the resolver: namespace -->
-
     <complexType name="ContextDerivedAttribute">
         <annotation>
             <documentation>A attribute definition to pull attribute values from anywhere in the PRC tree</documentation>
@@ -768,8 +751,6 @@
         </complexContent>
     </complexType>
 
-    <!-- Flatten the dc: namespace into the resolver: namespace -->
-
     <complexType name="ComputedId">
         <annotation>
             <documentation>
@@ -1948,10 +1929,6 @@
         </attribute>
     </complexType>
 
-
-
-    <!-- Flatten the enc: namespace into the resolver: namespace -->
-
     <!-- Encoders that produce SAML 1 or SAML 2 Attributes -->
     <complexType name="SAML1String">
         <annotation>

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.