aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Lenz <tlenz@iaik.tugraz.at>2014-06-02 07:57:35 +0200
committerThomas Lenz <tlenz@iaik.tugraz.at>2014-06-02 07:57:35 +0200
commit25c06eaa567f0023771747b3824571abdbb7b4c7 (patch)
treec5fe22c532cf3f16cbf8839fee3ad7b532481852
parente9407ea4eddba35181953b9a9583ccbc5dd691a7 (diff)
downloadmoa-id-spss-25c06eaa567f0023771747b3824571abdbb7b4c7.tar.gz
moa-id-spss-25c06eaa567f0023771747b3824571abdbb7b4c7.tar.bz2
moa-id-spss-25c06eaa567f0023771747b3824571abdbb7b4c7.zip
moa-id-configuration bku-selection preview problem solvedMOA-ID-2.1-RC1
-rw-r--r--id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OASTORKConfig.java25
-rw-r--r--id/server/data/deploy/conf/moa-id-configuration/moa-id-configtool.properties1
-rw-r--r--id/server/doc/conf/moa-id-configuration/moa-id-configtool.properties1
-rw-r--r--id/server/doc/handbook/config/config.html2
4 files changed, 18 insertions, 11 deletions
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OASTORKConfig.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OASTORKConfig.java
index 363c094ff..45875010b 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OASTORKConfig.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OASTORKConfig.java
@@ -109,18 +109,23 @@ public class OASTORKConfig implements IOnlineApplicationData{
// prepare attribute helper list
attributes = new ArrayList<AttributeHelper>();
try {
- for(StorkAttribute current : ConfigurationDBRead.getMOAIDConfiguration().getAuthComponentGeneral().getForeignIdentities().getSTORK().getAttributes()) {
- AttributeHelper tmp = null;
+ try {
+ for(StorkAttribute current : ConfigurationDBRead.getMOAIDConfiguration().getAuthComponentGeneral().getForeignIdentities().getSTORK().getAttributes()) {
+ AttributeHelper tmp = null;
- for(OAStorkAttribute sepp : config.getOAAttributes())
- if(sepp.getName().equals(current.getName()))
- tmp = new AttributeHelper(sepp);
+ for(OAStorkAttribute sepp : config.getOAAttributes())
+ if(sepp.getName().equals(current.getName()))
+ tmp = new AttributeHelper(sepp);
- if(null == tmp)
- tmp = new AttributeHelper(current);
+ if(null == tmp)
+ tmp = new AttributeHelper(current);
- attributes.add(tmp);
- }
+ attributes.add(tmp);
+ }
+
+ } catch (NullPointerException ex) {
+
+ }
// fetch vidp config
if (config.isVidpEnabled() != null)
@@ -138,7 +143,7 @@ public class OASTORKConfig implements IOnlineApplicationData{
// TODO this is a dirty hack since we have to have one entry to
// clone from in the web form. Happens when time is short.
// Sorry.
- if (attributeProviderPlugins.isEmpty())
+ if (attributeProviderPlugins == null || attributeProviderPlugins.isEmpty())
attributeProviderPlugins.add(new AttributeProviderPlugin());
} catch (NullPointerException ex) {
log.error("Nullpointerexception encountered in Configurationinterface", ex);
diff --git a/id/server/data/deploy/conf/moa-id-configuration/moa-id-configtool.properties b/id/server/data/deploy/conf/moa-id-configuration/moa-id-configtool.properties
index fcfa4f0b1..db158ed23 100644
--- a/id/server/data/deploy/conf/moa-id-configuration/moa-id-configtool.properties
+++ b/id/server/data/deploy/conf/moa-id-configuration/moa-id-configtool.properties
@@ -7,6 +7,7 @@
#General config
general.login.deaktivate=false
general.publicURLContext=https://localhost:8443/moa-id-configuration
+general.moaid.instance.url=https://localhost:8443/moa-id-auth
general.defaultlanguage=de
general.ssl.certstore=certs/certstore
diff --git a/id/server/doc/conf/moa-id-configuration/moa-id-configtool.properties b/id/server/doc/conf/moa-id-configuration/moa-id-configtool.properties
index fcfa4f0b1..db158ed23 100644
--- a/id/server/doc/conf/moa-id-configuration/moa-id-configtool.properties
+++ b/id/server/doc/conf/moa-id-configuration/moa-id-configtool.properties
@@ -7,6 +7,7 @@
#General config
general.login.deaktivate=false
general.publicURLContext=https://localhost:8443/moa-id-configuration
+general.moaid.instance.url=https://localhost:8443/moa-id-auth
general.defaultlanguage=de
general.ssl.certstore=certs/certstore
diff --git a/id/server/doc/handbook/config/config.html b/id/server/doc/handbook/config/config.html
index f94371f96..bf1402eaa 100644
--- a/id/server/doc/handbook/config/config.html
+++ b/id/server/doc/handbook/config/config.html
@@ -197,7 +197,7 @@
<tr>
<td>general.moaid.instance.url</td>
<td>https:/demo.egiz.gv.at/moa-id-auth/</td>
- <td>Public URL Prefix unter dem die zu konfigurierende MOA-ID-Auth Instanz erreichbar ist</td>
+ <td>Public URL Prefix unter dem die zu konfigurierende MOA-ID-Auth Instanz erreichbar ist. Dieser Parameter wird f&uuml;r die Vorschau der BKU Auswahlskonfiguration ben&ouml;tigt.</td>
</tr>
<tr>
<td>general.defaultlanguage</td>