From 1ff6044b66a717edff42bd3a1c19a044e744c3b3 Mon Sep 17 00:00:00 2001
From: Florian Reimair <florian.reimair@iaik.tugraz.at>
Date: Sun, 26 Jan 2014 17:09:46 +0100
Subject: cleanup

---
 .../moa/id/config/stork/STORKConfig.java           | 51 ----------------------
 1 file changed, 51 deletions(-)

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

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 24c7ad264..3282b8737 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
@@ -3,7 +3,6 @@
  */
 package at.gv.egovernment.moa.id.config.stork;
 
-import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.ArrayList;
@@ -12,17 +11,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Properties;
 
-import javax.xml.parsers.ParserConfigurationException;
-
-import org.opensaml.saml2.metadata.RequestedAttribute;
-import org.opensaml.ws.message.encoder.MessageEncodingException;
-import org.w3c.dom.Element;
-import org.xml.sax.SAXException;
-
-import eu.stork.vidp.messages.util.SAMLUtil;
-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.SignatureVerificationParameterType;
 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;
@@ -57,54 +46,14 @@ public class STORKConfig {
 			try {
 				CPEPS moacpep = new CPEPS(cpep.getCountryCode(), new URL(cpep.getURL()));
 
-
-
-//				List<String> attr = cpep.getAttributeValue();
-//
-//				ArrayList<RequestedAttribute> requestedAttributes = new ArrayList<RequestedAttribute>();
-//
-//				for (String e1 : attr) {
-//					Element element = XMLUtil.stringToDOM(e1);
-//					RequestedAttribute requestedAttribute = (RequestedAttribute) SAMLUtil.unmarshallMessage(element);
-//					requestedAttributes.add(requestedAttribute);
-//				}
-//				moacpep.setCountrySpecificRequestedAttributes(requestedAttributes);
-
 				cpepsMap.put(cpep.getCountryCode(), moacpep);
 
 			} 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) {
-//				Logger.warn("Error in MOA-ID Configuration. CPEP entry for country "
-//						+ cpep.getCountryCode() + " has an invalid Attribute and is ignored.");
-//			} catch (SAXException e) {
-//				Logger.warn("Error in MOA-ID Configuration. CPEP entry for country "
-//						+ cpep.getCountryCode() + " has an invalid Attribute and is ignored.");
-//			} catch (IOException e) {
-//				Logger.warn("Error in MOA-ID Configuration. CPEP entry for country "
-//						+ cpep.getCountryCode() + " has an invalid Attribute and is ignored.");
-//			} 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
-//
-//		if (samlsign == null) {
-//			Logger.warn("Error in MOA-ID Configuration. No STORK->SAMLSigningParameter configuration found.");
-//
-//		} else {
-//			SignatureVerificationParameterType sigverify = samlsign.getSignatureVerificationParameter();
-//
-//			if (sigverify == null) {
-//				Logger.warn("Error in MOA-ID Configuration. No STORK->SignatureVerificationParameter configuration found.");
-//
-//			} else {
-//				sigverifyparam = new SignatureVerificationParameter(sigverify.getTrustProfileID());
-//			}
-//		}
 		attr = new ArrayList<StorkAttribute>();
 		for(StorkAttribute current : stork.getAttributes()) {
 			attr.add(current);
-- 
cgit v1.2.3