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, 57 deletions

diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CourseUnitLanguageOfInstructionType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CourseUnitLanguageOfInstructionType.java
index 4542085b6..69e63c4d3 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CourseUnitLanguageOfInstructionType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CourseUnitLanguageOfInstructionType.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 javax.xml.bind.annotation.XmlAccessType;
@@ -14,13 +13,14 @@ import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlType;
 import javax.xml.bind.annotation.XmlValue;
 
-
 /**
  * Language of instruction
  * 
- * <p>Java class for CourseUnitLanguageOfInstructionType complex type.
+ * <p>
+ * Java class for CourseUnitLanguageOfInstructionType 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="CourseUnitLanguageOfInstructionType">
@@ -35,64 +35,56 @@ import javax.xml.bind.annotation.XmlValue;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CourseUnitLanguageOfInstructionType", propOrder = {
-    "value"
-})
+@XmlType(name = "CourseUnitLanguageOfInstructionType", propOrder = { "value" })
 public class CourseUnitLanguageOfInstructionType {
 
-    @XmlValue
-    protected String value;
-    @XmlAttribute(name = "language", required = true)
-    protected LanguageType language;
+	@XmlValue
+	protected String value;
+	@XmlAttribute(name = "language", required = true)
+	protected LanguageType language;
 
-    /**
-     * Plain text constraint
-     * 
-     * Non empty text
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getValue() {
-        return value;
-    }
+	/**
+	 * Plain text constraint
+	 * 
+	 * Non empty text
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getValue() {
+		return value;
+	}
 
-    /**
-     * Sets the value of the value property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setValue(String value) {
-        this.value = value;
-    }
+	/**
+	 * Sets the value of the value property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setValue(String value) {
+		this.value = value;
+	}
 
-    /**
-     * Gets the value of the language property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link LanguageType }
-     *     
-     */
-    public LanguageType getLanguage() {
-        return language;
-    }
+	/**
+	 * Gets the value of the language property.
+	 * 
+	 * @return possible object is {@link LanguageType }
+	 * 
+	 */
+	public LanguageType getLanguage() {
+		return language;
+	}
 
-    /**
-     * Sets the value of the language property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link LanguageType }
-     *     
-     */
-    public void setLanguage(LanguageType value) {
-        this.language = value;
-    }
+	/**
+	 * Sets the value of the language property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link LanguageType }
+	 * 
+	 */
+	public void setLanguage(LanguageType value) {
+		this.language = value;
+	}
 
 }