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, 69 insertions, 67 deletions

diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/Country.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/Country.java
index 001f9317a..7bef0c628 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/Country.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/Country.java
@@ -18,78 +18,80 @@ import java.io.Serializable;
 /**
  * This class is a bean used to store the information relative to the Country.
  * 
- * @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.10 $, $Date: 2010-11-17 05:15:28 $
  */
 public final class Country implements Serializable {
-  
-  /**
+
+	/**
 	 * 
 	 */
 	private static final long serialVersionUID = 1135994036496370993L;
 
-/**
-   * Country Id.
-   */
-  private String countryId;
-  
-  /**
-   * Country Name.
-   */
-  private String countryName;
-  
-  /**
-   * Country Constructor.
-   * 
-   * @param cId Id of the Country.
-   * @param cName Name of the Country.
-   */
-  public Country(final String cId, final String cName) {
-    
-    this.countryId = cId;
-    this.countryName = cName;
-  }
-  
-  /**
-   * Getter for the countryId value.
-   * 
-   * @return The countryId value.
-   */
-  public String getCountryId() {
-    
-    return countryId;
-  }
-  
-  /**
-   * Setter for the countryId value.
-   * 
-   * @param cId Id of the Country.
-   */
-  public void setCountryId(final String cId) {
-    
-    this.countryId = cId;
-  }
-  
-  /**
-   * Getter for the countryName value.
-   * 
-   * @return The countryName value.
-   */
-  public String getCountryName() {
-    
-    return countryName;
-  }
-  
-  /**
-   * Setter for the countryName value.
-   * 
-   * @param name Name of the Country.
-   */
-  public void setCountryName(final String name) {
-    
-    this.countryName = name;
-  }
-  
+	/**
+	 * Country Id.
+	 */
+	private String countryId;
+
+	/**
+	 * Country Name.
+	 */
+	private String countryName;
+
+	/**
+	 * Country Constructor.
+	 * 
+	 * @param cId
+	 *            Id of the Country.
+	 * @param cName
+	 *            Name of the Country.
+	 */
+	public Country(final String cId, final String cName) {
+
+		this.countryId = cId;
+		this.countryName = cName;
+	}
+
+	/**
+	 * Getter for the countryId value.
+	 * 
+	 * @return The countryId value.
+	 */
+	public String getCountryId() {
+
+		return countryId;
+	}
+
+	/**
+	 * Setter for the countryId value.
+	 * 
+	 * @param cId
+	 *            Id of the Country.
+	 */
+	public void setCountryId(final String cId) {
+
+		this.countryId = cId;
+	}
+
+	/**
+	 * Getter for the countryName value.
+	 * 
+	 * @return The countryName value.
+	 */
+	public String getCountryName() {
+
+		return countryName;
+	}
+
+	/**
+	 * Setter for the countryName value.
+	 * 
+	 * @param name
+	 *            Name of the Country.
+	 */
+	public void setCountryName(final String name) {
+
+		this.countryName = name;
+	}
+
 }