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, 110 insertions, 124 deletions

diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/ContactInformationType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/ContactInformationType.java
index 2ad8c81ec..63df83402 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/ContactInformationType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/ContactInformationType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement;
 
 import java.util.ArrayList;
@@ -15,13 +14,14 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
  * Contact information
  * 
- * <p>Java class for ContactInformationType complex type.
+ * <p>
+ * Java class for ContactInformationType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="ContactInformationType">
@@ -41,132 +41,118 @@ import javax.xml.bind.annotation.XmlType;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ContactInformationType", propOrder = {
-    "address",
-    "phoneNumber",
-    "email",
-    "webSite"
-})
+@XmlType(name = "ContactInformationType", propOrder = { "address", "phoneNumber", "email", "webSite" })
 public class ContactInformationType {
 
-    @XmlElement(name = "Address", required = true)
-    protected AddressType address;
-    @XmlElement(name = "PhoneNumber")
-    protected List<String> phoneNumber;
-    @XmlElement(name = "Email")
-    protected List<String> email;
-    @XmlElement(name = "WebSite")
-    protected List<String> webSite;
+	@XmlElement(name = "Address", required = true)
+	protected AddressType address;
+	@XmlElement(name = "PhoneNumber")
+	protected List<String> phoneNumber;
+	@XmlElement(name = "Email")
+	protected List<String> email;
+	@XmlElement(name = "WebSite")
+	protected List<String> webSite;
 
-    /**
-     * Gets the value of the address property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link AddressType }
-     *     
-     */
-    public AddressType getAddress() {
-        return address;
-    }
+	/**
+	 * Gets the value of the address property.
+	 * 
+	 * @return possible object is {@link AddressType }
+	 * 
+	 */
+	public AddressType getAddress() {
+		return address;
+	}
 
-    /**
-     * Sets the value of the address property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link AddressType }
-     *     
-     */
-    public void setAddress(AddressType value) {
-        this.address = value;
-    }
+	/**
+	 * Sets the value of the address property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link AddressType }
+	 * 
+	 */
+	public void setAddress(AddressType value) {
+		this.address = value;
+	}
 
-    /**
-     * Gets the value of the phoneNumber property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the phoneNumber property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getPhoneNumber().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link String }
-     * 
-     * 
-     */
-    public List<String> getPhoneNumber() {
-        if (phoneNumber == null) {
-            phoneNumber = new ArrayList<String>();
-        }
-        return this.phoneNumber;
-    }
+	/**
+	 * Gets the value of the phoneNumber property.
+	 * 
+	 * <p>
+	 * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is
+	 * not a <CODE>set</CODE> method for the phoneNumber property.
+	 * 
+	 * <p>
+	 * For example, to add a new item, do as follows:
+	 * 
+	 * <pre>
+	 * getPhoneNumber().add(newItem);
+	 * </pre>
+	 * 
+	 * 
+	 * <p>
+	 * Objects of the following type(s) are allowed in the list {@link String }
+	 * 
+	 * 
+	 */
+	public List<String> getPhoneNumber() {
+		if (phoneNumber == null) {
+			phoneNumber = new ArrayList<String>();
+		}
+		return this.phoneNumber;
+	}
 
-    /**
-     * Gets the value of the email property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the email property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getEmail().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link String }
-     * 
-     * 
-     */
-    public List<String> getEmail() {
-        if (email == null) {
-            email = new ArrayList<String>();
-        }
-        return this.email;
-    }
+	/**
+	 * Gets the value of the email property.
+	 * 
+	 * <p>
+	 * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is
+	 * not a <CODE>set</CODE> method for the email property.
+	 * 
+	 * <p>
+	 * For example, to add a new item, do as follows:
+	 * 
+	 * <pre>
+	 * getEmail().add(newItem);
+	 * </pre>
+	 * 
+	 * 
+	 * <p>
+	 * Objects of the following type(s) are allowed in the list {@link String }
+	 * 
+	 * 
+	 */
+	public List<String> getEmail() {
+		if (email == null) {
+			email = new ArrayList<String>();
+		}
+		return this.email;
+	}
 
-    /**
-     * Gets the value of the webSite property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the webSite property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getWebSite().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link String }
-     * 
-     * 
-     */
-    public List<String> getWebSite() {
-        if (webSite == null) {
-            webSite = new ArrayList<String>();
-        }
-        return this.webSite;
-    }
+	/**
+	 * Gets the value of the webSite property.
+	 * 
+	 * <p>
+	 * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is
+	 * not a <CODE>set</CODE> method for the webSite property.
+	 * 
+	 * <p>
+	 * For example, to add a new item, do as follows:
+	 * 
+	 * <pre>
+	 * getWebSite().add(newItem);
+	 * </pre>
+	 * 
+	 * 
+	 * <p>
+	 * Objects of the following type(s) are allowed in the list {@link String }
+	 * 
+	 * 
+	 */
+	public List<String> getWebSite() {
+		if (webSite == null) {
+			webSite = new ArrayList<String>();
+		}
+		return this.webSite;
+	}
 
 }