[java-identity-provider] 07/07: IDP-1193 Flatten StoredIdConnector properly

[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=34c275c7f30b8c18b1c9fdf3fbe7141d217e53ee

commit 34c275c7f30b8c18b1c9fdf3fbe7141d217e53ee
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Fri Jul 14 14:07:14 2017 +0100

    IDP-1193 Flatten StoredIdConnector properly
    
    https://issues.shibboleth.net/jira/browse/IDP-1193
---
 .../idp/attribute/resolver/spring/dc/resolver/stored.xml          | 3 +++
 .../src/main/resources/schema/shibboleth-attribute-resolver.xsd   | 8 ++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/resolver/stored.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/resolver/stored.xml
index 7aa4d48..df0e465 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/resolver/stored.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/resolver/stored.xml
@@ -15,4 +15,7 @@
         jdbcDriver="org.hsqldb.jdbc.JDBCDriver"
         jdbcURL="jdbc:hsqldb:mem:RDBMSDataConnectorStore" />
         
+        <FailoverDataConnector ref="sddsadas"/>
+        <FailoverDataConnector ref="sddsadas"/>
+        
 </DataConnector>
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 7e735f1..86de4b7 100644
--- a/idp-schema/src/main/resources/schema/shibboleth-attribute-resolver.xsd
+++ b/idp-schema/src/main/resources/schema/shibboleth-attribute-resolver.xsd
@@ -1416,8 +1416,12 @@
             </documentation>
         </annotation>
         <complexContent>
-            <extension base="resolver:BaseDataConnectorType">
-                <choice minOccurs="0">
+            <extension base="resolver:FlattenedBaseDataConnectorType">
+                <choice  maxOccurs="unbounded" minOccurs="0">
+                    <element ref="resolver:Dependency"/>
+                    <element ref="resolver:InputAttributeDefinition"/>
+                    <element ref="resolver:InputDataConnector"/>
+                    <element ref="resolver:FailoverDataConnector"/>
                     <element ref="resolver:ContainerManagedConnection">
                         <annotation>
                             <documentation>

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