merging with other code

1 files changed, 11 insertions, 2 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 67638cafd..b340d2449 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
@@ -25,6 +25,7 @@
  */

 package at.gv.egovernment.moa.id.config.stork;

 

+import java.io.IOException;

 import java.net.MalformedURLException;

 import java.net.URL;

 import java.util.ArrayList;

@@ -33,10 +34,15 @@ import java.util.List;
 import java.util.Map;

 import java.util.Properties;

 

+import at.gv.egovernment.moa.id.commons.db.dao.config.SAMLSigningParameter;

 import at.gv.egovernment.moa.id.commons.db.dao.config.STORK;

 import at.gv.egovernment.moa.id.commons.db.dao.config.StorkAttribute;

 import at.gv.egovernment.moa.logging.Logger;

 import at.gv.egovernment.moa.util.StringUtils;

+import org.opensaml.ws.message.encoder.MessageEncodingException;

+import org.xml.sax.SAXException;

+

+import javax.xml.parsers.ParserConfigurationException;

 

 /**

  * Encapsulates several STORK configuration parameters according MOA configuration

@@ -73,7 +79,8 @@ public class STORKConfig {
 			} catch (MalformedURLException e) {

 				Logger.warn("Error in MOA-ID Configuration. CPEP entry for country "

 						+ cpep.getCountryCode() + " has an invalid URL and is ignored.");

-			} catch (ParserConfigurationException e) {

+			}

+            /*catch (ParserConfigurationException e) {

 				Logger.warn("Error in MOA-ID Configuration. CPEP entry for country " 

 						+ cpep.getCountryCode() + " has an invalid Attribute and is ignored.");

 			} catch (SAXException e) {

@@ -85,7 +92,7 @@ public class STORKConfig {
 			} catch (MessageEncodingException e) {

 				Logger.warn("Error in MOA-ID Configuration. CPEP entry for country " 

 						+ cpep.getCountryCode() + " has an invalid Attribute and is ignored.");

-			}

+			}*/

 		}

 		

 		SAMLSigningParameter samlsign = stork.getSAMLSigningParameter();   // TODO Fix nullpointerexception when nothing is configured

@@ -100,6 +107,8 @@ public class STORKConfig {
 

 	}

 

+    }

+

 	public SignatureCreationParameter getSignatureCreationParameter() {

 

 		return new SignatureCreationParameter(props, basedirectory);