diff options
| author | Thomas Lenz <tlenz@iaik.tugraz.at> | 2014-02-03 08:06:55 +0100 |
|---|---|---|
| committer | Thomas Lenz <tlenz@iaik.tugraz.at> | 2014-02-03 08:06:55 +0100 |
| commit | 04ba04826a5f88e0459b7a47a55118933d929cc6 (patch) | |
| tree | 7f5083300ac4026bbf06b51ac8c3ba01423bbd29 /id/server/moa-id-commons/src/main | |
| parent | 080e499cc22a0065ea7f47e04b6c0f336533e21e (diff) | |
| parent | 3c1884ee275350e7b2a78256342d9610b1766898 (diff) | |
| download | moa-id-spss-04ba04826a5f88e0459b7a47a55118933d929cc6.tar.gz moa-id-spss-04ba04826a5f88e0459b7a47a55118933d929cc6.tar.bz2 moa-id-spss-04ba04826a5f88e0459b7a47a55118933d929cc6.zip | |
Merge remote-tracking branch 'remotes/origin/outgoingstork' into moa2_0_tlenz
Conflicts:
id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/StorkAttributes.java
id/oa/src/main/java/at/gv/egovernment/moa/id/demoOA/servlet/pvp2/BuildMetadata.java
id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GetForeignIDServlet.java
id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/PEPSConnectorServlet.java
id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/stork/STORKAuthnRequestProcessor.java
id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/parep/client/szrgw/SZRGWClient.java
id/server/idserverlib/src/main/resources/resources/templates/loginFormFull.html
Diffstat (limited to 'id/server/moa-id-commons/src/main')
| -rw-r--r-- | id/server/moa-id-commons/src/main/resources/config/moaid_config_2.0.xsd | 41 |
1 files changed, 32 insertions, 9 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 e93cb5cc8..33ad5c990 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 @@ -49,7 +49,7 @@ <xsd:extension base="xsd:string"/> </xsd:simpleContent> </xsd:complexType> - <xsd:element name="AbstractSimpleIdentification" type="AbstractSimpleIdentificationType"> + <xsd:element name="AbstractSimpleIdentification" type="StorkAttribute"> <xsd:annotation> <xsd:documentation>possibility to include common austrian primary keys in human readable way, english translation not available @@ -72,19 +72,17 @@ </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}"/> </xsd:restriction> </xsd:simpleType> - <xsd:complexType name="RequestedAttributesType"> + <xsd:complexType name="StorkAttribute"> <xsd:sequence> - <xsd:element name="AttributeValue" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="name" type="xsd:string"></xsd:element> + <xsd:element name="mandatory" type="xsd:boolean"></xsd:element> </xsd:sequence> </xsd:complexType> - <xsd:element name="RequestedAttributes" type="RequestedAttributesType"/> <xsd:simpleType name="LoginType"> <xsd:restriction base="xsd:token"> <xsd:enumeration value="stateless"/> @@ -538,7 +536,7 @@ </xsd:sequence> </xsd:complexType> </xsd:element> - <xsd:element ref="STORK" minOccurs="0"/> + <xsd:element ref="OA_STORK" minOccurs="0"/> <xsd:element name="OA_SSO" minOccurs="0"> <xsd:complexType> <xsd:sequence> @@ -862,8 +860,10 @@ <xsd:element ref="SAMLSigningParameter"/> </xsd:sequence> <xsd:sequence> - <xsd:element ref="QualityAuthenticationAssuranceLevel" minOccurs="0"/> - <xsd:element ref="RequestedAttributes"/> + <xsd:element ref="QualityAuthenticationAssuranceLevel" minOccurs="0" /> + </xsd:sequence> + <xsd:sequence> + <xsd:element ref="Attributes" maxOccurs="unbounded" minOccurs="0" /> </xsd:sequence> </xsd:choice> </xsd:complexType> @@ -926,6 +926,16 @@ </xsd:sequence> </xsd:complexType> </xsd:element> + <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:sequence> + </xsd:complexType> + </xsd:element> <xsd:element name="Contact"> <xsd:complexType> <xsd:sequence> @@ -987,4 +997,17 @@ <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:schema> |