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, 33 insertions, 34 deletions

diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/QAAAttribute.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/QAAAttribute.java
index d99d23896..22d472be9 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/QAAAttribute.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/QAAAttribute.java
@@ -26,38 +26,37 @@ import org.opensaml.common.SAMLObject;
  */
 public interface QAAAttribute extends SAMLObject {
 
-    /** Element local name. */
-    String DEF_LOCAL_NAME = "QualityAuthenticationAssuranceLevel";
-
-    /** Default element name. */
-    QName DEF_ELEMENT_NAME = new QName(SAMLCore.STORK10_NS.getValue(), DEF_LOCAL_NAME,
-	    SAMLCore.STORK10_PREFIX.getValue());
-
-    /** Local name of the XSI type. */
-    String TYPE_LOCAL_NAME = "QualityAuthenticationAssuranceLevelAbstractType";
-
-    /** QName of the XSI type. */
-    QName TYPE_NAME = new QName(SAMLCore.STORK10_NS.getValue(), TYPE_LOCAL_NAME,
-	    SAMLCore.STORK10_PREFIX.getValue());
-
-    /** The minimum value allowed. */
-    int MIN_VALUE = 1;
-
-    /** The Max value allowed. */
-    int MAX_VALUE = 4;
-
-    /**
-     * Gets the qAA level.
-     * 
-     * @return the qAA level
-     */
-    String getQaaLevel();
-
-    /**
-     * Sets the qAA level.
-     * 
-     * @param qaaLevel the new qAA level
-     * 
-     */
-    void setQaaLevel(String qaaLevel);
+	/** Element local name. */
+	String DEF_LOCAL_NAME = "QualityAuthenticationAssuranceLevel";
+
+	/** Default element name. */
+	QName DEF_ELEMENT_NAME = new QName(SAMLCore.STORK10_NS.getValue(), DEF_LOCAL_NAME, SAMLCore.STORK10_PREFIX.getValue());
+
+	/** Local name of the XSI type. */
+	String TYPE_LOCAL_NAME = "QualityAuthenticationAssuranceLevelAbstractType";
+
+	/** QName of the XSI type. */
+	QName TYPE_NAME = new QName(SAMLCore.STORK10_NS.getValue(), TYPE_LOCAL_NAME, SAMLCore.STORK10_PREFIX.getValue());
+
+	/** The minimum value allowed. */
+	int MIN_VALUE = 1;
+
+	/** The Max value allowed. */
+	int MAX_VALUE = 4;
+
+	/**
+	 * Gets the qAA level.
+	 * 
+	 * @return the qAA level
+	 */
+	String getQaaLevel();
+
+	/**
+	 * Sets the qAA level.
+	 * 
+	 * @param qaaLevel
+	 *            the new qAA level
+	 * 
+	 */
+	void setQaaLevel(String qaaLevel);
 }