diff options
| author | Thomas Lenz <tlenz@iaik.tugraz.at> | 2014-11-03 11:13:38 +0100 |
|---|---|---|
| committer | Thomas Lenz <tlenz@iaik.tugraz.at> | 2014-11-03 11:13:38 +0100 |
| commit | a3e59e5011e16271dab6cc8299a1d1241b4a7fb2 (patch) | |
| tree | aae2f450b7296a286c09a8c51d423aec4bedd0dd /id/server/data | |
| parent | 83dc74e60a4d9031285ac27aa0661fe0c26485e0 (diff) | |
| parent | 1fbff5f5a86733bc6a75c8ae901153baa0963441 (diff) | |
| download | moa-id-spss-8213427b4b34a6a09cb1068b6d9836965278f68a.tar.gz moa-id-spss-8213427b4b34a6a09cb1068b6d9836965278f68a.tar.bz2 moa-id-spss-8213427b4b34a6a09cb1068b6d9836965278f68a.zip | |
Merge branch 'moa-2.1-Snapshot'MOA-SPSS-2.0.3MOA-ID-2.1.2
Conflicts:
.gitignore
Diffstat (limited to 'id/server/data')
| -rw-r--r-- | id/server/data/deploy/conf/moa-id/htmlTemplates/loginFormFull.html | 2 | ||||
| -rw-r--r-- | id/server/data/deploy/conf/moa-id/keys/storkDemoKeys.jks | bin | 9023 -> 16396 bytes | |||
| -rw-r--r-- | id/server/data/deploy/conf/moa-id/moa-id.properties | 28 | ||||
| -rw-r--r-- | id/server/data/deploy/conf/moa-id/stork/StorkSamlEngine_VIDP.xml | 3 | ||||
| -rw-r--r-- | id/server/data/deploy/conf/moa-spss/SampleMOASPSSConfiguration.xml | 2 |
5 files changed, 33 insertions, 2 deletions
diff --git a/id/server/data/deploy/conf/moa-id/htmlTemplates/loginFormFull.html b/id/server/data/deploy/conf/moa-id/htmlTemplates/loginFormFull.html index ef070b8eb..7e2ddc491 100644 --- a/id/server/data/deploy/conf/moa-id/htmlTemplates/loginFormFull.html +++ b/id/server/data/deploy/conf/moa-id/htmlTemplates/loginFormFull.html @@ -720,7 +720,7 @@ } } function onChangeChecks() { - if (top.innerWidth < 650) { + if (self.innerWidth < 650) { document.getElementById("moaidform").setAttribute("target","_parent"); } else { document.getElementById("moaidform").removeAttribute("target"); diff --git a/id/server/data/deploy/conf/moa-id/keys/storkDemoKeys.jks b/id/server/data/deploy/conf/moa-id/keys/storkDemoKeys.jks Binary files differindex 8196ab319..66cdec919 100644 --- a/id/server/data/deploy/conf/moa-id/keys/storkDemoKeys.jks +++ b/id/server/data/deploy/conf/moa-id/keys/storkDemoKeys.jks diff --git a/id/server/data/deploy/conf/moa-id/moa-id.properties b/id/server/data/deploy/conf/moa-id/moa-id.properties index 4290b1985..9d1e931e9 100644 --- a/id/server/data/deploy/conf/moa-id/moa-id.properties +++ b/id/server/data/deploy/conf/moa-id/moa-id.properties @@ -125,3 +125,31 @@ advancedlogging.hibernate.c3p0.timeout=300 advancedlogging.hibernate.c3p0.max_size=20 advancedlogging.hibernate.c3p0.max_statements=0 advancedlogging.hibernate.c3p0.min_size=3 + + +################SZR Client configuration#################################### +## The SZR client is only required if MOA-ID-Auth should be +## use as STORK <-> PVP Gateway. +######## +service.egovutil.szr.test=true +service.egovutil.szr.test.url=https://pvawp.bmi.gv.at/bmi.gv.at/soap/SZ2Services-T/services/SZR +service.egovutil.szr.prod.url=https://pvawp.bmi.gv.at/bmi.gv.at/soap/SZ2Services/services/SZR +service.egovutil.szr.token.version=1.8 +service.egovutil.szr.token.participantid= +service.egovutil.szr.token.gvoudomain= +service.egovutil.szr.token.userid= +service.egovutil.szr.token.cn= +service.egovutil.szr.token.gvouid= +service.egovutil.szr.token.ou= +service.egovutil.szr.token.gvsecclass= +service.egovutil.szr.token.gvfunction= +service.egovutil.szr.token.gvgid= +service.egovutil.szr.roles= +service.egovutil.szr.ssl.keystore.file= +service.egovutil.szr.ssl.keystore.password= +service.egovutil.szr.ssl.keystore.type= +service.egovutil.szr.ssl.truststore.file= +service.egovutil.szr.ssl.truststore.password= +service.egovutil.szr.ssl.truststore.type= +service.egovutil.szr.ssl.trustall=false +service.egovutil.szr.ssl.laxhostnameverification=false
\ No newline at end of file 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 ef5dc23d2..ee4c636ce 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 @@ -116,5 +116,8 @@ <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> + + <!-- ISA 1.18 attributes--> + <entry key="ECApplicationRole">http://www.stork.gov.eu/1.1/ECApplicationRole</entry> </properties> diff --git a/id/server/data/deploy/conf/moa-spss/SampleMOASPSSConfiguration.xml b/id/server/data/deploy/conf/moa-spss/SampleMOASPSSConfiguration.xml index 9759f1ac5..8d26a1893 100644 --- a/id/server/data/deploy/conf/moa-spss/SampleMOASPSSConfiguration.xml +++ b/id/server/data/deploy/conf/moa-spss/SampleMOASPSSConfiguration.xml @@ -79,7 +79,7 @@ </cfg:CrlRetentionIntervals> </cfg:RevocationChecking> </cfg:CertificateValidation> - <cfg:VerifyTransformsInfoProfile> + <cfg:VerifyTransformsInfoProfile> <cfg:Id>MOAIDTransformAuthBlockTable_DE_2.0</cfg:Id> <cfg:Location>profiles/MOAIDTransformAuthBlockTable_DE_2.0.xml</cfg:Location> </cfg:VerifyTransformsInfoProfile> |