Merge branch 'huge_refactoring' into development_preview

# Conflicts:
#	id/server/doc/handbook/config/config.html
#	id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/OAAuthParameterDecorator.java
#	id/server/modules/moa-id-modul-citizencard_authentication/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java
#	id/server/modules/moa-id-modul-citizencard_authentication/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/tasks/VerifyAuthenticationBlockTask.java
#	id/server/modules/moa-id-modul-citizencard_authentication/src/main/java/at/gv/egovernment/moa/id/auth/validator/CreateXMLSignatureResponseValidator.java

1 files changed, 26 insertions, 33 deletions

diff --git a/id/server/modules/moa-id-modules-saml1/src/main/java/at/gv/egovernment/moa/id/protocols/saml1/SAML1RequestImpl.java b/id/server/modules/moa-id-modules-saml1/src/main/java/at/gv/egovernment/moa/id/protocols/saml1/SAML1RequestImpl.java
index 1d3525626..4d3e60dd7 100644
--- a/id/server/modules/moa-id-modules-saml1/src/main/java/at/gv/egovernment/moa/id/protocols/saml1/SAML1RequestImpl.java
+++ b/id/server/modules/moa-id-modules-saml1/src/main/java/at/gv/egovernment/moa/id/protocols/saml1/SAML1RequestImpl.java
@@ -22,18 +22,11 @@
  */
 package at.gv.egovernment.moa.id.protocols.saml1;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import org.opensaml.saml2.metadata.provider.MetadataProvider;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Component;
 
-import at.gv.egovernment.moa.id.commons.api.data.SAML1ConfigurationParameters;
-import at.gv.egovernment.moa.id.moduls.RequestImpl;
-import at.gv.egovernment.moa.id.protocols.pvp2x.PVPConstants;
+import at.gv.egiz.eaaf.core.impl.idp.controller.protocols.RequestImpl;
 
 /**
  * @author tlenz
@@ -45,7 +38,7 @@ public class SAML1RequestImpl extends RequestImpl {
 
 	private static final long serialVersionUID = -4961979968425683115L;
 	
-	private String sourceID = null;
+	private String sourceID = null; 
 	private String target = null;
 	
 	/**
@@ -78,29 +71,29 @@ public class SAML1RequestImpl extends RequestImpl {
 		this.target = target;
 	}
 
-	/* (non-Javadoc)
-	 * @see at.gv.egovernment.moa.id.moduls.RequestImpl#getRequestedAttributes()
-	 */
-	@Override
-	public Collection<String> getRequestedAttributes(MetadataProvider metadataProvider) {
-		
-		List<String> reqAttr = new ArrayList<String>();
-		reqAttr.addAll(SAML1Protocol.DEFAULTREQUESTEDATTRFORINTERFEDERATION);
-		
-		SAML1ConfigurationParameters saml1 = this.getOnlineApplicationConfiguration().getSAML1Parameter();
-		if (saml1 != null) {
-			if (saml1.isProvideAUTHBlock())
-				reqAttr.add(PVPConstants.EID_AUTH_BLOCK_NAME);
-			
-			if (saml1.isProvideCertificate())
-				reqAttr.add(PVPConstants.EID_SIGNER_CERTIFICATE_NAME);
-			
-			if (saml1.isProvideFullMandatorData())
-				reqAttr.add(PVPConstants.MANDATE_FULL_MANDATE_NAME);
-		}
-				
-		return reqAttr;
-		
-	}
+//	/* (non-Javadoc)
+//	 * @see at.gv.egovernment.moa.id.moduls.RequestImpl#getRequestedAttributes()
+//	 */
+//	@Override
+//	public Collection<String> getRequestedAttributes(MetadataProvider metadataProvider) {
+//		
+//		List<String> reqAttr = new ArrayList<String>();
+//		reqAttr.addAll(SAML1Protocol.DEFAULTREQUESTEDATTRFORINTERFEDERATION);
+//		
+//		SAML1ConfigurationParameters saml1 = this.getOnlineApplicationConfiguration().getSAML1Parameter();
+//		if (saml1 != null) {
+//			if (saml1.isProvideAUTHBlock())
+//				reqAttr.add(PVPConstants.EID_AUTH_BLOCK_NAME);
+//			
+//			if (saml1.isProvideCertificate())
+//				reqAttr.add(PVPConstants.EID_SIGNER_CERTIFICATE_NAME);
+//			
+//			if (saml1.isProvideFullMandatorData())
+//				reqAttr.add(PVPConstants.MANDATE_FULL_MANDATE_NAME);
+//		}
+//				
+//		return reqAttr;
+//		
+//	}
 
 }