aboutsummaryrefslogtreecommitdiff
path: root/id/server/modules/moa-id-modules-saml1/src/main/java/at
diff options
context:
space:
mode:
authorThomas Lenz <tlenz@iaik.tugraz.at>2016-01-27 14:52:57 +0100
committerThomas Lenz <tlenz@iaik.tugraz.at>2016-01-27 14:52:57 +0100
commitff1af4decacd8467245a6f4bf0c6c5e6a4649e7f (patch)
tree6e2b55bb00667e152f96d3486c9015c8cc33991d /id/server/modules/moa-id-modules-saml1/src/main/java/at
parente01b0fee1d650159561071bdb6027039edc2b76d (diff)
parentc514e19e4915c59f20dd25be1ede953b3d8b02ac (diff)
downloadmoa-id-spss-ff1af4decacd8467245a6f4bf0c6c5e6a4649e7f.tar.gz
moa-id-spss-ff1af4decacd8467245a6f4bf0c6c5e6a4649e7f.tar.bz2
moa-id-spss-ff1af4decacd8467245a6f4bf0c6c5e6a4649e7f.zip
Merge branch 'eSense_eIDAS_development' into moa-id-3.2_(OPB)
Conflicts: id/server/idserverlib/pom.xml id/server/modules/moa-id-module-eIDAS/src/main/java/at/gv/egovernment/moa/id/protocols/eidas/AuthenticationRequest.java id/server/modules/moa-id-module-eIDAS/src/main/java/at/gv/egovernment/moa/id/protocols/eidas/EidasMetaDataRequest.java id/server/modules/moa-id-modules-saml1/src/main/java/at/gv/egovernment/moa/id/protocols/saml1/SAML1AuthenticationServer.java
Diffstat (limited to 'id/server/modules/moa-id-modules-saml1/src/main/java/at')
-rw-r--r--id/server/modules/moa-id-modules-saml1/src/main/java/at/gv/egovernment/moa/id/protocols/saml1/SAML1AuthenticationServer.java2
1 files changed, 0 insertions, 2 deletions
diff --git a/id/server/modules/moa-id-modules-saml1/src/main/java/at/gv/egovernment/moa/id/protocols/saml1/SAML1AuthenticationServer.java b/id/server/modules/moa-id-modules-saml1/src/main/java/at/gv/egovernment/moa/id/protocols/saml1/SAML1AuthenticationServer.java
index af5dada54..421d00cbe 100644
--- a/id/server/modules/moa-id-modules-saml1/src/main/java/at/gv/egovernment/moa/id/protocols/saml1/SAML1AuthenticationServer.java
+++ b/id/server/modules/moa-id-modules-saml1/src/main/java/at/gv/egovernment/moa/id/protocols/saml1/SAML1AuthenticationServer.java
@@ -75,8 +75,6 @@ import at.gv.util.xsd.persondata.PersonNameType.FamilyName;
import at.gv.util.xsd.persondata.PhysicalPersonType;
import eu.eidas.auth.commons.IPersonalAttributeList;
import eu.eidas.auth.commons.PersonalAttribute;
-//import eu.stork.peps.auth.commons.IPersonalAttributeList;
-//import eu.stork.peps.auth.commons.PersonalAttribute;
//import at.gv.egovernment.moa.id.util.IdentityLinkReSigner;
public class SAML1AuthenticationServer extends AuthenticationServer {