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, 152 insertions, 181 deletions

diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/DSAKeyValueType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/DSAKeyValueType.java
index 7f7c48206..af0978a99 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/DSAKeyValueType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/DSAKeyValueType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.org.w3._2000._09.xmldsig;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -13,11 +12,12 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
- * <p>Java class for DSAKeyValueType complex type.
+ * <p>
+ * Java class for DSAKeyValueType 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="DSAKeyValueType">
@@ -44,184 +44,155 @@ import javax.xml.bind.annotation.XmlType;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "DSAKeyValueType", propOrder = {
-    "p",
-    "q",
-    "g",
-    "y",
-    "j",
-    "seed",
-    "pgenCounter"
-})
+@XmlType(name = "DSAKeyValueType", propOrder = { "p", "q", "g", "y", "j", "seed", "pgenCounter" })
 public class DSAKeyValueType {
 
-    @XmlElement(name = "P")
-    protected byte[] p;
-    @XmlElement(name = "Q")
-    protected byte[] q;
-    @XmlElement(name = "G")
-    protected byte[] g;
-    @XmlElement(name = "Y", required = true)
-    protected byte[] y;
-    @XmlElement(name = "J")
-    protected byte[] j;
-    @XmlElement(name = "Seed")
-    protected byte[] seed;
-    @XmlElement(name = "PgenCounter")
-    protected byte[] pgenCounter;
-
-    /**
-     * Gets the value of the p property.
-     * 
-     * @return
-     *     possible object is
-     *     byte[]
-     */
-    public byte[] getP() {
-        return p;
-    }
-
-    /**
-     * Sets the value of the p property.
-     * 
-     * @param value
-     *     allowed object is
-     *     byte[]
-     */
-    public void setP(byte[] value) {
-        this.p = value;
-    }
-
-    /**
-     * Gets the value of the q property.
-     * 
-     * @return
-     *     possible object is
-     *     byte[]
-     */
-    public byte[] getQ() {
-        return q;
-    }
-
-    /**
-     * Sets the value of the q property.
-     * 
-     * @param value
-     *     allowed object is
-     *     byte[]
-     */
-    public void setQ(byte[] value) {
-        this.q = value;
-    }
-
-    /**
-     * Gets the value of the g property.
-     * 
-     * @return
-     *     possible object is
-     *     byte[]
-     */
-    public byte[] getG() {
-        return g;
-    }
-
-    /**
-     * Sets the value of the g property.
-     * 
-     * @param value
-     *     allowed object is
-     *     byte[]
-     */
-    public void setG(byte[] value) {
-        this.g = value;
-    }
-
-    /**
-     * Gets the value of the y property.
-     * 
-     * @return
-     *     possible object is
-     *     byte[]
-     */
-    public byte[] getY() {
-        return y;
-    }
-
-    /**
-     * Sets the value of the y property.
-     * 
-     * @param value
-     *     allowed object is
-     *     byte[]
-     */
-    public void setY(byte[] value) {
-        this.y = value;
-    }
-
-    /**
-     * Gets the value of the j property.
-     * 
-     * @return
-     *     possible object is
-     *     byte[]
-     */
-    public byte[] getJ() {
-        return j;
-    }
-
-    /**
-     * Sets the value of the j property.
-     * 
-     * @param value
-     *     allowed object is
-     *     byte[]
-     */
-    public void setJ(byte[] value) {
-        this.j = value;
-    }
-
-    /**
-     * Gets the value of the seed property.
-     * 
-     * @return
-     *     possible object is
-     *     byte[]
-     */
-    public byte[] getSeed() {
-        return seed;
-    }
-
-    /**
-     * Sets the value of the seed property.
-     * 
-     * @param value
-     *     allowed object is
-     *     byte[]
-     */
-    public void setSeed(byte[] value) {
-        this.seed = value;
-    }
-
-    /**
-     * Gets the value of the pgenCounter property.
-     * 
-     * @return
-     *     possible object is
-     *     byte[]
-     */
-    public byte[] getPgenCounter() {
-        return pgenCounter;
-    }
-
-    /**
-     * Sets the value of the pgenCounter property.
-     * 
-     * @param value
-     *     allowed object is
-     *     byte[]
-     */
-    public void setPgenCounter(byte[] value) {
-        this.pgenCounter = value;
-    }
+	@XmlElement(name = "P")
+	protected byte[] p;
+	@XmlElement(name = "Q")
+	protected byte[] q;
+	@XmlElement(name = "G")
+	protected byte[] g;
+	@XmlElement(name = "Y", required = true)
+	protected byte[] y;
+	@XmlElement(name = "J")
+	protected byte[] j;
+	@XmlElement(name = "Seed")
+	protected byte[] seed;
+	@XmlElement(name = "PgenCounter")
+	protected byte[] pgenCounter;
+
+	/**
+	 * Gets the value of the p property.
+	 * 
+	 * @return possible object is byte[]
+	 */
+	public byte[] getP() {
+		return p;
+	}
+
+	/**
+	 * Sets the value of the p property.
+	 * 
+	 * @param value
+	 *            allowed object is byte[]
+	 */
+	public void setP(byte[] value) {
+		this.p = value;
+	}
+
+	/**
+	 * Gets the value of the q property.
+	 * 
+	 * @return possible object is byte[]
+	 */
+	public byte[] getQ() {
+		return q;
+	}
+
+	/**
+	 * Sets the value of the q property.
+	 * 
+	 * @param value
+	 *            allowed object is byte[]
+	 */
+	public void setQ(byte[] value) {
+		this.q = value;
+	}
+
+	/**
+	 * Gets the value of the g property.
+	 * 
+	 * @return possible object is byte[]
+	 */
+	public byte[] getG() {
+		return g;
+	}
+
+	/**
+	 * Sets the value of the g property.
+	 * 
+	 * @param value
+	 *            allowed object is byte[]
+	 */
+	public void setG(byte[] value) {
+		this.g = value;
+	}
+
+	/**
+	 * Gets the value of the y property.
+	 * 
+	 * @return possible object is byte[]
+	 */
+	public byte[] getY() {
+		return y;
+	}
+
+	/**
+	 * Sets the value of the y property.
+	 * 
+	 * @param value
+	 *            allowed object is byte[]
+	 */
+	public void setY(byte[] value) {
+		this.y = value;
+	}
+
+	/**
+	 * Gets the value of the j property.
+	 * 
+	 * @return possible object is byte[]
+	 */
+	public byte[] getJ() {
+		return j;
+	}
+
+	/**
+	 * Sets the value of the j property.
+	 * 
+	 * @param value
+	 *            allowed object is byte[]
+	 */
+	public void setJ(byte[] value) {
+		this.j = value;
+	}
+
+	/**
+	 * Gets the value of the seed property.
+	 * 
+	 * @return possible object is byte[]
+	 */
+	public byte[] getSeed() {
+		return seed;
+	}
+
+	/**
+	 * Sets the value of the seed property.
+	 * 
+	 * @param value
+	 *            allowed object is byte[]
+	 */
+	public void setSeed(byte[] value) {
+		this.seed = value;
+	}
+
+	/**
+	 * Gets the value of the pgenCounter property.
+	 * 
+	 * @return possible object is byte[]
+	 */
+	public byte[] getPgenCounter() {
+		return pgenCounter;
+	}
+
+	/**
+	 * Sets the value of the pgenCounter property.
+	 * 
+	 * @param value
+	 *            allowed object is byte[]
+	 */
+	public void setPgenCounter(byte[] value) {
+		this.pgenCounter = value;
+	}
 
 }