[java-identity-provider] branch main updated: IDP-1710 (#2) support property replacement in XML.

[Daniel Fisher]

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

dfisher pushed a commit to branch main
in repository java-identity-provider.

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

The following commit(s) were added to refs/heads/main by this push:
       new  a8a7cc24d IDP-1710 (#2) support property replacement in XML.
a8a7cc24d is described below

commit a8a7cc24d63763ebc9acba497a8f9a3f66934454
Author: Daniel Fisher <dfisher at vt.edu>
AuthorDate: Fri Dec 4 22:41:03 2020 -0500

    IDP-1710 (#2) support property replacement in XML.
    
    Replace enum types in LDAP schema with string types.
    This commit makes changes to the v4 schema while the previous commit made changes to the v3 schema.
---
 .../schema/shibboleth-attribute-resolver.xsd       | 58 ++--------------------
 1 file changed, 4 insertions(+), 54 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 c6922b34b..7fc6f0207 100644
--- a/idp-schema/src/main/resources/schema/shibboleth-attribute-resolver.xsd
+++ b/idp-schema/src/main/resources/schema/shibboleth-attribute-resolver.xsd
@@ -867,7 +867,7 @@
                         </documentation>
                     </annotation>
                 </attribute>
-                <attribute name="connectionStrategy" type="resolver:ConnectionStrategyType">
+                <attribute name="connectionStrategy" type="resolver:string">
                     <annotation>
                         <documentation>
                             The LDAP connection strategy. Acceptable values are ACTIVE_PASSIVE, ROUND_ROBIN and RANDOM.
@@ -894,7 +894,7 @@
                         </documentation>
                     </annotation>
                 </attribute>
-                <attribute name="authenticationType" type="resolver:AuthenticationType">
+                <attribute name="authenticationType" type="resolver:string">
                     <annotation>
                         <documentation>
                             DEPRECATED
@@ -903,7 +903,7 @@
                         </documentation>
                     </annotation>
                 </attribute>
-                <attribute name="searchScope" type="resolver:SearchScopeType">
+                <attribute name="searchScope" type="resolver:string">
                     <annotation>
                         <documentation>
                             The LDAP search scope. Acceptable values are OBJECT, ONELEVEL, SUBTREE.
@@ -911,7 +911,7 @@
                         </documentation>
                     </annotation>
                 </attribute>
-                <attribute name="derefAliases" type="resolver:DerefAliasesType">
+                <attribute name="derefAliases" type="resolver:string">
                     <annotation>
                         <documentation>
                             The LDAP alias dereference behavior. Acceptable values are NEVER, SEARCHING, FINDING, ALWAYS.
@@ -1755,33 +1755,6 @@
         </attribute>
     </complexType>
 
-    <simpleType name="ConnectionStrategyType">
-        <annotation>
-            <documentation>Supported connection strategies.</documentation>
-        </annotation>
-        <restriction base="string">
-            <enumeration value="DEFAULT"/> <!-- Deprecated, remove in V5. -->
-            <enumeration value="ACTIVE_PASSIVE"/>
-            <enumeration value="ROUND_ROBIN"/>
-            <enumeration value="RANDOM"/>
-        </restriction>
-    </simpleType>
-
-    <simpleType name="AuthenticationType"><!-- Deprecated, remove in V5. -->
-        <annotation>
-            <documentation>Supported authentication types.</documentation>
-        </annotation>
-        <restriction base="string">
-            <enumeration value="ANONYMOUS"/>
-            <enumeration value="SIMPLE"/>
-            <enumeration value="STRONG"/>
-            <enumeration value="EXTERNAL"/>
-            <enumeration value="DIGEST_MD5"/>
-            <enumeration value="CRAM_MD5"/>
-            <enumeration value="GSSAPI"/>
-        </restriction>
-    </simpleType>
-
     <complexType name="SaslConfigType">
         <choice maxOccurs="unbounded" minOccurs="0">
             <element name="SASLProperty" type="resolver:PropertyType">
@@ -1812,29 +1785,6 @@
         </attribute>
     </complexType>
 
-    <simpleType name="SearchScopeType">
-        <annotation>
-            <documentation>Supported search scopes.</documentation>
-        </annotation>
-        <restriction base="string">
-            <enumeration value="SUBTREE"/>
-            <enumeration value="ONELEVEL"/>
-            <enumeration value="OBJECT"/>
-        </restriction>
-    </simpleType>
-
-    <simpleType name="DerefAliasesType">
-        <annotation>
-            <documentation>How to dereference aliases.</documentation>
-        </annotation>
-        <restriction base="string">
-            <enumeration value="NEVER"/>
-            <enumeration value="SEARCHING"/>
-            <enumeration value="FINDING"/>
-            <enumeration value="ALWAYS"/>
-        </restriction>
-    </simpleType>
-
     <complexType name="LdapPoolConfigType">
         <attribute name="minPoolSize" type="resolver:string">
             <annotation>

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