Merge STORK-SAML-Engine 1.5.1 and STORK-Commons 1.5.1

Conflicts:
	id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/AttributeProviderFactory.java
	id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/validator/CustomAttributeQueryValidator.java
	id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/validator/MultipleAssertionResponseValidator.java

1 files changed, 35 insertions, 37 deletions

diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/CustomAttributeQuery.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/CustomAttributeQuery.java
index b558fc19d..d603c2293 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/CustomAttributeQuery.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/CustomAttributeQuery.java
@@ -10,42 +10,40 @@ import org.opensaml.saml2.core.SubjectQuery;
 
 public interface CustomAttributeQuery extends CustomRequestAbstractType {
 	/** Element local name. */
-    public static final String DEFAULT_ELEMENT_LOCAL_NAME = "AttributeQuery";
-
-    /** Default element name. */
-    public static final QName DEFAULT_ELEMENT_NAME = new QName(SAMLConstants.SAML20P_NS, DEFAULT_ELEMENT_LOCAL_NAME,
-            SAMLConstants.SAML20P_PREFIX);
-
-    /** Local name of the XSI type. */
-    public static final String TYPE_LOCAL_NAME = "CustomAttributeQueryType";
-
-    /** QName of the XSI type. */
-    public static final QName TYPE_NAME = new QName(SAMLConstants.SAML20P_NS, TYPE_LOCAL_NAME,
-            SAMLConstants.SAML20P_PREFIX);
-    
-    /** AssertionConsumerServiceURL attribute name. */
-    public static final String ASSERTION_CONSUMER_SERVICE_URL_ATTRIB_NAME 
-    	= "AssertionConsumerServiceURL";
-
-    /**
-     * Gets the Attributes of this query.
-     * 
-     * @return the list of Attributes of this query
-     */
-    public List<Attribute> getAttributes();       
-    
-    /**
-     * Gets the Subject of this request.
-     * 
-     * @return the Subject of this request
-     */
-    public Subject getSubject();
-
-    /**
-     * Sets the Subject of this request.
-     * 
-     * @param newSubject the Subject of this request
-     */
-    public void setSubject(Subject newSubject);
+	public static final String DEFAULT_ELEMENT_LOCAL_NAME = "AttributeQuery";
+
+	/** Default element name. */
+	public static final QName DEFAULT_ELEMENT_NAME = new QName(SAMLConstants.SAML20P_NS, DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20P_PREFIX);
+
+	/** Local name of the XSI type. */
+	public static final String TYPE_LOCAL_NAME = "CustomAttributeQueryType";
+
+	/** QName of the XSI type. */
+	public static final QName TYPE_NAME = new QName(SAMLConstants.SAML20P_NS, TYPE_LOCAL_NAME, SAMLConstants.SAML20P_PREFIX);
+
+	/** AssertionConsumerServiceURL attribute name. */
+	public static final String ASSERTION_CONSUMER_SERVICE_URL_ATTRIB_NAME = "AssertionConsumerServiceURL";
+
+	/**
+	 * Gets the Attributes of this query.
+	 * 
+	 * @return the list of Attributes of this query
+	 */
+	public List<Attribute> getAttributes();
+
+	/**
+	 * Gets the Subject of this request.
+	 * 
+	 * @return the Subject of this request
+	 */
+	public Subject getSubject();
+
+	/**
+	 * Sets the Subject of this request.
+	 * 
+	 * @param newSubject
+	 *            the Subject of this request
+	 */
+	public void setSubject(Subject newSubject);
 
 }