1 files changed, 2 insertions, 31 deletions
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/data/MOAAuthenticationData.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/data/MOAAuthenticationData.java
index 897a06e62..f79e80cd2 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/data/MOAAuthenticationData.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/data/MOAAuthenticationData.java
@@ -30,7 +30,7 @@ import org.w3c.dom.Element;
 
 import at.gv.egiz.eaaf.core.api.data.ILoALevelMapper;
 import at.gv.egiz.eaaf.core.impl.data.Pair;
-import at.gv.egiz.eaaf.core.impl.idp.AuthenticationData;
+import at.gv.egiz.eaaf.core.impl.idp.EidAuthenticationData;
 import at.gv.egiz.eaaf.core.impl.utils.DOMUtils;
 import at.gv.egiz.eaaf.modules.pvp2.sp.exception.AssertionAttributeExtractorExeption;
 import at.gv.egovernment.moa.id.commons.api.data.IMISMandate;
@@ -45,14 +45,13 @@ import at.gv.egovernment.moa.util.MiscUtil;
  * @author tlenz
  *
  */
-public class MOAAuthenticationData extends AuthenticationData implements IMOAAuthData, Serializable {
+public class MOAAuthenticationData extends EidAuthenticationData implements IMOAAuthData, Serializable {
 
 	private static final long serialVersionUID = 1L;
 	private boolean qualifiedCertificate;
 	private boolean publicAuthority;
 	private String publicAuthorityCode;
 	private String bkuURL;
-	private byte[] signerCertificate = null;
 	private String authBlock = null;	
 	private String QAALevel = null;
 	
@@ -63,7 +62,6 @@ public class MOAAuthenticationData extends AuthenticationData implements IMOAAut
 	private List<AuthenticationRole> roles = null;
 	private String pvpAttribute_OU = null;
 	  
-	private boolean useMandate = false;
 	private IMISMandate mandate = null;
 	private String mandateReferenceValue = null;
 	
@@ -116,21 +114,6 @@ public class MOAAuthenticationData extends AuthenticationData implements IMOAAut
 		return this.encbPKList;
 	}
 
-	
-	@Override
-	public byte[] getSignerCertificate() {
-		return signerCertificate;
-	}
-
-
-	/**
-	 * @param signerCertificate the signerCertificate to set
-	 */
-	public void setSignerCertificate(byte[] signerCertificate) {
-		this.signerCertificate = signerCertificate;
-	}
-
-
 	@Override
 	public String getAuthBlock() {
 		return authBlock;
@@ -176,18 +159,6 @@ public class MOAAuthenticationData extends AuthenticationData implements IMOAAut
 		this.mandate = mandate;
 	}
 
-
-	@Override
-	public boolean isUseMandate() {
-		return useMandate;
-	}
-
-
-	public void setUseMandate(boolean useMandate) {
-		this.useMandate = useMandate;
-	}
-	
-
 	@Override
 	  public boolean isPublicAuthority() {
 	    return publicAuthority;