Get rid of <RelyingPartyGroup/>. Use <RelyingParty/> for service providers and feds.

git-svn-id: https://subversion.switch.ch/svn/shibboleth/java-idp/trunk@856 ab3bd59b-922f-494d-bb5f-6f0a3c29deca

diff --git a/src/conf/origin.xml b/src/conf/origin.xml
index 1ffaf9a..d663f3f 100644 (file)
--- a/src/conf/origin.xml
+++ b/src/conf/origin.xml
@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ShibbolethOriginConfig xmlns="urn:mace:shibboleth:origin:1.0" xmlns:cred="urn:mace:shibboleth:credentials:1.0" xmlns:name="urn:mace:shibboleth:namemapper:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:mace:shibboleth:origin:1.0 origin.xsd" 
-       AAUrl="http://66-108-210-165.nyc.rr.com/shibboleth/AA"  defaultRelyingParty="urn:x-columbia-intranet" 
+       AAUrl="http://snc.cc.columbia.edu/shibboleth/AA"        defaultRelyingParty="urn:x-columbia-intranet" 
        providerId="urn:mace:inqueue:shibdev.edu">
-       <RelyingPartyGroup name="urn:mace:inqueue" signingCredentials="foo">
+       <RelyingParty name="urn:mace:inqueue" signingCredential="foo">
                <HSNameFormat nameMapping="crypto"/>
-       </RelyingPartyGroup>
-       <RelyingPartyGroup name="urn:x-fed1" signingCredentials="bar" passThruErrors="true">
+       </RelyingParty>
+       <RelyingParty name="urn:x-fed1" signingCredential="foo" passThruErrors="true">
                <HSNameFormat nameMapping="crypto"/>
-       </RelyingPartyGroup>
-<!-- might want to change attribute to explicitly say "response" credentials -->
-       <RelyingParty name="urn:x-columbia-intranet" signingCredentials="foo" providerId="urn:x-columbia-intranet.columbia">
+       </RelyingParty>
+       <RelyingParty name="urn:x-columbia-intranet" signingCredential="foo" providerId="urn:x-columbia-intranet.columbia">
                <HSNameFormat nameMapping="uni"/>
        </RelyingParty>
        <ReleasePolicyEngine/>

diff --git a/src/schemas/origin.xsd b/src/schemas/origin.xsd
index 856c213..4bbb9aa 100644 (file)
--- a/src/schemas/origin.xsd
+++ b/src/schemas/origin.xsd
@@ -9,9 +9,23 @@
                </xs:annotation>
                <xs:complexType>
                        <xs:sequence>
-                               <xs:sequence maxOccurs="unbounded">
-                                       <xs:element name="RelyingParty" type="origin:RelyingPartyType" minOccurs="0" maxOccurs="unbounded"/>
-                                       <xs:element name="RelyingPartyGroup" type="origin:RelyingPartyType" minOccurs="0" maxOccurs="unbounded"/>
+                               <xs:sequence>
+                                       <xs:element name="RelyingParty" maxOccurs="unbounded">
+                                               <xs:complexType>
+                                                       <xs:sequence minOccurs="0">
+                                                               <xs:element name="HSNameFormat">
+                                                                       <xs:complexType>
+                                                                               <xs:attribute name="nameMapping" type="xs:string" use="required"/>
+                                                                       </xs:complexType>
+                                                               </xs:element>
+                                                       </xs:sequence>
+                                                       <xs:attribute name="AAUrl" type="xs:anyURI" use="optional"/>
+                                                       <xs:attribute name="passThruErrors" type="xs:boolean" use="optional" default="false"/>
+                                                       <xs:attribute name="providerId" type="xs:anyURI" use="optional"/>
+                                                       <xs:attribute name="signingCredential" type="xs:string" use="optional"/>
+                                                       <xs:attribute name="name" type="xs:string" use="required"/>
+                                               </xs:complexType>
+                                       </xs:element>
                                </xs:sequence>
                                <xs:element name="ReleasePolicyEngine" minOccurs="0">
                                        <xs:complexType>
@@ -30,18 +44,4 @@
                        <xs:attribute name="defaultRelyingParty" type="xs:anyURI" use="required"/>
                </xs:complexType>
        </xs:element>
-       <xs:complexType name="RelyingPartyType">
-               <xs:sequence minOccurs="0">
-                       <xs:element name="HSNameFormat">
-                               <xs:complexType>
-                                       <xs:attribute name="nameMapping" type="xs:string" use="required"/>
-                               </xs:complexType>
-                       </xs:element>
-               </xs:sequence>
-               <xs:attribute name="AAUrl" type="xs:anyURI" use="optional"/>
-               <xs:attribute name="passThruErrors" type="xs:boolean" use="optional" default="false"/>
-               <xs:attribute name="providerId" type="xs:anyURI" use="optional"/>
-               <xs:attribute name="signingCredential" type="xs:string" use="optional"/>
-               <xs:attribute name="name" type="xs:string" use="required"/>
-       </xs:complexType>
 </xs:schema>