diff options
| author | Bojan Suzic <bojan.suzic@iaik.tugraz.at> | 2014-02-25 19:01:11 +0100 |
|---|---|---|
| committer | Bojan Suzic <bojan.suzic@iaik.tugraz.at> | 2014-02-25 19:01:11 +0100 |
| commit | 8d438e785622695d55dbff05f8383447ff4eb251 (patch) | |
| tree | 91d5de425541d908a675865c69d759afe6429831 /id/server/moa-id-commons/src | |
| parent | e352ed4ac809c333ebbba3421f8cb1857850535b (diff) | |
| parent | 26404cedff0e60969c98d7a7cab30f8e7eda9ea6 (diff) | |
| download | moa-id-spss-8d438e785622695d55dbff05f8383447ff4eb251.tar.gz moa-id-spss-8d438e785622695d55dbff05f8383447ff4eb251.tar.bz2 moa-id-spss-8d438e785622695d55dbff05f8383447ff4eb251.zip | |
Merge branch 'ap' into moa2_0_tlenz_bs_3
Conflicts:
id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OASTORKConfig.java
id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/stork/STORKConfig.java
id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/AuthenticationRequest.java
Diffstat (limited to 'id/server/moa-id-commons/src')
| -rw-r--r-- | id/server/moa-id-commons/src/main/resources/config/moaid_config_2.0.xsd | 13 |
1 files changed, 12 insertions, 1 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 e6705dbb8..d20ec1c68 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="StorkAttribute"> + <xsd:element name="AbstractSimpleIdentification" type="AttributeProviderPlugin"> <xsd:annotation> <xsd:documentation>possibility to include common austrian primary keys in human readable way, english translation not available @@ -884,6 +884,8 @@ <xsd:element name="StorkLogonEnabled" type="xsd:boolean"/> <xsd:element ref="Qaa" minOccurs="0" maxOccurs="1"/> <xsd:element ref="OAAttributes" minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="VidpEnabled" type="xsd:boolean"></xsd:element> + <xsd:element ref="AttributeProviders" maxOccurs="unbounded" minOccurs="0"></xsd:element> </xsd:sequence> </xsd:complexType> </xsd:element> @@ -950,6 +952,15 @@ <xsd:element name="OnlyMandateLoginAllowed" type="xsd:boolean" default="false" minOccurs="0" maxOccurs="1"/> </xsd:sequence> </xsd:complexType> + + <xsd:complexType name="AttributeProviderPlugin"> + <xsd:sequence> + <xsd:element name="name" type="xsd:string"></xsd:element> + <xsd:element name="url" type="xsd:anyURI"></xsd:element> + </xsd:sequence> + </xsd:complexType> + + <xsd:element name="AttributeProviders" type="AttributeProviderPlugin"></xsd:element> <xsd:element name="Attributes" type="StorkAttribute"/> <xsd:element name="Qaa" type="QualityAuthenticationAssuranceLevelType"/> <xsd:complexType name="OAStorkAttribute"> |