From 65fb688c9323696fcc12e1c049a2b6a75d6ff1e5 Mon Sep 17 00:00:00 2001
From: Bojan Suzic <bojan.suzic@iaik.tugraz.at>
Date: Tue, 4 Feb 2014 17:25:09 +0100
Subject: merging with other code

---
 .../moa/id/auth/servlet/PEPSConnectorServlet.java           |  1 +
 .../at/gv/egovernment/moa/id/config/stork/STORKConfig.java  | 13 +++++++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

(limited to 'id/server/idserverlib/src/main/java/at/gv')

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/PEPSConnectorServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/PEPSConnectorServlet.java
index b356c6f35..41be2c7e3 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/PEPSConnectorServlet.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/PEPSConnectorServlet.java
@@ -331,6 +331,7 @@ public class PEPSConnectorServlet extends AuthServlet {
 			
 			//TODO: found better solution, but QAA Level in response could be not supported yet
 			try {
+
 				moasession.setQAALevel(authnResponse.getAssertions().get(0).
 						getAuthnStatements().get(0).getAuthnContext().
 						getAuthnContextClassRef().getAuthnContextClassRef());
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);
-- 
cgit v1.2.3