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, 23 insertions, 22 deletions

diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPApplicationBuilder.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPApplicationBuilder.java
index a35c77936..6d9f9bf1e 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPApplicationBuilder.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPApplicationBuilder.java
@@ -24,28 +24,29 @@ import eu.stork.peps.auth.engine.core.SPApplication;
  * 
  * @author fjquevedo
  */
-public class SPApplicationBuilder extends
-	AbstractSAMLObjectBuilder<SPApplication> {
+public class SPApplicationBuilder extends AbstractSAMLObjectBuilder<SPApplication> {
 
-    /**
-     * Builds the object.
-     *
-     * @return the service provider application
-     */
-    public final SPApplication buildObject() {
-	return buildObject(SPApplication.DEF_ELEMENT_NAME);
-    }
+	/**
+	 * Builds the object.
+	 *
+	 * @return the service provider application
+	 */
+	public final SPApplication buildObject() {
+		return buildObject(SPApplication.DEF_ELEMENT_NAME);
+	}
 
-    /**
-     * Builds the object.
-     *
-     * @param namespaceURI the namespace uri
-     * @param localName the local name
-     * @param namespacePrefix the namespace prefix
-     * @return the service provider application
-     */
-    public final SPApplication buildObject(final String namespaceURI,
-	    final String localName, final String namespacePrefix) {
-	return new SPApplicationImpl(namespaceURI, localName, namespacePrefix);
-    }
+	/**
+	 * Builds the object.
+	 *
+	 * @param namespaceURI
+	 *            the namespace uri
+	 * @param localName
+	 *            the local name
+	 * @param namespacePrefix
+	 *            the namespace prefix
+	 * @return the service provider application
+	 */
+	public final SPApplication buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
+		return new SPApplicationImpl(namespaceURI, localName, namespacePrefix);
+	}
 }
\ No newline at end of file