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, 8 insertions, 8 deletions

diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDCrossBorderShareBuilder.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDCrossBorderShareBuilder.java
index 3f4fc633d..7c7a88b89 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDCrossBorderShareBuilder.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDCrossBorderShareBuilder.java
@@ -24,8 +24,7 @@ import eu.stork.peps.auth.engine.core.EIDCrossBorderShare;
  * 
  * @author fjquevedo
  */
-public class EIDCrossBorderShareBuilder extends	AbstractSAMLObjectBuilder<EIDCrossBorderShare> {
-
+public class EIDCrossBorderShareBuilder extends AbstractSAMLObjectBuilder<EIDCrossBorderShare> {
 
 	/**
 	 * Builds the object.
@@ -36,17 +35,18 @@ public class EIDCrossBorderShareBuilder extends	AbstractSAMLObjectBuilder<EIDCro
 		return buildObject(EIDCrossBorderShare.DEF_ELEMENT_NAME);
 	}
 
-
 	/**
 	 * Builds the object.
 	 *
-	 * @param namespaceURI the namespace uri
-	 * @param localName the local name
-	 * @param namespacePrefix the namespace prefix
+	 * @param namespaceURI
+	 *            the namespace uri
+	 * @param localName
+	 *            the local name
+	 * @param namespacePrefix
+	 *            the namespace prefix
 	 * @return the eID cross border share
 	 */
-	public final EIDCrossBorderShare buildObject(final String namespaceURI,
-			final String localName, final String namespacePrefix) {
+	public final EIDCrossBorderShare buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
 		return new EIDCrossBorderShareImpl(namespaceURI, localName, namespacePrefix);
 	}
 }
\ No newline at end of file