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, 49 insertions, 51 deletions

diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/AttributeConstants.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/AttributeConstants.java
index 09769641c..4d13c2d92 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/AttributeConstants.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/AttributeConstants.java
@@ -14,59 +14,57 @@
 package eu.stork.peps.auth.commons;
 
 /**
- * This enum class contains all the STORK PEPS, Commons and Specific errors
- * constant identifiers.
+ * This enum class contains all the STORK PEPS, Commons and Specific errors constant identifiers.
  * 
- * @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.2 $, $Date: 2010-11-17 05:15:28 $
  */
 public enum AttributeConstants {
-  
-  /**
-   * Represents the attribute's name index.
-   */
-  ATTR_NAME_INDEX(0),
-  /**
-   * Represents the attribute's type index.
-   */
-  ATTR_TYPE_INDEX(1),
-  /**
-   * Represents the attribute's value index.
-   */
-  ATTR_VALUE_INDEX(2),
-  /**
-   * Represents the attribute's status index.
-   */
-  ATTR_STATUS_INDEX(3),
-  /**
-   * Represents the number of allowed tuples.
-   */
-  NUMBER_TUPLES(4);
-  
-  /**
-   * Represents the constant's value.
-   */
-  private int attribute;
-  
-  /**
-   * Solo Constructor.
-   * 
-   * @param attr The Attribute Constant value.
-   */
-  AttributeConstants(final int attr) {
-    
-    this.attribute = attr;
-  }
-  
-  /**
-   * Return the Constant Value.
-   * 
-   * @return The constant value.
-   */
-  public int intValue() {
-    
-    return attribute;
-  }
+
+	/**
+	 * Represents the attribute's name index.
+	 */
+	ATTR_NAME_INDEX(0),
+	/**
+	 * Represents the attribute's type index.
+	 */
+	ATTR_TYPE_INDEX(1),
+	/**
+	 * Represents the attribute's value index.
+	 */
+	ATTR_VALUE_INDEX(2),
+	/**
+	 * Represents the attribute's status index.
+	 */
+	ATTR_STATUS_INDEX(3),
+	/**
+	 * Represents the number of allowed tuples.
+	 */
+	NUMBER_TUPLES(4);
+
+	/**
+	 * Represents the constant's value.
+	 */
+	private int attribute;
+
+	/**
+	 * Solo Constructor.
+	 * 
+	 * @param attr
+	 *            The Attribute Constant value.
+	 */
+	AttributeConstants(final int attr) {
+
+		this.attribute = attr;
+	}
+
+	/**
+	 * Return the Constant Value.
+	 * 
+	 * @return The constant value.
+	 */
+	public int intValue() {
+
+		return attribute;
+	}
 }