[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 06:38:32 2014
New Revision: 5792

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5792&view=rev
Log:
IDP-401 Add the capability to escape to spring for profile configuration

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=5792&r1=5791&r2=5792&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 06:38:32 2014
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:samlrp="urn:mace:shibboleth:2.0:relying-party:saml" xmlns:rp="urn:mace:shibboleth:2.0:relying-party" targetNamespace="urn:mace:shibboleth:2.0:relying-party:saml" elementFormDefault="qualified">
-
-    <import namespace="urn:mace:shibboleth:2.0:relying-party" schemaLocation="http://shibboleth.net/schema/idp/shibboleth-relying-party.xsd"/>
-
+<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:spring="http://www.springframework.org/schema/beans" xmlns:samlrp="urn:mace:shibboleth:2.0:relying-party:saml" xmlns:rp="urn:mace:shibboleth:2.0:relying-party" targetNamespace="urn:mace:shibboleth:2.0:relying-party:saml" elementFormDefault="qualified">
+
+    <import namespace="urn:mace:shibboleth:2.0:relying-party" schemaLocation="http://shibboleth.net/schema/idp/shibboleth-relying-party.xsd"/> 
+    <import namespace="http://www.springframework.org/schema/beans" schemaLocation="http://www.springframework.org/schema/beans/spring-beans.xsd"/>
+    
     <complexType name="SAML2ArtifactResolutionProfile">
         <annotation>
             <documentation>SAML 2.0 artifact query communication profile configuration.</documentation>
@@ -233,11 +234,22 @@
         <complexContent>
             <extension base="rp:ProfileConfigurationType">
                 <sequence>
-                    <element name="Audience" type="string" minOccurs="0" maxOccurs="unbounded">
-                        <annotation>
-                            <documentation>Additional audiences to which an assertion may be released.</documentation>
-                        </annotation>
-                    </element>
+                    <choice>
+                        <element name="Audience" type="string" minOccurs="0" maxOccurs="unbounded">
+                            <annotation>
+                                <documentation>Additional audiences to which an assertion may be released.</documentation>
+                            </annotation>
+                        </element>
+                        <element ref="spring:beans" minOccurs="0" maxOccurs="unbounded">
+                            <annotation>
+                                <documentation>
+                                    Additional Spring beans for Configuration.  If a bean of class
+                                    net.shibboleth.idp.profile.config.SecurityConfiguration is defined
+                                    it will be used as the override for the spring context.
+                                </documentation>
+                            </annotation>
+                        </element>
+                    </choice>
                 </sequence>
                 <attribute name="artifactResolutionServiceURL" type="string">
                     <annotation>