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, 29 insertions, 30 deletions

diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/InvalidParameterPEPSException.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/InvalidParameterPEPSException.java
index 12c83b589..0aca67d5b 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/InvalidParameterPEPSException.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/InvalidParameterPEPSException.java
@@ -16,39 +16,38 @@ package eu.stork.peps.auth.commons.exceptions;
 /**
  * Invalid Parameter Exception class.
  * 
- * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com,
- *         luis.felix@multicert.com, hugo.magalhaes@multicert.com,
- *         paulo.ribeiro@multicert.com
+ * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, luis.felix@multicert.com, hugo.magalhaes@multicert.com, paulo.ribeiro@multicert.com
  * @version $Revision: 1.11 $, $Date: 2010-11-17 05:15:28 $
  * 
  * @see InvalidParameterPEPSException
  */
 public class InvalidParameterPEPSException extends AbstractPEPSException {
-  
-  /**
-   * Unique identifier.
-   */
-  private static final long serialVersionUID = 2046282148740524875L;
-  
-  /**
-   * Exception Constructor with two Strings representing the errorCode and
-   * errorMessage as parameters.
-   * 
-   * @param errorCode The error code value.
-   * @param errorMessage The error code message value.
-   */
-  public InvalidParameterPEPSException(final String errorCode,
-    final String errorMessage) {
-    super(errorCode, errorMessage);
-  }
-  
-  /**
-   * Exception Constructor with one String representing the encoded samlToken.
-   * 
-   * @param samlTokenFail The error SAML Token.
-   */
-  public InvalidParameterPEPSException(final String samlTokenFail) {
-    super(samlTokenFail);
-  }
-  
+
+	/**
+	 * Unique identifier.
+	 */
+	private static final long serialVersionUID = 2046282148740524875L;
+
+	/**
+	 * Exception Constructor with two Strings representing the errorCode and errorMessage as parameters.
+	 * 
+	 * @param errorCode
+	 *            The error code value.
+	 * @param errorMessage
+	 *            The error code message value.
+	 */
+	public InvalidParameterPEPSException(final String errorCode, final String errorMessage) {
+		super(errorCode, errorMessage);
+	}
+
+	/**
+	 * Exception Constructor with one String representing the encoded samlToken.
+	 * 
+	 * @param samlTokenFail
+	 *            The error SAML Token.
+	 */
+	public InvalidParameterPEPSException(final String samlTokenFail) {
+		super(samlTokenFail);
+	}
+
 }