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, 146 insertions, 168 deletions

diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/ReferenceType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/ReferenceType.java
index 117949e65..83f03f3c8 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/ReferenceType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/ReferenceType.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;
@@ -18,11 +17,12 @@ import javax.xml.bind.annotation.XmlType;
 import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
-
 /**
- * <p>Java class for ReferenceType complex type.
+ * <p>
+ * Java class for ReferenceType 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="ReferenceType">
@@ -44,171 +44,149 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ReferenceType", propOrder = {
-    "transforms",
-    "digestMethod",
-    "digestValue"
-})
+@XmlType(name = "ReferenceType", propOrder = { "transforms", "digestMethod", "digestValue" })
 public class ReferenceType {
 
-    @XmlElement(name = "Transforms")
-    protected TransformsType transforms;
-    @XmlElement(name = "DigestMethod", required = true)
-    protected DigestMethodType digestMethod;
-    @XmlElement(name = "DigestValue", required = true)
-    protected byte[] digestValue;
-    @XmlAttribute(name = "Id")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlID
-    @XmlSchemaType(name = "ID")
-    protected String id;
-    @XmlAttribute(name = "URI")
-    @XmlSchemaType(name = "anyURI")
-    protected String uri;
-    @XmlAttribute(name = "Type")
-    @XmlSchemaType(name = "anyURI")
-    protected String type;
-
-    /**
-     * Gets the value of the transforms property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link TransformsType }
-     *     
-     */
-    public TransformsType getTransforms() {
-        return transforms;
-    }
-
-    /**
-     * Sets the value of the transforms property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link TransformsType }
-     *     
-     */
-    public void setTransforms(TransformsType value) {
-        this.transforms = value;
-    }
-
-    /**
-     * Gets the value of the digestMethod property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link DigestMethodType }
-     *     
-     */
-    public DigestMethodType getDigestMethod() {
-        return digestMethod;
-    }
-
-    /**
-     * Sets the value of the digestMethod property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link DigestMethodType }
-     *     
-     */
-    public void setDigestMethod(DigestMethodType value) {
-        this.digestMethod = value;
-    }
-
-    /**
-     * Gets the value of the digestValue property.
-     * 
-     * @return
-     *     possible object is
-     *     byte[]
-     */
-    public byte[] getDigestValue() {
-        return digestValue;
-    }
-
-    /**
-     * Sets the value of the digestValue property.
-     * 
-     * @param value
-     *     allowed object is
-     *     byte[]
-     */
-    public void setDigestValue(byte[] value) {
-        this.digestValue = value;
-    }
-
-    /**
-     * Gets the value of the id property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getId() {
-        return id;
-    }
-
-    /**
-     * Sets the value of the id property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setId(String value) {
-        this.id = value;
-    }
-
-    /**
-     * Gets the value of the uri property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getURI() {
-        return uri;
-    }
-
-    /**
-     * Sets the value of the uri property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setURI(String value) {
-        this.uri = value;
-    }
-
-    /**
-     * Gets the value of the type property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getType() {
-        return type;
-    }
-
-    /**
-     * Sets the value of the type property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setType(String value) {
-        this.type = value;
-    }
+	@XmlElement(name = "Transforms")
+	protected TransformsType transforms;
+	@XmlElement(name = "DigestMethod", required = true)
+	protected DigestMethodType digestMethod;
+	@XmlElement(name = "DigestValue", required = true)
+	protected byte[] digestValue;
+	@XmlAttribute(name = "Id")
+	@XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+	@XmlID
+	@XmlSchemaType(name = "ID")
+	protected String id;
+	@XmlAttribute(name = "URI")
+	@XmlSchemaType(name = "anyURI")
+	protected String uri;
+	@XmlAttribute(name = "Type")
+	@XmlSchemaType(name = "anyURI")
+	protected String type;
+
+	/**
+	 * Gets the value of the transforms property.
+	 * 
+	 * @return possible object is {@link TransformsType }
+	 * 
+	 */
+	public TransformsType getTransforms() {
+		return transforms;
+	}
+
+	/**
+	 * Sets the value of the transforms property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link TransformsType }
+	 * 
+	 */
+	public void setTransforms(TransformsType value) {
+		this.transforms = value;
+	}
+
+	/**
+	 * Gets the value of the digestMethod property.
+	 * 
+	 * @return possible object is {@link DigestMethodType }
+	 * 
+	 */
+	public DigestMethodType getDigestMethod() {
+		return digestMethod;
+	}
+
+	/**
+	 * Sets the value of the digestMethod property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link DigestMethodType }
+	 * 
+	 */
+	public void setDigestMethod(DigestMethodType value) {
+		this.digestMethod = value;
+	}
+
+	/**
+	 * Gets the value of the digestValue property.
+	 * 
+	 * @return possible object is byte[]
+	 */
+	public byte[] getDigestValue() {
+		return digestValue;
+	}
+
+	/**
+	 * Sets the value of the digestValue property.
+	 * 
+	 * @param value
+	 *            allowed object is byte[]
+	 */
+	public void setDigestValue(byte[] value) {
+		this.digestValue = value;
+	}
+
+	/**
+	 * Gets the value of the id property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getId() {
+		return id;
+	}
+
+	/**
+	 * Sets the value of the id property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setId(String value) {
+		this.id = value;
+	}
+
+	/**
+	 * Gets the value of the uri property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getURI() {
+		return uri;
+	}
+
+	/**
+	 * Sets the value of the uri property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setURI(String value) {
+		this.uri = value;
+	}
+
+	/**
+	 * Gets the value of the type property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getType() {
+		return type;
+	}
+
+	/**
+	 * Sets the value of the type property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setType(String value) {
+		this.type = value;
+	}
 
 }