diff options
| author | Thomas Lenz <tlenz@iaik.tugraz.at> | 2014-05-09 12:10:28 +0200 |
|---|---|---|
| committer | Thomas Lenz <tlenz@iaik.tugraz.at> | 2014-05-09 12:10:28 +0200 |
| commit | bb06ad890498e2428c3f4268ae2f732a0f75bd77 (patch) | |
| tree | d5a422144d55c96a0e87965ecc6ce036080d7133 /id/server/data/deploy | |
| parent | c44e10f563cae97ce3c4a64f7ba3e8777e131a0d (diff) | |
| parent | a6d06a04fdd2caaebb387be3d85107658c08f345 (diff) | |
| download | moa-id-spss-bb06ad890498e2428c3f4268ae2f732a0f75bd77.tar.gz moa-id-spss-bb06ad890498e2428c3f4268ae2f732a0f75bd77.tar.bz2 moa-id-spss-bb06ad890498e2428c3f4268ae2f732a0f75bd77.zip | |
merge VIDP updates to Snapshot branch
Conflicts:
id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/AttributeCollector.java
id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/AuthenticationRequest.java
id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/MandateRetrievalRequest.java
Diffstat (limited to 'id/server/data/deploy')
| -rw-r--r-- | id/server/data/deploy/conf/moa-id/stork/SamlEngine.xml | 2 | ||||
| -rw-r--r-- | id/server/data/deploy/conf/moa-id/stork/StorkSamlEngine_VIDP.xml | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/id/server/data/deploy/conf/moa-id/stork/SamlEngine.xml b/id/server/data/deploy/conf/moa-id/stork/SamlEngine.xml index 166a48ff8..eca38ec8c 100644 --- a/id/server/data/deploy/conf/moa-id/stork/SamlEngine.xml +++ b/id/server/data/deploy/conf/moa-id/stork/SamlEngine.xml @@ -61,7 +61,7 @@ <!-- Specific signature module --> <parameter name="class" value="eu.stork.peps.auth.engine.core.impl.SignSW" /> <!-- Settings specific module --> - <parameter name="fileConfiguration" value="SignModule_incoming.xml" /> + <parameter name="fileConfiguration" value="SignModule_VIDP.xml" /> </configuration> </instance> 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 83e69ac23..5aff0d1fa 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 @@ -90,5 +90,6 @@ <entry key="mandateContent">http://www.stork.gov.eu/1.0/mandateContent</entry> <entry key="representative">http://www.stork.gov.eu/1.0/representative</entry> <entry key="represented">http://www.stork.gov.eu/1.0/represented</entry> + <entry key="mandateType">http://www.stork.gov.eu/1.0/mandateType</entry> </properties> |