Merge branch 'eSense_eIDAS_development' into moa-id-3.2_(OPB)

Conflicts:
	id/server/idserverlib/pom.xml
	id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/MOAIDAuthInitializer.java
	id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/AuthConfiguration.java
	id/server/modules/module-stork/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/tasks/CreateStorkAuthRequestFormTask.java

1 files changed, 5 insertions, 33 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/verification/metadata/MetadataFilterChain.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/verification/metadata/PVPMetadataFilterChain.java
index 4e1d939ff..4c1da747b 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/verification/metadata/MetadataFilterChain.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/verification/metadata/PVPMetadataFilterChain.java
@@ -23,56 +23,28 @@
 package at.gv.egovernment.moa.id.protocols.pvp2x.verification.metadata;
 
 import java.security.cert.CertificateException;
-import java.util.ArrayList;
-import java.util.List;
 
-import org.opensaml.saml2.metadata.provider.FilterException;
-import org.opensaml.saml2.metadata.provider.MetadataFilter;
-import org.opensaml.xml.XMLObject;
-
-import at.gv.egovernment.moa.logging.Logger;
+import at.gv.egovernment.moa.id.saml2.MetadataFilterChain;
 
 /**
  * @author tlenz
  *
  */
-public class MetadataFilterChain implements MetadataFilter {
+public class PVPMetadataFilterChain extends MetadataFilterChain {
 
-	private List<MetadataFilter> filters = new ArrayList<MetadataFilter>();
-	
+		
 	/**
 	 * @throws CertificateException 
 	 * 
 	 */
-	public MetadataFilterChain(String url, byte[] certificate) throws CertificateException {
+	public PVPMetadataFilterChain(String url, byte[] certificate) throws CertificateException {
 		addDefaultFilters(url, certificate);
 	}
 	
 	public void addDefaultFilters(String url, byte[] certificate) throws CertificateException {
-		filters.add(new MetadataSignatureFilter(url, certificate));
+		addFilter(new MetadataSignatureFilter(url, certificate));
 		
 	}
-	
-	/**
-	 * @return the filter
-	 */
-	public List<MetadataFilter> getFilters() {
-		return filters;
-	}
-	
-	
-	/* (non-Javadoc)
-	 * @see org.opensaml.saml2.metadata.provider.MetadataFilter#doFilter(org.opensaml.xml.XMLObject)
-	 */
-	@Override
-	public void doFilter(XMLObject arg0) throws FilterException {
-		for (MetadataFilter filter : filters) {
-			Logger.trace("Use MOAMetadatafilter " + filter.getClass().getName());
-			filter.doFilter(arg0);
-		}
-
-	}
-