aboutsummaryrefslogtreecommitdiff
path: root/id/server
diff options
context:
space:
mode:
authorFlorian Reimair <florian.reimair@iaik.tugraz.at>2014-01-14 13:45:24 +0100
committerFlorian Reimair <florian.reimair@iaik.tugraz.at>2014-01-27 16:34:15 +0100
commit7fb3ae0e4922ec76e998937b771df244574be394 (patch)
tree147a14ff7ad6319311e1cc5c9bce6579884379c8 /id/server
parent21c26bc3ead6ca414179268056bfc11006c5efe3 (diff)
downloadmoa-id-spss-7fb3ae0e4922ec76e998937b771df244574be394.tar.gz
moa-id-spss-7fb3ae0e4922ec76e998937b771df244574be394.tar.bz2
moa-id-spss-7fb3ae0e4922ec76e998937b771df244574be394.zip
refactored stork-related database structure
Diffstat (limited to 'id/server')
-rw-r--r--id/server/moa-id-commons/src/main/resources/config/moaid_config_2.0.xsd15
1 files changed, 8 insertions, 7 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 6972b031c..3ed7c936a 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
@@ -72,8 +72,6 @@
</xsd:simpleType>
<xsd:element name="QualityAuthenticationAssuranceLevel" type="QualityAuthenticationAssuranceLevelType"/>
<xsd:element name="AttributeValue" type="xsd:anyType"/>
- <xsd:complexType name="RequestedAttributeType"/>
- <xsd:element name="RequestedAttribute" type="RequestedAttributeType"/>
<xsd:simpleType name="CountryCodeType">
<xsd:restriction base="xsd:token">
<xsd:pattern value="[A-Z]{2}"/>
@@ -85,7 +83,6 @@
<xsd:element name="mandatory" type="xsd:boolean"></xsd:element>
</xsd:sequence>
</xsd:complexType>
- <xsd:element name="RequestedAttributes" type="StorkAttribute"/>
<xsd:simpleType name="LoginType">
<xsd:restriction base="xsd:token">
<xsd:enumeration value="stateless"/>
@@ -853,8 +850,10 @@
<xsd:element ref="SAMLSigningParameter"/>
</xsd:sequence>
<xsd:sequence>
- <xsd:element ref="QualityAuthenticationAssuranceLevel" minOccurs="0"/>
- <xsd:element ref="RequestedAttributes" maxOccurs="unbounded" minOccurs="1"/>
+ <xsd:element ref="QualityAuthenticationAssuranceLevel" minOccurs="0" />
+ </xsd:sequence>
+ <xsd:sequence>
+ <xsd:element ref="Attributes" maxOccurs="unbounded" minOccurs="0" />
</xsd:sequence>
</xsd:choice>
</xsd:complexType>
@@ -924,7 +923,7 @@
<xsd:element name="StorkLogonEnabled"
type="xsd:boolean" />
<xsd:element ref="Qaa" maxOccurs="1" minOccurs="0"></xsd:element>
- <xsd:element name="Attributes" type="OAStorkAttribute" maxOccurs="unbounded" minOccurs="1"></xsd:element>
+ <xsd:element ref="OAAttributes" maxOccurs="unbounded" minOccurs="0"></xsd:element>
</xsd:sequence>
</xsd:complexType>
</xsd:element>
@@ -996,8 +995,10 @@
<xsd:complexType name="OAStorkAttribute">
<xsd:sequence>
- <xsd:element name="attribute" type="StorkAttribute"></xsd:element>
<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:schema>