devel

1 files changed, 11 insertions, 11 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/stork/STORKConfig.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/stork/STORKConfig.java
index 81caa13ee..c926e2b01 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/stork/STORKConfig.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/stork/STORKConfig.java
@@ -50,7 +50,7 @@ public class STORKConfig {
 

 	/** STORK SAML signature creation parameters */

 	private Properties props = null;

-	private Map<String, CPEPS> cpepsMap  = null;

+	private Map<String, CPEPS> cpepsMap  = new HashMap<String, CPEPS>();

 	private String basedirectory = null;

 	private SignatureVerificationParameter sigverifyparam = null;

 	private List<StorkAttribute> attr = null;

@@ -63,11 +63,11 @@ public class STORKConfig {
 		//create CPEPS map

         List<CPEPS> cpeps = new ArrayList<CPEPS>();

         

-        Properties storkCPEPSProps = 

+        Map<String, String> storkCPEPSProps = 

         		AuthConfigurationProviderFactory.getInstance().getConfigurationWithPrefix(

         				MOAIDConfigurationConstants.GENERAL_AUTH_STORK_CPEPS_LIST);

         if (storkCPEPSProps != null) {

-        	Set<Object> keyValues = storkCPEPSProps.keySet();

+        	Set<String> keyValues = storkCPEPSProps.keySet();

         	for (Object elObj : keyValues) {

         		if (elObj instanceof String) {

         			String el = (String) elObj;

@@ -76,14 +76,14 @@ public class STORKConfig {
         				String listCounter = el.substring(0, index);

         				try {

         					CPEPS moacpep = 

-        							new CPEPS(storkCPEPSProps.getProperty(listCounter + "." + MOAIDConfigurationConstants.GENERAL_AUTH_STORK_CPEPS_LIST_COUNTRY), 

-        									new URL(storkCPEPSProps.getProperty(listCounter + "." + MOAIDConfigurationConstants.GENERAL_AUTH_STORK_CPEPS_LIST_URL)), 

-        										Boolean.valueOf(storkCPEPSProps.getProperty(listCounter + "." + MOAIDConfigurationConstants.GENERAL_AUTH_STORK_CPEPS_LIST_SUPPORT_XMLDSIG)));

+        							new CPEPS(storkCPEPSProps.get(listCounter + "." + MOAIDConfigurationConstants.GENERAL_AUTH_STORK_CPEPS_LIST_COUNTRY), 

+        									new URL(storkCPEPSProps.get(listCounter + "." + MOAIDConfigurationConstants.GENERAL_AUTH_STORK_CPEPS_LIST_URL)), 

+        										Boolean.valueOf(storkCPEPSProps.get(listCounter + "." + MOAIDConfigurationConstants.GENERAL_AUTH_STORK_CPEPS_LIST_SUPPORT_XMLDSIG)));

         					cpepsMap.put(moacpep.getCountryCode(), moacpep);

         					

         				} catch (MalformedURLException e) {

 							Logger.warn("CPEPS URL " + 

-									storkCPEPSProps.getProperty(listCounter + "." + MOAIDConfigurationConstants.GENERAL_AUTH_STORK_CPEPS_LIST_URL) + 

+									storkCPEPSProps.get(listCounter + "." + MOAIDConfigurationConstants.GENERAL_AUTH_STORK_CPEPS_LIST_URL) + 

 									" are not parseable.", e);

 

 						}       				

@@ -93,11 +93,11 @@ public class STORKConfig {
         }

         

         attr = new ArrayList<StorkAttribute>();

-        Properties storkAttributeProps = 

+        Map<String, String> storkAttributeProps = 

         		AuthConfigurationProviderFactory.getInstance().getConfigurationWithPrefix(

         				MOAIDConfigurationConstants.GENERAL_AUTH_STORK_ATTRIBUTES_LIST);

         if (storkAttributeProps != null) {

-        	Set<Object> keyValues = storkAttributeProps.keySet();

+        	Set<String> keyValues = storkAttributeProps.keySet();

         	for (Object elObj : keyValues) {

         		if (elObj instanceof String) {

         			String el = (String) elObj;

@@ -105,8 +105,8 @@ public class STORKConfig {
         				int index = el.indexOf(".");

         				String listCounter = el.substring(0, index);

        					StorkAttribute moaStorkAttr = 

-       							new StorkAttribute(storkAttributeProps.getProperty(listCounter + "." + MOAIDConfigurationConstants.GENERAL_AUTH_STORK_ATTRIBUTES_LIST_NAME),  

-       										Boolean.valueOf(storkAttributeProps.getProperty(listCounter + "." + MOAIDConfigurationConstants.GENERAL_AUTH_STORK_ATTRIBUTES_LIST_MANDATORY)));

+       							new StorkAttribute(storkAttributeProps.get(listCounter + "." + MOAIDConfigurationConstants.GENERAL_AUTH_STORK_ATTRIBUTES_LIST_NAME),  

+       										Boolean.valueOf(storkAttributeProps.get(listCounter + "." + MOAIDConfigurationConstants.GENERAL_AUTH_STORK_ATTRIBUTES_LIST_MANDATORY)));

        					attr.add(moaStorkAttr);

         			}

         		}