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

diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SignModuleFactory.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SignModuleFactory.java
index c37074eab..66d0201d5 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SignModuleFactory.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SignModuleFactory.java
@@ -30,35 +30,35 @@ import eu.stork.peps.exceptions.STORKSAMLEngineException;
 
 public final class SignModuleFactory {
 
-    /** The Constant LOG. */
-    private static final Logger LOG = LoggerFactory
-	    .getLogger(SignModuleFactory.class.getName());
+	/** The Constant LOG. */
+	private static final Logger LOG = LoggerFactory.getLogger(SignModuleFactory.class.getName());
 
-    /**
-     * Instantiates a new module sign factory.
-     */
-    private SignModuleFactory() {
+	/**
+	 * Instantiates a new module sign factory.
+	 */
+	private SignModuleFactory() {
 
-    }
-
-    /**
-     * Gets the single instance of SignModuleFactory.
-     * 
-     * @param className the class name
-     * 
-     * @return single instance of SignModuleFactory
-     * 
-     * @throws STORKSAMLEngineException the STORKSAML engine exception
-     */
-    public static SAMLEngineSignI getInstance(final String className)
-	    throws STORKSAMLEngineException {
-	LOG.info("[START]SignModuleFactory static");
-	try {
-	    final Class cls = Class.forName(className);
-	    return (SAMLEngineSignI) cls.newInstance();
-	} catch (Exception e) {
-	    throw new STORKSAMLEngineException(e);
 	}
 
-    }
+	/**
+	 * Gets the single instance of SignModuleFactory.
+	 * 
+	 * @param className
+	 *            the class name
+	 * 
+	 * @return single instance of SignModuleFactory
+	 * 
+	 * @throws STORKSAMLEngineException
+	 *             the STORKSAML engine exception
+	 */
+	public static SAMLEngineSignI getInstance(final String className) throws STORKSAMLEngineException {
+		LOG.info("[START]SignModuleFactory static");
+		try {
+			final Class cls = Class.forName(className);
+			return (SAMLEngineSignI) cls.newInstance();
+		} catch (Exception e) {
+			throw new STORKSAMLEngineException(e);
+		}
+
+	}
 }