diff options
| author | Bojan Suzic <bojan.suzic@iaik.tugraz.at> | 2014-03-05 21:36:01 +0100 |
|---|---|---|
| committer | Bojan Suzic <bojan.suzic@iaik.tugraz.at> | 2014-03-05 21:36:01 +0100 |
| commit | b757096ff32fa80908527220f8e08046015c2449 (patch) | |
| tree | 837e839c74366a2b3af0c0dacf26cba1dc6f828d /id/server/moa-id-commons/src | |
| parent | ed54650118390e2747dece3bad6bd74b6eefec7a (diff) | |
| parent | 31a10590f3efee8aca463b43623ee689f7b0c605 (diff) | |
| download | moa-id-spss-b757096ff32fa80908527220f8e08046015c2449.tar.gz moa-id-spss-b757096ff32fa80908527220f8e08046015c2449.tar.bz2 moa-id-spss-b757096ff32fa80908527220f8e08046015c2449.zip | |
Merge branch 'bs_3_fr' into moa2_0_tlenz_bs_3
Conflicts:
id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/AttributeProviderFactory.java
id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/EHvdAttributeProviderPlugin.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 | 5 |
1 files changed, 3 insertions, 2 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 b2c9eb58c..b7e8f6ff3 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 @@ -959,8 +959,9 @@ <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="attributes" type="xsd:string"></xsd:element> + </xsd:sequence> + </xsd:complexType> <xsd:element name="AttributeProviders" type="AttributeProviderPlugin"></xsd:element> <xsd:element name="Attributes" type="StorkAttribute"/> |