diff options
| author | Bojan Suzic <bojan.suzic@iaik.tugraz.at> | 2014-02-06 18:30:35 +0100 |
|---|---|---|
| committer | Bojan Suzic <bojan.suzic@iaik.tugraz.at> | 2014-02-06 18:30:35 +0100 |
| commit | b6076468ae4c2fda384d051adece37a351faae31 (patch) | |
| tree | 088f0cf5f66144b61ae6eef52bb7f812bf252ccf /id/server/moa-id-commons | |
| parent | 836694ca7d197121bd5be0d11808fd1fbf73292f (diff) | |
| parent | 1c567f6eb16fa10d3811fbaaf70c4ab04fb08077 (diff) | |
| download | moa-id-spss-b6076468ae4c2fda384d051adece37a351faae31.tar.gz moa-id-spss-b6076468ae4c2fda384d051adece37a351faae31.tar.bz2 moa-id-spss-b6076468ae4c2fda384d051adece37a351faae31.zip | |
Merge branch 'moa2_0_tlenz' of gitlab.iaik.tugraz.at:afitzek/moa-idspss into moa2_0_tlenz_bs_2
Diffstat (limited to 'id/server/moa-id-commons')
| -rw-r--r-- | id/server/moa-id-commons/src/main/resources/config/moaid_config_2.0.xsd | 46 |
1 files changed, 22 insertions, 24 deletions
diff --git a/id/server/moa-id-commons/src/main/resources/config/moaid_config_2.0.xsd b/id/server/moa-id-commons/src/main/resources/config/moaid_config_2.0.xsd index 33ad5c990..7944a7321 100644 --- a/id/server/moa-id-commons/src/main/resources/config/moaid_config_2.0.xsd +++ b/id/server/moa-id-commons/src/main/resources/config/moaid_config_2.0.xsd @@ -79,8 +79,8 @@ </xsd:simpleType> <xsd:complexType name="StorkAttribute"> <xsd:sequence> - <xsd:element name="name" type="xsd:string"></xsd:element> - <xsd:element name="mandatory" type="xsd:boolean"></xsd:element> + <xsd:element name="name" type="xsd:string"/> + <xsd:element name="mandatory" type="xsd:boolean"/> </xsd:sequence> </xsd:complexType> <xsd:simpleType name="LoginType"> @@ -281,6 +281,9 @@ <xsd:sequence> <xsd:element name="SAML1" minOccurs="0"> <xsd:complexType> + <xsd:sequence> + <xsd:element name="SourceID" type="xsd:string" minOccurs="0" maxOccurs="1"/> + </xsd:sequence> <xsd:attribute name="isActive" type="xsd:boolean" default="false"/> </xsd:complexType> </xsd:element> @@ -860,10 +863,10 @@ <xsd:element ref="SAMLSigningParameter"/> </xsd:sequence> <xsd:sequence> - <xsd:element ref="QualityAuthenticationAssuranceLevel" minOccurs="0" /> + <xsd:element ref="QualityAuthenticationAssuranceLevel" minOccurs="0"/> </xsd:sequence> <xsd:sequence> - <xsd:element ref="Attributes" maxOccurs="unbounded" minOccurs="0" /> + <xsd:element ref="Attributes" minOccurs="0" maxOccurs="unbounded"/> </xsd:sequence> </xsd:choice> </xsd:complexType> @@ -926,15 +929,14 @@ </xsd:sequence> </xsd:complexType> </xsd:element> - <xsd:element name="OA_STORK"> - <xsd:complexType> + <xsd:element name="OA_STORK"> + <xsd:complexType> <xsd:sequence> - <xsd:element name="StorkLogonEnabled" - type="xsd:boolean" /> - <xsd:element ref="Qaa" maxOccurs="1" minOccurs="0"></xsd:element> - <xsd:element ref="OAAttributes" maxOccurs="unbounded" minOccurs="0"></xsd:element> + <xsd:element name="StorkLogonEnabled" type="xsd:boolean"/> + <xsd:element ref="Qaa" minOccurs="0" maxOccurs="1"/> + <xsd:element ref="OAAttributes" minOccurs="0" maxOccurs="unbounded"/> </xsd:sequence> - </xsd:complexType> + </xsd:complexType> </xsd:element> <xsd:element name="Contact"> <xsd:complexType> @@ -997,17 +999,13 @@ <xsd:element name="OnlyMandateLoginAllowed" type="xsd:boolean" default="false" minOccurs="0" maxOccurs="1"/> </xsd:sequence> </xsd:complexType> - - <xsd:element name="Attributes" type="StorkAttribute"></xsd:element> - - <xsd:element name="Qaa" type="QualityAuthenticationAssuranceLevelType"></xsd:element> - - <xsd:complexType name="OAStorkAttribute"> - <xsd:sequence> - <xsd:element name="mandatory" type="xsd:boolean"></xsd:element> - <xsd:element name="name" type="xsd:string"></xsd:element> - </xsd:sequence> - </xsd:complexType> - - <xsd:element name="OAAttributes" type="OAStorkAttribute"></xsd:element> + <xsd:element name="Attributes" type="StorkAttribute"/> + <xsd:element name="Qaa" type="QualityAuthenticationAssuranceLevelType"/> + <xsd:complexType name="OAStorkAttribute"> + <xsd:sequence> + <xsd:element name="mandatory" type="xsd:boolean"/> + <xsd:element name="name" type="xsd:string"/> + </xsd:sequence> + </xsd:complexType> + <xsd:element name="OAAttributes" type="OAStorkAttribute"/> </xsd:schema> |