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, 55 insertions, 50 deletions

diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/SAMLEngineSignI.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/SAMLEngineSignI.java
index e846983d8..8474eeedc 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/SAMLEngineSignI.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/SAMLEngineSignI.java
@@ -30,59 +30,64 @@ import eu.stork.peps.exceptions.SAMLEngineException;
  */
 public interface SAMLEngineSignI {
 
-    /**
-     * Sign.
-     * 
-     * @param tokenSaml the token SAML
-     * 
-     * @return the sAML object
-     * 
-     * @throws SAMLEngineException the SAML engine exception
-     */
-    SAMLObject sign(SignableSAMLObject tokenSaml) throws SAMLEngineException;
+	/**
+	 * Sign.
+	 * 
+	 * @param tokenSaml
+	 *            the token SAML
+	 * 
+	 * @return the sAML object
+	 * 
+	 * @throws SAMLEngineException
+	 *             the SAML engine exception
+	 */
+	SAMLObject sign(SignableSAMLObject tokenSaml) throws SAMLEngineException;
 
-    /**
-     * Gets the certificate.
-     * 
-     * @return the certificate
-     */
-    X509Certificate getCertificate();
+	/**
+	 * Gets the certificate.
+	 * 
+	 * @return the certificate
+	 */
+	X509Certificate getCertificate();
 
-    /**
-     * Gets the trustStore used when validating SAMLTokens
-     * 
-     * @return the trustStore
-     *   
-     */
+	/**
+	 * Gets the trustStore used when validating SAMLTokens
+	 * 
+	 * @return the trustStore
+	 * 
+	 */
 	KeyStore getTrustStore();
-	
-    /**
-     * Validate signature.
-     * 
-     * @param tokenSaml the token SAML
-     * 
-     * @return the sAML object
-     * 
-     * @throws SAMLEngineException the SAML engine exception
-     */
-    SAMLObject validateSignature(SignableSAMLObject tokenSaml)
-	    throws SAMLEngineException;
 
-    /**
-     * Initialize the signature module.
-     * 
-     * @param fileConf the configuration file.
-     * 
-     * @throws SAMLEngineException the STORKSAML engine runtime
-     *             exception
-     */
-    void init(String fileConf) throws SAMLEngineException;
+	/**
+	 * Validate signature.
+	 * 
+	 * @param tokenSaml
+	 *            the token SAML
+	 * 
+	 * @return the sAML object
+	 * 
+	 * @throws SAMLEngineException
+	 *             the SAML engine exception
+	 */
+	SAMLObject validateSignature(SignableSAMLObject tokenSaml) throws SAMLEngineException;
+
+	/**
+	 * Initialize the signature module.
+	 * 
+	 * @param fileConf
+	 *            the configuration file.
+	 * 
+	 * @throws SAMLEngineException
+	 *             the STORKSAML engine runtime exception
+	 */
+	void init(String fileConf) throws SAMLEngineException;
+
+	/**
+	 * Load cryptographic service provider.
+	 * 
+	 * @throws SAMLEngineException
+	 *             the SAML engine exception
+	 */
+	void loadCryptServiceProvider() throws SAMLEngineException;
 
-    /**
-     * Load cryptographic service provider.
-     * 
-     * @throws SAMLEngineException the SAML engine exception
-     */
-    void loadCryptServiceProvider() throws SAMLEngineException;
-    
 }