[java-identity-provider COMMIT] in /trunk/idp-schema/src/main/resources/schema: shibboleth-attribute-resolver-ad.xsd ...

[noreply at shibboleth.net]

Author: rdw
Date: Mon Jun 30 06:19:48 2014
New Revision: 6193

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6193&view=rev
Log:
IDP-385 Relax several types to be string to allow for property replacement.

Modified:
    trunk/idp-schema/src/main/resources/schema/shibboleth-attribute-resolver-ad.xsd
    trunk/idp-schema/src/main/resources/schema/shibboleth-attribute-resolver-dc.xsd

Modified: trunk/idp-schema/src/main/resources/schema/shibboleth-attribute-resolver-ad.xsd
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-schema/src/main/resources/schema/shibboleth-attribute-resolver-ad.xsd?rev=6193&r1=6192&r2=6193&view=diff
==============================================================================
--- trunk/idp-schema/src/main/resources/schema/shibboleth-attribute-resolver-ad.xsd (original)
+++ trunk/idp-schema/src/main/resources/schema/shibboleth-attribute-resolver-ad.xsd Mon Jun 30 06:19:48 2014
@@ -41,7 +41,7 @@
                         <documentation>Storage service used to store created identifiers</documentation>
                     </annotation>
                 </attribute>
-                <attribute name="lifetime" type="duration">
+                <attribute name="lifetime" type="string">
                     <annotation>
                         <documentation>Lifetime of issued identifiers</documentation>
                     </annotation>
@@ -61,7 +61,7 @@
                         <documentation>Object used to protect and encrypt identifiers</documentation>
                     </annotation>
                 </attribute>
-                <attribute name="lifetime" type="duration">
+                <attribute name="lifetime" type="string">
                     <annotation>
                         <documentation>Lifetime of issued identifiers</documentation>
                     </annotation>
@@ -114,7 +114,7 @@
                         <documentation>The regular expression used to split a value.</documentation>
                     </annotation>
                 </attribute>
-                <attribute name="caseSensitive" type="boolean">
+                <attribute name="caseSensitive" type="string">
                     <annotation>
                         <documentation>
                             A boolean flag indicating the case sensitivity of the regular expression.
@@ -230,7 +230,7 @@
                         <complexType>
                             <simpleContent>
                                 <extension base="string">
-                                    <attribute name="passThru" type="boolean">
+                                    <attribute name="passThru" type="string">
                                         <annotation>
                                             <documentation>
                                                 If true, the source value is passed thru unmodified. If passThru is
@@ -269,12 +269,12 @@
                 <complexType>
                     <simpleContent>
                         <extension base="string">
-                            <attribute name="ignoreCase" type="boolean">
+                            <attribute name="ignoreCase" type="string">
                                 <annotation>
                                     <documentation>If true, value matching will be case-insensitive.</documentation>
                                 </annotation>
                             </attribute>
-                            <attribute name="partialMatch" type="boolean">
+                            <attribute name="partialMatch" type="string">
                                 <annotation>
                                     <documentation>
                                         If true, the SourceValue may match only a substring of the incoming value. By

Modified: trunk/idp-schema/src/main/resources/schema/shibboleth-attribute-resolver-dc.xsd
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-schema/src/main/resources/schema/shibboleth-attribute-resolver-dc.xsd?rev=6193&r1=6192&r2=6193&view=diff
==============================================================================
--- trunk/idp-schema/src/main/resources/schema/shibboleth-attribute-resolver-dc.xsd (original)
+++ trunk/idp-schema/src/main/resources/schema/shibboleth-attribute-resolver-dc.xsd Mon Jun 30 06:19:48 2014
@@ -145,7 +145,7 @@
         <complexContent>
             <extension base="resolver:BaseDataConnectorType">
                 <sequence>
-                    <choice>
+                    <choice minOccurs="0">
                         <element ref="dc:ContainerManagedConnection">
                             <annotation>
                                 <documentation>
@@ -162,7 +162,7 @@
                             </annotation>
                         </element>
                     </choice>
-                    <element name="QueryTemplate" type="string">
+                    <element name="QueryTemplate" type="string"  minOccurs="0">
                         <annotation>
                             <documentation>

[... 214 lines stripped ...]