diff options
| author | Thomas Lenz <tlenz@iaik.tugraz.at> | 2015-07-17 11:41:14 +0200 |
|---|---|---|
| committer | Thomas Lenz <tlenz@iaik.tugraz.at> | 2015-07-17 11:41:14 +0200 |
| commit | 59dee0f36a25d0c5f19d5d5d5652c3d919956cde (patch) | |
| tree | 3c2927f5a4a2511b7c403dd592f64fab079f4919 /id/server/data/deploy/conf/moa-id/stork | |
| parent | 2a5dc4175eeb29331b1af83b0e03fa965d447533 (diff) | |
| parent | b92da70a3071e1dbf910ee38ff4efbe61ecc8be6 (diff) | |
| download | moa-id-spss-59dee0f36a25d0c5f19d5d5d5652c3d919956cde.tar.gz moa-id-spss-59dee0f36a25d0c5f19d5d5d5652c3d919956cde.tar.bz2 moa-id-spss-59dee0f36a25d0c5f19d5d5d5652c3d919956cde.zip | |
Merge first STORK 2 changes
Conflicts:
id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/AuthConfigurationProvider.java
id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/ConsentEvaluator.java
pom.xml
Diffstat (limited to 'id/server/data/deploy/conf/moa-id/stork')
3 files changed, 8 insertions, 1 deletions
diff --git a/id/server/data/deploy/conf/moa-id/stork/StorkSamlEngine_VIDP.xml b/id/server/data/deploy/conf/moa-id/stork/StorkSamlEngine_VIDP.xml index b45b69054..29973690e 100644 --- a/id/server/data/deploy/conf/moa-id/stork/StorkSamlEngine_VIDP.xml +++ b/id/server/data/deploy/conf/moa-id/stork/StorkSamlEngine_VIDP.xml @@ -121,4 +121,7 @@ <entry key="ECApplicationRole">http://www.stork.gov.eu/1.1/ECApplicationRole</entry> <entry key="MSOrganization">http://www.stork.gov.eu/1.1/MSOrganization</entry> + <entry key="citizenQAALevel">http://www.stork.gov.eu/1.0/citizenQAALevel</entry> + + </properties> diff --git a/id/server/data/deploy/conf/moa-id/stork/StorkSamlEngine_incoming.xml b/id/server/data/deploy/conf/moa-id/stork/StorkSamlEngine_incoming.xml index 3370978b3..a817e29c0 100644 --- a/id/server/data/deploy/conf/moa-id/stork/StorkSamlEngine_incoming.xml +++ b/id/server/data/deploy/conf/moa-id/stork/StorkSamlEngine_incoming.xml @@ -94,5 +94,7 @@ <!-- ISA 1.18 attributes--> <entry key="ECApplicationRole">http://www.stork.gov.eu/1.1/ECApplicationRole</entry> <entry key="MSOrganization">http://www.stork.gov.eu/1.1/MSOrganization</entry> + + <entry key="citizenQAALevel">http://www.stork.gov.eu/1.0/citizenQAALevel</entry> </properties> diff --git a/id/server/data/deploy/conf/moa-id/stork/StorkSamlEngine_outgoing.xml b/id/server/data/deploy/conf/moa-id/stork/StorkSamlEngine_outgoing.xml index bdad5686b..b840b4fe5 100644 --- a/id/server/data/deploy/conf/moa-id/stork/StorkSamlEngine_outgoing.xml +++ b/id/server/data/deploy/conf/moa-id/stork/StorkSamlEngine_outgoing.xml @@ -124,5 +124,7 @@ <!-- ISA 1.18 attributes--> <entry key="ECApplicationRole">http://www.stork.gov.eu/1.1/ECApplicationRole</entry> <entry key="MSOrganization">http://www.stork.gov.eu/1.1/MSOrganization</entry> + + <entry key="citizenQAALevel">http://www.stork.gov.eu/1.0/citizenQAALevel</entry> -</properties>
\ No newline at end of file +</properties> |