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

[noreply at shibboleth.net]

Author: rdw
Date: Tue Apr 29 04:27:37 2014
New Revision: 5789

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5789&view=rev
Log:
IDP-385 IDP-401 relax all types in relying-party-schema to string

Modified:
    trunk/idp-schema/src/main/resources/schema/shibboleth-relying-party-saml.xsd

Modified: trunk/idp-schema/src/main/resources/schema/shibboleth-relying-party-saml.xsd
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-schema/src/main/resources/schema/shibboleth-relying-party-saml.xsd?rev=5789&r1=5788&r2=5789&view=diff
==============================================================================
--- trunk/idp-schema/src/main/resources/schema/shibboleth-relying-party-saml.xsd (original)
+++ trunk/idp-schema/src/main/resources/schema/shibboleth-relying-party-saml.xsd Tue Apr 29 04:27:37 2014
@@ -45,7 +45,7 @@
         </annotation>
         <complexContent>
             <extension base="samlrp:SAML2SSOProfile">
-                <attribute name="maximumTokenDelegationChainLength" type="integer">
+                <attribute name="maximumTokenDelegationChainLength" type="string">
                     <annotation>
                         <documentation>
                             Maximum number of times a given token is allowed to have been delegated.
@@ -69,7 +69,7 @@
         </annotation>
         <complexContent>
             <extension base="samlrp:SAML2ProfileConfigurationType">
-                <attribute name="allowDelegation" type="boolean">
+                <attribute name="allowDelegation" type="string">
                     <annotation>
                         <documentation>
                             Whether produced assertions may be delegated.
@@ -90,7 +90,7 @@
                         </documentation>
                     </annotation>
                 </attribute>
-                <attribute name="includeAttributeStatement" type="boolean">
+                <attribute name="includeAttributeStatement" type="string">
                     <annotation>
                         <documentation>
                             Boolean flag indicating whether an attribute statement should be included with the
@@ -110,7 +110,7 @@
                         </documentation>
                     </annotation>
                 </attribute>
-                <attribute name="skipEndpointValidationWhenSigned" type="boolean">
+                <attribute name="skipEndpointValidationWhenSigned" type="string">
                     <annotation>
                         <documentation>
                             If true, allows signed AuthnRequests to bypass validation of the response
@@ -140,22 +140,34 @@
                         <documentation>A flag indicating whether encryption is optional.</documentation>
                     </annotation>
                 </attribute>
-                <attribute name="encryptNameIds" type="samlrp:cryptoReqType">
-                    <annotation>
-                        <documentation>A flag indicating whether NameIDs should be encrypted.</documentation>
-                    </annotation>
-                </attribute>
-                <attribute name="encryptAssertions" type="samlrp:cryptoReqType">
-                    <annotation>
-                        <documentation>A flag indicating whether assertions should be encrypted.</documentation>
-                    </annotation>
-                </attribute>
-                <attribute name="encryptAttributes" type="samlrp:cryptoReqType">
-                    <annotation>
-                        <documentation>A flag indicating whether attributes should be encrypted.</documentation>
-                    </annotation>
-                </attribute>
-                <attribute name="assertionProxyCount" type="nonNegativeInteger">
+                <attribute name="encryptNameIds" type="string">
+                    <annotation>
+                        <documentation>
+                            A flag indicating whether NameIDs should be encrypted.
+                        
+                            One of "always", "conditional", "never"
+                        </documentation>
+                    </annotation>
+                </attribute>
+                <attribute name="encryptAssertions" type="string">
+                    <annotation>
+                        <documentation>
+                            A flag indicating whether assertions should be encrypted.
+                        
+                            One of "always", "conditional", "never"
+                        </documentation>
+                    </annotation>
+                </attribute>
+                <attribute name="encryptAttributes" type="string">
+                    <annotation>
+                        <documentation>
+                            A flag indicating whether attributes should be encrypted.
+
+                            One of "always", "conditional", "never"
+                        </documentation>
+                    </annotation>
+                </attribute>

[... 99 lines stripped ...]