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, 45 insertions, 46 deletions

diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/STORKStatusCode.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/STORKStatusCode.java
index a9c4a156b..98781828e 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/STORKStatusCode.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/STORKStatusCode.java
@@ -16,53 +16,52 @@ package eu.stork.peps.auth.commons;
 /**
  * This enum class contains the SAML Token Status Code.
  * 
- * @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.13 $, $Date: 2010-11-17 05:15:28 $
  */
 public enum STORKStatusCode {
-  
-  /** URI for Requester status code. */
-  REQUESTER_URI("urn:oasis:names:tc:SAML:2.0:status:Requester"),
-  
-  /** URI for Responder status code. */
-  RESPONDER_URI("urn:oasis:names:tc:SAML:2.0:status:Responder"),
-  
-  /** URI for Success status code. */
-  SUCCESS_URI("urn:oasis:names:tc:SAML:2.0:status:Success"),
-  
-  /** Attribute is Available. */
-  STATUS_AVAILABLE("Available"),
-  
-  /** Attribute is NotAvailable. */
-  STATUS_NOT_AVAILABLE("NotAvailable"),
-  
-  /** Attribute is Withheld. */
-  STATUS_WITHHELD("Withheld");
-  
-  /**
-   * Represents the constant's value.
-   */
-  private String value;
-  
-  /**
-   * Solo Constructor.
-   * 
-   * @param val The Constant value.
-   */
-  private STORKStatusCode(final String val) {
-    
-    this.value = val;
-  }
-  
-  /**
-   * Return the Constant Value.
-   * 
-   * @return The constant value.
-   */
-  public String toString() {
-    
-    return value;
-  }
+
+	/** URI for Requester status code. */
+	REQUESTER_URI("urn:oasis:names:tc:SAML:2.0:status:Requester"),
+
+	/** URI for Responder status code. */
+	RESPONDER_URI("urn:oasis:names:tc:SAML:2.0:status:Responder"),
+
+	/** URI for Success status code. */
+	SUCCESS_URI("urn:oasis:names:tc:SAML:2.0:status:Success"),
+
+	/** Attribute is Available. */
+	STATUS_AVAILABLE("Available"),
+
+	/** Attribute is NotAvailable. */
+	STATUS_NOT_AVAILABLE("NotAvailable"),
+
+	/** Attribute is Withheld. */
+	STATUS_WITHHELD("Withheld");
+
+	/**
+	 * Represents the constant's value.
+	 */
+	private String value;
+
+	/**
+	 * Solo Constructor.
+	 * 
+	 * @param val
+	 *            The Constant value.
+	 */
+	private STORKStatusCode(final String val) {
+
+		this.value = val;
+	}
+
+	/**
+	 * Return the Constant Value.
+	 * 
+	 * @return The constant value.
+	 */
+	public String toString() {
+
+		return value;
+	}
 }