diff options
| author | Florian Reimair <florian.reimair@iaik.tugraz.at> | 2014-01-26 17:09:46 +0100 |
|---|---|---|
| committer | Florian Reimair <florian.reimair@iaik.tugraz.at> | 2014-01-27 16:54:18 +0100 |
| commit | 1ff6044b66a717edff42bd3a1c19a044e744c3b3 (patch) | |
| tree | 90c88806d0acd40079065e4767344cceb39e4b8b /id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/stork | |
| parent | 133f63cef5bffb06e57896a1e83383a414d932df (diff) | |
| download | moa-id-spss-1ff6044b66a717edff42bd3a1c19a044e744c3b3.tar.gz moa-id-spss-1ff6044b66a717edff42bd3a1c19a044e744c3b3.tar.bz2 moa-id-spss-1ff6044b66a717edff42bd3a1c19a044e744c3b3.zip | |
cleanup
Diffstat (limited to 'id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/stork')
| -rw-r--r-- | id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/stork/STORKConfig.java | 51 |
1 files changed, 0 insertions, 51 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 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);
|