remove STORK code --> MOA-ID >= 3.2 only supports eIDAS protocol

24 files changed, 0 insertions, 3109 deletions

diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/CanonicalizationMethodType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/CanonicalizationMethodType.java
deleted file mode 100644
index 98e01dc8c..000000000
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/CanonicalizationMethodType.java
+++ /dev/null
@@ -1,101 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2014.04.12 at 12:22:50 PM GMT 
-//
-
-package eu.stork.peps.complex.attributes.org.w3._2000._09.xmldsig;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlMixed;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * <p>
- * Java class for CanonicalizationMethodType complex type.
- * 
- * <p>
- * The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="CanonicalizationMethodType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;any maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *       &lt;attribute name="Algorithm" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CanonicalizationMethodType", propOrder = { "content" })
-public class CanonicalizationMethodType {
-
-	@XmlMixed
-	@XmlAnyElement(lax = true)
-	protected List<Object> content;
-	@XmlAttribute(name = "Algorithm", required = true)
-	@XmlSchemaType(name = "anyURI")
-	protected String algorithm;
-
-	/**
-	 * Gets the value of the content 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 content property.
-	 * 
-	 * <p>
-	 * For example, to add a new item, do as follows:
-	 * 
-	 * <pre>
-	 * getContent().add(newItem);
-	 * </pre>
-	 * 
-	 * 
-	 * <p>
-	 * Objects of the following type(s) are allowed in the list {@link String } {@link Object }
-	 * 
-	 * 
-	 */
-	public List<Object> getContent() {
-		if (content == null) {
-			content = new ArrayList<Object>();
-		}
-		return this.content;
-	}
-
-	/**
-	 * Gets the value of the algorithm property.
-	 * 
-	 * @return possible object is {@link String }
-	 * 
-	 */
-	public String getAlgorithm() {
-		return algorithm;
-	}
-
-	/**
-	 * Sets the value of the algorithm property.
-	 * 
-	 * @param value
-	 *            allowed object is {@link String }
-	 * 
-	 */
-	public void setAlgorithm(String value) {
-		this.algorithm = value;
-	}
-
-}
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
deleted file mode 100644
index af0978a99..000000000
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/DSAKeyValueType.java
+++ /dev/null
@@ -1,198 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// 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;
-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>
- * The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="DSAKeyValueType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;sequence minOccurs="0">
- *           &lt;element name="P" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary"/>
- *           &lt;element name="Q" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary"/>
- *         &lt;/sequence>
- *         &lt;element name="G" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary" minOccurs="0"/>
- *         &lt;element name="Y" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary"/>
- *         &lt;element name="J" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary" minOccurs="0"/>
- *         &lt;sequence minOccurs="0">
- *           &lt;element name="Seed" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary"/>
- *           &lt;element name="PgenCounter" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary"/>
- *         &lt;/sequence>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@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;
-	}
-
-}
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/DigestMethodType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/DigestMethodType.java
deleted file mode 100644
index e71a1fdd1..000000000
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/DigestMethodType.java
+++ /dev/null
@@ -1,102 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2014.04.12 at 12:22:50 PM GMT 
-//
-
-package eu.stork.peps.complex.attributes.org.w3._2000._09.xmldsig;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlMixed;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import org.w3c.dom.Element;
-
-/**
- * <p>
- * Java class for DigestMethodType complex type.
- * 
- * <p>
- * The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="DigestMethodType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;any processContents='lax' namespace='##other' maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *       &lt;attribute name="Algorithm" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "DigestMethodType", propOrder = { "content" })
-public class DigestMethodType {
-
-	@XmlMixed
-	@XmlAnyElement(lax = true)
-	protected List<Object> content;
-	@XmlAttribute(name = "Algorithm", required = true)
-	@XmlSchemaType(name = "anyURI")
-	protected String algorithm;
-
-	/**
-	 * Gets the value of the content 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 content property.
-	 * 
-	 * <p>
-	 * For example, to add a new item, do as follows:
-	 * 
-	 * <pre>
-	 * getContent().add(newItem);
-	 * </pre>
-	 * 
-	 * 
-	 * <p>
-	 * Objects of the following type(s) are allowed in the list {@link Object } {@link Element } {@link String }
-	 * 
-	 * 
-	 */
-	public List<Object> getContent() {
-		if (content == null) {
-			content = new ArrayList<Object>();
-		}
-		return this.content;
-	}
-
-	/**
-	 * Gets the value of the algorithm property.
-	 * 
-	 * @return possible object is {@link String }
-	 * 
-	 */
-	public String getAlgorithm() {
-		return algorithm;
-	}
-
-	/**
-	 * Sets the value of the algorithm property.
-	 * 
-	 * @param value
-	 *            allowed object is {@link String }
-	 * 
-	 */
-	public void setAlgorithm(String value) {
-		this.algorithm = value;
-	}
-
-}
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/KeyInfoType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/KeyInfoType.java
deleted file mode 100644
index b5fbd20b2..000000000
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/KeyInfoType.java
+++ /dev/null
@@ -1,126 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2014.04.12 at 12:22:50 PM GMT 
-//
-
-package eu.stork.peps.complex.attributes.org.w3._2000._09.xmldsig;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElementRef;
-import javax.xml.bind.annotation.XmlElementRefs;
-import javax.xml.bind.annotation.XmlID;
-import javax.xml.bind.annotation.XmlMixed;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.w3c.dom.Element;
-
-/**
- * <p>
- * Java class for KeyInfoType complex type.
- * 
- * <p>
- * The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="KeyInfoType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;choice maxOccurs="unbounded">
- *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}KeyName"/>
- *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}KeyValue"/>
- *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}RetrievalMethod"/>
- *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}X509Data"/>
- *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}PGPData"/>
- *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}SPKIData"/>
- *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}MgmtData"/>
- *         &lt;any processContents='lax' namespace='##other'/>
- *       &lt;/choice>
- *       &lt;attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "KeyInfoType", propOrder = { "content" })
-public class KeyInfoType {
-
-	@XmlElementRefs({ @XmlElementRef(name = "PGPData", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
-			@XmlElementRef(name = "X509Data", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
-			@XmlElementRef(name = "KeyValue", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
-			@XmlElementRef(name = "KeyName", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
-			@XmlElementRef(name = "SPKIData", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
-			@XmlElementRef(name = "RetrievalMethod", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
-			@XmlElementRef(name = "MgmtData", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false) })
-	@XmlMixed
-	@XmlAnyElement(lax = true)
-	protected List<Object> content;
-	@XmlAttribute(name = "Id")
-	@XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-	@XmlID
-	@XmlSchemaType(name = "ID")
-	protected String id;
-
-	/**
-	 * Gets the value of the content 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 content property.
-	 * 
-	 * <p>
-	 * For example, to add a new item, do as follows:
-	 * 
-	 * <pre>
-	 * getContent().add(newItem);
-	 * </pre>
-	 * 
-	 * 
-	 * <p>
-	 * Objects of the following type(s) are allowed in the list {@link JAXBElement }{@code <}{@link PGPDataType }{@code >} {@link JAXBElement }{@code <}{@link X509DataType }{@code >} {@link Object }
-	 * {@link JAXBElement }{@code <}{@link KeyValueType }{@code >} {@link JAXBElement }{@code <}{@link String }{@code >} {@link Element } {@link String } {@link JAXBElement }{@code <}{@link SPKIDataType }
-	 * {@code >} {@link JAXBElement }{@code <}{@link RetrievalMethodType }{@code >} {@link JAXBElement }{@code <}{@link String }{@code >}
-	 * 
-	 * 
-	 */
-	public List<Object> getContent() {
-		if (content == null) {
-			content = new ArrayList<Object>();
-		}
-		return this.content;
-	}
-
-	/**
-	 * 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;
-	}
-
-}
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/KeyValueType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/KeyValueType.java
deleted file mode 100644
index c4d1aea20..000000000
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/KeyValueType.java
+++ /dev/null
@@ -1,83 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2014.04.12 at 12:22:50 PM GMT 
-//
-
-package eu.stork.peps.complex.attributes.org.w3._2000._09.xmldsig;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElementRef;
-import javax.xml.bind.annotation.XmlElementRefs;
-import javax.xml.bind.annotation.XmlMixed;
-import javax.xml.bind.annotation.XmlType;
-import org.w3c.dom.Element;
-
-/**
- * <p>
- * Java class for KeyValueType complex type.
- * 
- * <p>
- * The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="KeyValueType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;choice>
- *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}DSAKeyValue"/>
- *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}RSAKeyValue"/>
- *         &lt;any processContents='lax' namespace='##other'/>
- *       &lt;/choice>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "KeyValueType", propOrder = { "content" })
-public class KeyValueType {
-
-	@XmlElementRefs({ @XmlElementRef(name = "RSAKeyValue", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
-			@XmlElementRef(name = "DSAKeyValue", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false) })
-	@XmlMixed
-	@XmlAnyElement(lax = true)
-	protected List<Object> content;
-
-	/**
-	 * Gets the value of the content 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 content property.
-	 * 
-	 * <p>
-	 * For example, to add a new item, do as follows:
-	 * 
-	 * <pre>
-	 * getContent().add(newItem);
-	 * </pre>
-	 * 
-	 * 
-	 * <p>
-	 * Objects of the following type(s) are allowed in the list {@link Object } {@link Element } {@link JAXBElement }{@code <}{@link DSAKeyValueType }{@code >} {@link JAXBElement }{@code <}
-	 * {@link RSAKeyValueType }{@code >} {@link String }
-	 * 
-	 * 
-	 */
-	public List<Object> getContent() {
-		if (content == null) {
-			content = new ArrayList<Object>();
-		}
-		return this.content;
-	}
-
-}
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/ManifestType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/ManifestType.java
deleted file mode 100644
index cfd4a435d..000000000
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/ManifestType.java
+++ /dev/null
@@ -1,104 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2014.04.12 at 12:22:50 PM GMT 
-//
-
-package eu.stork.peps.complex.attributes.org.w3._2000._09.xmldsig;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlID;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
-/**
- * <p>
- * Java class for ManifestType complex type.
- * 
- * <p>
- * The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="ManifestType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}Reference" maxOccurs="unbounded"/>
- *       &lt;/sequence>
- *       &lt;attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ManifestType", propOrder = { "reference" })
-public class ManifestType {
-
-	@XmlElement(name = "Reference", required = true)
-	protected List<ReferenceType> reference;
-	@XmlAttribute(name = "Id")
-	@XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-	@XmlID
-	@XmlSchemaType(name = "ID")
-	protected String id;
-
-	/**
-	 * Gets the value of the reference 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 reference property.
-	 * 
-	 * <p>
-	 * For example, to add a new item, do as follows:
-	 * 
-	 * <pre>
-	 * getReference().add(newItem);
-	 * </pre>
-	 * 
-	 * 
-	 * <p>
-	 * Objects of the following type(s) are allowed in the list {@link ReferenceType }
-	 * 
-	 * 
-	 */
-	public List<ReferenceType> getReference() {
-		if (reference == null) {
-			reference = new ArrayList<ReferenceType>();
-		}
-		return this.reference;
-	}
-
-	/**
-	 * 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;
-	}
-
-}
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/ObjectFactory.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/ObjectFactory.java
deleted file mode 100644
index 64a1fd7e3..000000000
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/ObjectFactory.java
+++ /dev/null
@@ -1,550 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2014.04.12 at 12:22:50 PM GMT 
-//
-
-package eu.stork.peps.complex.attributes.org.w3._2000._09.xmldsig;
-
-import java.math.BigInteger;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlElementDecl;
-import javax.xml.bind.annotation.XmlRegistry;
-import javax.xml.namespace.QName;
-
-/**
- * This object contains factory methods for each Java content interface and Java element interface generated in the org.w3._2000._09.xmldsig package.
- * <p>
- * An ObjectFactory allows you to programatically construct new instances of the Java representation for XML content. The Java representation of XML content can consist of schema derived interfaces
- * and classes representing the binding of schema type definitions, element declarations and model groups. Factory methods for each of these are provided in this class.
- * 
- */
-@XmlRegistry
-public class ObjectFactory {
-
-	private final static QName _SignatureMethodTypeHMACOutputLength_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "HMACOutputLength");
-	private final static QName _PGPData_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "PGPData");
-	private final static QName _SPKIData_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "SPKIData");
-	private final static QName _RetrievalMethod_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "RetrievalMethod");
-	private final static QName _CanonicalizationMethod_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "CanonicalizationMethod");
-	private final static QName _SignatureProperty_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "SignatureProperty");
-	private final static QName _Manifest_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "Manifest");
-	private final static QName _Transforms_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "Transforms");
-	private final static QName _SignatureMethod_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "SignatureMethod");
-	private final static QName _KeyInfo_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "KeyInfo");
-	private final static QName _DigestMethod_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "DigestMethod");
-	private final static QName _MgmtData_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "MgmtData");
-	private final static QName _Reference_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "Reference");
-	private final static QName _RSAKeyValue_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "RSAKeyValue");
-	private final static QName _Signature_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "Signature");
-	private final static QName _DSAKeyValue_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "DSAKeyValue");
-	private final static QName _SignedInfo_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "SignedInfo");
-	private final static QName _Object_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "Object");
-	private final static QName _SignatureValue_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "SignatureValue");
-	private final static QName _Transform_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "Transform");
-	private final static QName _X509Data_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "X509Data");
-	private final static QName _DigestValue_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "DigestValue");
-	private final static QName _SignatureProperties_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "SignatureProperties");
-	private final static QName _KeyName_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "KeyName");
-	private final static QName _KeyValue_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "KeyValue");
-	private final static QName _SPKIDataTypeSPKISexp_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "SPKISexp");
-	private final static QName _PGPDataTypePGPKeyID_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "PGPKeyID");
-	private final static QName _PGPDataTypePGPKeyPacket_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "PGPKeyPacket");
-	private final static QName _X509DataTypeX509IssuerSerial_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "X509IssuerSerial");
-	private final static QName _X509DataTypeX509Certificate_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "X509Certificate");
-	private final static QName _X509DataTypeX509SKI_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "X509SKI");
-	private final static QName _X509DataTypeX509SubjectName_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "X509SubjectName");
-	private final static QName _X509DataTypeX509CRL_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "X509CRL");
-	private final static QName _TransformTypeXPath_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "XPath");
-
-	/**
-	 * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.w3._2000._09.xmldsig
-	 * 
-	 */
-	public ObjectFactory() {
-	}
-
-	/**
-	 * Create an instance of {@link KeyInfoType }
-	 * 
-	 */
-	public KeyInfoType createKeyInfoType() {
-		return new KeyInfoType();
-	}
-
-	/**
-	 * Create an instance of {@link SignedInfoType }
-	 * 
-	 */
-	public SignedInfoType createSignedInfoType() {
-		return new SignedInfoType();
-	}
-
-	/**
-	 * Create an instance of {@link RetrievalMethodType }
-	 * 
-	 */
-	public RetrievalMethodType createRetrievalMethodType() {
-		return new RetrievalMethodType();
-	}
-
-	/**
-	 * Create an instance of {@link DigestMethodType }
-	 * 
-	 */
-	public DigestMethodType createDigestMethodType() {
-		return new DigestMethodType();
-	}
-
-	/**
-	 * Create an instance of {@link SignatureMethodType }
-	 * 
-	 */
-	public SignatureMethodType createSignatureMethodType() {
-		return new SignatureMethodType();
-	}
-
-	/**
-	 * Create an instance of {@link SPKIDataType }
-	 * 
-	 */
-	public SPKIDataType createSPKIDataType() {
-		return new SPKIDataType();
-	}
-
-	/**
-	 * Create an instance of {@link X509DataType }
-	 * 
-	 */
-	public X509DataType createX509DataType() {
-		return new X509DataType();
-	}
-
-	/**
-	 * Create an instance of {@link PGPDataType }
-	 * 
-	 */
-	public PGPDataType createPGPDataType() {
-		return new PGPDataType();
-	}
-
-	/**
-	 * Create an instance of {@link SignatureType }
-	 * 
-	 */
-	public SignatureType createSignatureType() {
-		return new SignatureType();
-	}
-
-	/**
-	 * Create an instance of {@link DSAKeyValueType }
-	 * 
-	 */
-	public DSAKeyValueType createDSAKeyValueType() {
-		return new DSAKeyValueType();
-	}
-
-	/**
-	 * Create an instance of {@link ManifestType }
-	 * 
-	 */
-	public ManifestType createManifestType() {
-		return new ManifestType();
-	}
-
-	/**
-	 * Create an instance of {@link SignatureValueType }
-	 * 
-	 */
-	public SignatureValueType createSignatureValueType() {
-		return new SignatureValueType();
-	}
-
-	/**
-	 * Create an instance of {@link TransformsType }
-	 * 
-	 */
-	public TransformsType createTransformsType() {
-		return new TransformsType();
-	}
-
-	/**
-	 * Create an instance of {@link RSAKeyValueType }
-	 * 
-	 */
-	public RSAKeyValueType createRSAKeyValueType() {
-		return new RSAKeyValueType();
-	}
-
-	/**
-	 * Create an instance of {@link TransformType }
-	 * 
-	 */
-	public TransformType createTransformType() {
-		return new TransformType();
-	}
-
-	/**
-	 * Create an instance of {@link SignaturePropertyType }
-	 * 
-	 */
-	public SignaturePropertyType createSignaturePropertyType() {
-		return new SignaturePropertyType();
-	}
-
-	/**
-	 * Create an instance of {@link KeyValueType }
-	 * 
-	 */
-	public KeyValueType createKeyValueType() {
-		return new KeyValueType();
-	}
-
-	/**
-	 * Create an instance of {@link ReferenceType }
-	 * 
-	 */
-	public ReferenceType createReferenceType() {
-		return new ReferenceType();
-	}
-
-	/**
-	 * Create an instance of {@link CanonicalizationMethodType }
-	 * 
-	 */
-	public CanonicalizationMethodType createCanonicalizationMethodType() {
-		return new CanonicalizationMethodType();
-	}
-
-	/**
-	 * Create an instance of {@link SignaturePropertiesType }
-	 * 
-	 */
-	public SignaturePropertiesType createSignaturePropertiesType() {
-		return new SignaturePropertiesType();
-	}
-
-	/**
-	 * Create an instance of {@link ObjectType }
-	 * 
-	 */
-	public ObjectType createObjectType() {
-		return new ObjectType();
-	}
-
-	/**
-	 * Create an instance of {@link X509IssuerSerialType }
-	 * 
-	 */
-	public X509IssuerSerialType createX509IssuerSerialType() {
-		return new X509IssuerSerialType();
-	}
-
-	/**
-	 * Create an instance of {@link JAXBElement }{@code <}{@link BigInteger }{@code >}
-	 * 
-	 */
-	@XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "HMACOutputLength", scope = SignatureMethodType.class)
-	public JAXBElement<BigInteger> createSignatureMethodTypeHMACOutputLength(BigInteger value) {
-		return new JAXBElement<BigInteger>(_SignatureMethodTypeHMACOutputLength_QNAME, BigInteger.class, SignatureMethodType.class, value);
-	}
-
-	/**
-	 * Create an instance of {@link JAXBElement }{@code <}{@link PGPDataType }{@code >}
-	 * 
-	 */
-	@XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "PGPData")
-	public JAXBElement<PGPDataType> createPGPData(PGPDataType value) {
-		return new JAXBElement<PGPDataType>(_PGPData_QNAME, PGPDataType.class, null, value);
-	}
-
-	/**
-	 * Create an instance of {@link JAXBElement }{@code <}{@link SPKIDataType }{@code >}
-	 * 
-	 */
-	@XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SPKIData")
-	public JAXBElement<SPKIDataType> createSPKIData(SPKIDataType value) {
-		return new JAXBElement<SPKIDataType>(_SPKIData_QNAME, SPKIDataType.class, null, value);
-	}
-
-	/**
-	 * Create an instance of {@link JAXBElement }{@code <}{@link RetrievalMethodType }{@code >}
-	 * 
-	 */
-	@XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "RetrievalMethod")
-	public JAXBElement<RetrievalMethodType> createRetrievalMethod(RetrievalMethodType value) {
-		return new JAXBElement<RetrievalMethodType>(_RetrievalMethod_QNAME, RetrievalMethodType.class, null, value);
-	}
-
-	/**
-	 * Create an instance of {@link JAXBElement }{@code <}{@link CanonicalizationMethodType }{@code >}
-	 * 
-	 */
-	@XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "CanonicalizationMethod")
-	public JAXBElement<CanonicalizationMethodType> createCanonicalizationMethod(CanonicalizationMethodType value) {
-		return new JAXBElement<CanonicalizationMethodType>(_CanonicalizationMethod_QNAME, CanonicalizationMethodType.class, null, value);
-	}
-
-	/**
-	 * Create an instance of {@link JAXBElement }{@code <}{@link SignaturePropertyType }{@code >}
-	 * 
-	 */
-	@XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SignatureProperty")
-	public JAXBElement<SignaturePropertyType> createSignatureProperty(SignaturePropertyType value) {
-		return new JAXBElement<SignaturePropertyType>(_SignatureProperty_QNAME, SignaturePropertyType.class, null, value);
-	}
-
-	/**
-	 * Create an instance of {@link JAXBElement }{@code <}{@link ManifestType }{@code >}
-	 * 
-	 */
-	@XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "Manifest")
-	public JAXBElement<ManifestType> createManifest(ManifestType value) {
-		return new JAXBElement<ManifestType>(_Manifest_QNAME, ManifestType.class, null, value);
-	}
-
-	/**
-	 * Create an instance of {@link JAXBElement }{@code <}{@link TransformsType }{@code >}
-	 * 
-	 */
-	@XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "Transforms")
-	public JAXBElement<TransformsType> createTransforms(TransformsType value) {
-		return new JAXBElement<TransformsType>(_Transforms_QNAME, TransformsType.class, null, value);
-	}
-
-	/**
-	 * Create an instance of {@link JAXBElement }{@code <}{@link SignatureMethodType }{@code >}
-	 * 
-	 */
-	@XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SignatureMethod")
-	public JAXBElement<SignatureMethodType> createSignatureMethod(SignatureMethodType value) {
-		return new JAXBElement<SignatureMethodType>(_SignatureMethod_QNAME, SignatureMethodType.class, null, value);
-	}
-
-	/**
-	 * Create an instance of {@link JAXBElement }{@code <}{@link KeyInfoType }{@code >}
-	 * 
-	 */
-	@XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "KeyInfo")
-	public JAXBElement<KeyInfoType> createKeyInfo(KeyInfoType value) {
-		return new JAXBElement<KeyInfoType>(_KeyInfo_QNAME, KeyInfoType.class, null, value);
-	}
-
-	/**
-	 * Create an instance of {@link JAXBElement }{@code <}{@link DigestMethodType }{@code >}
-	 * 
-	 */
-	@XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "DigestMethod")
-	public JAXBElement<DigestMethodType> createDigestMethod(DigestMethodType value) {
-		return new JAXBElement<DigestMethodType>(_DigestMethod_QNAME, DigestMethodType.class, null, value);
-	}
-
-	/**
-	 * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}
-	 * 
-	 */
-	@XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "MgmtData")
-	public JAXBElement<String> createMgmtData(String value) {
-		return new JAXBElement<String>(_MgmtData_QNAME, String.class, null, value);
-	}
-
-	/**
-	 * Create an instance of {@link JAXBElement }{@code <}{@link ReferenceType }{@code >}
-	 * 
-	 */
-	@XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "Reference")
-	public JAXBElement<ReferenceType> createReference(ReferenceType value) {
-		return new JAXBElement<ReferenceType>(_Reference_QNAME, ReferenceType.class, null, value);
-	}
-
-	/**
-	 * Create an instance of {@link JAXBElement }{@code <}{@link RSAKeyValueType }{@code >}
-	 * 
-	 */
-	@XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "RSAKeyValue")
-	public JAXBElement<RSAKeyValueType> createRSAKeyValue(RSAKeyValueType value) {
-		return new JAXBElement<RSAKeyValueType>(_RSAKeyValue_QNAME, RSAKeyValueType.class, null, value);
-	}
-
-	/**
-	 * Create an instance of {@link JAXBElement }{@code <}{@link SignatureType }{@code >}
-	 * 
-	 */
-	@XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "Signature")
-	public JAXBElement<SignatureType> createSignature(SignatureType value) {
-		return new JAXBElement<SignatureType>(_Signature_QNAME, SignatureType.class, null, value);
-	}
-
-	/**
-	 * Create an instance of {@link JAXBElement }{@code <}{@link DSAKeyValueType }{@code >}
-	 * 
-	 */
-	@XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "DSAKeyValue")
-	public JAXBElement<DSAKeyValueType> createDSAKeyValue(DSAKeyValueType value) {
-		return new JAXBElement<DSAKeyValueType>(_DSAKeyValue_QNAME, DSAKeyValueType.class, null, value);
-	}
-
-	/**
-	 * Create an instance of {@link JAXBElement }{@code <}{@link SignedInfoType }{@code >}
-	 * 
-	 */
-	@XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SignedInfo")
-	public JAXBElement<SignedInfoType> createSignedInfo(SignedInfoType value) {
-		return new JAXBElement<SignedInfoType>(_SignedInfo_QNAME, SignedInfoType.class, null, value);
-	}
-
-	/**
-	 * Create an instance of {@link JAXBElement }{@code <}{@link ObjectType }{@code >}
-	 * 
-	 */
-	@XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "Object")
-	public JAXBElement<ObjectType> createObject(ObjectType value) {
-		return new JAXBElement<ObjectType>(_Object_QNAME, ObjectType.class, null, value);
-	}
-
-	/**
-	 * Create an instance of {@link JAXBElement }{@code <}{@link SignatureValueType }{@code >}
-	 * 
-	 */
-	@XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SignatureValue")
-	public JAXBElement<SignatureValueType> createSignatureValue(SignatureValueType value) {
-		return new JAXBElement<SignatureValueType>(_SignatureValue_QNAME, SignatureValueType.class, null, value);
-	}
-
-	/**
-	 * Create an instance of {@link JAXBElement }{@code <}{@link TransformType }{@code >}
-	 * 
-	 */
-	@XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "Transform")
-	public JAXBElement<TransformType> createTransform(TransformType value) {
-		return new JAXBElement<TransformType>(_Transform_QNAME, TransformType.class, null, value);
-	}
-
-	/**
-	 * Create an instance of {@link JAXBElement }{@code <}{@link X509DataType }{@code >}
-	 * 
-	 */
-	@XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "X509Data")
-	public JAXBElement<X509DataType> createX509Data(X509DataType value) {
-		return new JAXBElement<X509DataType>(_X509Data_QNAME, X509DataType.class, null, value);
-	}
-
-	/**
-	 * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}
-	 * 
-	 */
-	@XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "DigestValue")
-	public JAXBElement<byte[]> createDigestValue(byte[] value) {
-		return new JAXBElement<byte[]>(_DigestValue_QNAME, byte[].class, null, ((byte[]) value));
-	}
-
-	/**
-	 * Create an instance of {@link JAXBElement }{@code <}{@link SignaturePropertiesType }{@code >}
-	 * 
-	 */
-	@XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SignatureProperties")
-	public JAXBElement<SignaturePropertiesType> createSignatureProperties(SignaturePropertiesType value) {
-		return new JAXBElement<SignaturePropertiesType>(_SignatureProperties_QNAME, SignaturePropertiesType.class, null, value);
-	}
-
-	/**
-	 * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}
-	 * 
-	 */
-	@XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "KeyName")
-	public JAXBElement<String> createKeyName(String value) {
-		return new JAXBElement<String>(_KeyName_QNAME, String.class, null, value);
-	}
-
-	/**
-	 * Create an instance of {@link JAXBElement }{@code <}{@link KeyValueType }{@code >}
-	 * 
-	 */
-	@XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "KeyValue")
-	public JAXBElement<KeyValueType> createKeyValue(KeyValueType value) {
-		return new JAXBElement<KeyValueType>(_KeyValue_QNAME, KeyValueType.class, null, value);
-	}
-
-	/**
-	 * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}
-	 * 
-	 */
-	@XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SPKISexp", scope = SPKIDataType.class)
-	public JAXBElement<byte[]> createSPKIDataTypeSPKISexp(byte[] value) {
-		return new JAXBElement<byte[]>(_SPKIDataTypeSPKISexp_QNAME, byte[].class, SPKIDataType.class, ((byte[]) value));
-	}
-
-	/**
-	 * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}
-	 * 
-	 */
-	@XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "PGPKeyID", scope = PGPDataType.class)
-	public JAXBElement<byte[]> createPGPDataTypePGPKeyID(byte[] value) {
-		return new JAXBElement<byte[]>(_PGPDataTypePGPKeyID_QNAME, byte[].class, PGPDataType.class, ((byte[]) value));
-	}
-
-	/**
-	 * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}
-	 * 
-	 */
-	@XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "PGPKeyPacket", scope = PGPDataType.class)
-	public JAXBElement<byte[]> createPGPDataTypePGPKeyPacket(byte[] value) {
-		return new JAXBElement<byte[]>(_PGPDataTypePGPKeyPacket_QNAME, byte[].class, PGPDataType.class, ((byte[]) value));
-	}
-
-	/**
-	 * Create an instance of {@link JAXBElement }{@code <}{@link X509IssuerSerialType }{@code >}
-	 * 
-	 */
-	@XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "X509IssuerSerial", scope = X509DataType.class)
-	public JAXBElement<X509IssuerSerialType> createX509DataTypeX509IssuerSerial(X509IssuerSerialType value) {
-		return new JAXBElement<X509IssuerSerialType>(_X509DataTypeX509IssuerSerial_QNAME, X509IssuerSerialType.class, X509DataType.class, value);
-	}
-
-	/**
-	 * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}
-	 * 
-	 */
-	@XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "X509Certificate", scope = X509DataType.class)
-	public JAXBElement<byte[]> createX509DataTypeX509Certificate(byte[] value) {
-		return new JAXBElement<byte[]>(_X509DataTypeX509Certificate_QNAME, byte[].class, X509DataType.class, ((byte[]) value));
-	}
-
-	/**
-	 * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}
-	 * 
-	 */
-	@XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "X509SKI", scope = X509DataType.class)
-	public JAXBElement<byte[]> createX509DataTypeX509SKI(byte[] value) {
-		return new JAXBElement<byte[]>(_X509DataTypeX509SKI_QNAME, byte[].class, X509DataType.class, ((byte[]) value));
-	}
-
-	/**
-	 * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}
-	 * 
-	 */
-	@XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "X509SubjectName", scope = X509DataType.class)
-	public JAXBElement<String> createX509DataTypeX509SubjectName(String value) {
-		return new JAXBElement<String>(_X509DataTypeX509SubjectName_QNAME, String.class, X509DataType.class, value);
-	}
-
-	/**
-	 * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}
-	 * 
-	 */
-	@XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "X509CRL", scope = X509DataType.class)
-	public JAXBElement<byte[]> createX509DataTypeX509CRL(byte[] value) {
-		return new JAXBElement<byte[]>(_X509DataTypeX509CRL_QNAME, byte[].class, X509DataType.class, ((byte[]) value));
-	}
-
-	/**
-	 * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}
-	 * 
-	 */
-	@XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "XPath", scope = TransformType.class)
-	public JAXBElement<String> createTransformTypeXPath(String value) {
-		return new JAXBElement<String>(_TransformTypeXPath_QNAME, String.class, TransformType.class, value);
-	}
-
-}
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/ObjectType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/ObjectType.java
deleted file mode 100644
index 8f8573ead..000000000
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/ObjectType.java
+++ /dev/null
@@ -1,156 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2014.04.12 at 12:22:50 PM GMT 
-//
-
-package eu.stork.peps.complex.attributes.org.w3._2000._09.xmldsig;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlID;
-import javax.xml.bind.annotation.XmlMixed;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.w3c.dom.Element;
-
-/**
- * <p>
- * Java class for ObjectType complex type.
- * 
- * <p>
- * The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="ObjectType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence maxOccurs="unbounded" minOccurs="0">
- *         &lt;any processContents='lax'/>
- *       &lt;/sequence>
- *       &lt;attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *       &lt;attribute name="MimeType" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="Encoding" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ObjectType", propOrder = { "content" })
-public class ObjectType {
-
-	@XmlMixed
-	@XmlAnyElement(lax = true)
-	protected List<Object> content;
-	@XmlAttribute(name = "Id")
-	@XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-	@XmlID
-	@XmlSchemaType(name = "ID")
-	protected String id;
-	@XmlAttribute(name = "MimeType")
-	protected String mimeType;
-	@XmlAttribute(name = "Encoding")
-	@XmlSchemaType(name = "anyURI")
-	protected String encoding;
-
-	/**
-	 * Gets the value of the content 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 content property.
-	 * 
-	 * <p>
-	 * For example, to add a new item, do as follows:
-	 * 
-	 * <pre>
-	 * getContent().add(newItem);
-	 * </pre>
-	 * 
-	 * 
-	 * <p>
-	 * Objects of the following type(s) are allowed in the list {@link Object } {@link Element } {@link String }
-	 * 
-	 * 
-	 */
-	public List<Object> getContent() {
-		if (content == null) {
-			content = new ArrayList<Object>();
-		}
-		return this.content;
-	}
-
-	/**
-	 * 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 mimeType property.
-	 * 
-	 * @return possible object is {@link String }
-	 * 
-	 */
-	public String getMimeType() {
-		return mimeType;
-	}
-
-	/**
-	 * Sets the value of the mimeType property.
-	 * 
-	 * @param value
-	 *            allowed object is {@link String }
-	 * 
-	 */
-	public void setMimeType(String value) {
-		this.mimeType = value;
-	}
-
-	/**
-	 * Gets the value of the encoding property.
-	 * 
-	 * @return possible object is {@link String }
-	 * 
-	 */
-	public String getEncoding() {
-		return encoding;
-	}
-
-	/**
-	 * Sets the value of the encoding property.
-	 * 
-	 * @param value
-	 *            allowed object is {@link String }
-	 * 
-	 */
-	public void setEncoding(String value) {
-		this.encoding = value;
-	}
-
-}
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/PGPDataType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/PGPDataType.java
deleted file mode 100644
index a43e2857c..000000000
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/PGPDataType.java
+++ /dev/null
@@ -1,93 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2014.04.12 at 12:22:50 PM GMT 
-//
-
-package eu.stork.peps.complex.attributes.org.w3._2000._09.xmldsig;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElementRef;
-import javax.xml.bind.annotation.XmlElementRefs;
-import javax.xml.bind.annotation.XmlType;
-import org.w3c.dom.Element;
-
-/**
- * <p>
- * Java class for PGPDataType complex type.
- * 
- * <p>
- * The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="PGPDataType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;choice>
- *         &lt;sequence>
- *           &lt;element name="PGPKeyID" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
- *           &lt;element name="PGPKeyPacket" type="{http://www.w3.org/2001/XMLSchema}base64Binary" minOccurs="0"/>
- *           &lt;any processContents='lax' namespace='##other' maxOccurs="unbounded" minOccurs="0"/>
- *         &lt;/sequence>
- *         &lt;sequence>
- *           &lt;element name="PGPKeyPacket" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
- *           &lt;any processContents='lax' namespace='##other' maxOccurs="unbounded" minOccurs="0"/>
- *         &lt;/sequence>
- *       &lt;/choice>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "PGPDataType", propOrder = { "content" })
-public class PGPDataType {
-
-	@XmlElementRefs({ @XmlElementRef(name = "PGPKeyPacket", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
-			@XmlElementRef(name = "PGPKeyID", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false) })
-	@XmlAnyElement(lax = true)
-	protected List<Object> content;
-
-	/**
-	 * Gets the rest of the content model.
-	 * 
-	 * <p>
-	 * You are getting this "catch-all" property because of the following reason: The field name "PGPKeyPacket" is used by two different parts of a schema. See: line 209 of
-	 * file:/C:/Source/LatestSource/webgate.ec.europa.eu/branches/IS_branch/Commons/src/main/resources/schema/xmldsig-core-schema.xsd line 204 of
-	 * file:/C:/Source/LatestSource/webgate.ec.europa.eu/branches/IS_branch/Commons/src/main/resources/schema/xmldsig-core-schema.xsd
-	 * <p>
-	 * To get rid of this property, apply a property customization to one of both of the following declarations to change their names: Gets the value of the content 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 content property.
-	 * 
-	 * <p>
-	 * For example, to add a new item, do as follows:
-	 * 
-	 * <pre>
-	 * getContent().add(newItem);
-	 * </pre>
-	 * 
-	 * 
-	 * <p>
-	 * Objects of the following type(s) are allowed in the list {@link Object } {@link JAXBElement }{@code <}{@link byte[]}{@code >} {@link Element } {@link JAXBElement }{@code <}{@link byte[]}{@code >}
-	 * 
-	 * 
-	 */
-	public List<Object> getContent() {
-		if (content == null) {
-			content = new ArrayList<Object>();
-		}
-		return this.content;
-	}
-
-}
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/RSAKeyValueType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/RSAKeyValueType.java
deleted file mode 100644
index eedb02899..000000000
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/RSAKeyValueType.java
+++ /dev/null
@@ -1,84 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// 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;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * <p>
- * Java class for RSAKeyValueType complex type.
- * 
- * <p>
- * The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="RSAKeyValueType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="Modulus" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary"/>
- *         &lt;element name="Exponent" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "RSAKeyValueType", propOrder = { "modulus", "exponent" })
-public class RSAKeyValueType {
-
-	@XmlElement(name = "Modulus", required = true)
-	protected byte[] modulus;
-	@XmlElement(name = "Exponent", required = true)
-	protected byte[] exponent;
-
-	/**
-	 * Gets the value of the modulus property.
-	 * 
-	 * @return possible object is byte[]
-	 */
-	public byte[] getModulus() {
-		return modulus;
-	}
-
-	/**
-	 * Sets the value of the modulus property.
-	 * 
-	 * @param value
-	 *            allowed object is byte[]
-	 */
-	public void setModulus(byte[] value) {
-		this.modulus = value;
-	}
-
-	/**
-	 * Gets the value of the exponent property.
-	 * 
-	 * @return possible object is byte[]
-	 */
-	public byte[] getExponent() {
-		return exponent;
-	}
-
-	/**
-	 * Sets the value of the exponent property.
-	 * 
-	 * @param value
-	 *            allowed object is byte[]
-	 */
-	public void setExponent(byte[] value) {
-		this.exponent = value;
-	}
-
-}
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
deleted file mode 100644
index 83f03f3c8..000000000
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/ReferenceType.java
+++ /dev/null
@@ -1,192 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// 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;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlID;
-import javax.xml.bind.annotation.XmlSchemaType;
-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>
- * The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="ReferenceType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}Transforms" minOccurs="0"/>
- *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}DigestMethod"/>
- *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}DigestValue"/>
- *       &lt;/sequence>
- *       &lt;attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *       &lt;attribute name="URI" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *       &lt;attribute name="Type" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@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;
-	}
-
-}
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/RetrievalMethodType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/RetrievalMethodType.java
deleted file mode 100644
index 6f1a94de5..000000000
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/RetrievalMethodType.java
+++ /dev/null
@@ -1,116 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// 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;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * <p>
- * Java class for RetrievalMethodType complex type.
- * 
- * <p>
- * The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="RetrievalMethodType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}Transforms" minOccurs="0"/>
- *       &lt;/sequence>
- *       &lt;attribute name="URI" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *       &lt;attribute name="Type" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "RetrievalMethodType", propOrder = { "transforms" })
-public class RetrievalMethodType {
-
-	@XmlElement(name = "Transforms")
-	protected TransformsType transforms;
-	@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 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;
-	}
-
-}
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/SPKIDataType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/SPKIDataType.java
deleted file mode 100644
index 5199fb0e2..000000000
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/SPKIDataType.java
+++ /dev/null
@@ -1,77 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2014.04.12 at 12:22:50 PM GMT 
-//
-
-package eu.stork.peps.complex.attributes.org.w3._2000._09.xmldsig;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElementRef;
-import javax.xml.bind.annotation.XmlType;
-import org.w3c.dom.Element;
-
-/**
- * <p>
- * Java class for SPKIDataType complex type.
- * 
- * <p>
- * The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="SPKIDataType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence maxOccurs="unbounded">
- *         &lt;element name="SPKISexp" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
- *         &lt;any processContents='lax' namespace='##other' minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "SPKIDataType", propOrder = { "spkiSexpAndAny" })
-public class SPKIDataType {
-
-	@XmlElementRef(name = "SPKISexp", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class)
-	@XmlAnyElement(lax = true)
-	protected List<Object> spkiSexpAndAny;
-
-	/**
-	 * Gets the value of the spkiSexpAndAny 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 spkiSexpAndAny property.
-	 * 
-	 * <p>
-	 * For example, to add a new item, do as follows:
-	 * 
-	 * <pre>
-	 * getSPKISexpAndAny().add(newItem);
-	 * </pre>
-	 * 
-	 * 
-	 * <p>
-	 * Objects of the following type(s) are allowed in the list {@link Element } {@link JAXBElement }{@code <}{@link byte[]}{@code >} {@link Object }
-	 * 
-	 * 
-	 */
-	public List<Object> getSPKISexpAndAny() {
-		if (spkiSexpAndAny == null) {
-			spkiSexpAndAny = new ArrayList<Object>();
-		}
-		return this.spkiSexpAndAny;
-	}
-
-}
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/SignatureMethodType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/SignatureMethodType.java
deleted file mode 100644
index 4f5658011..000000000
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/SignatureMethodType.java
+++ /dev/null
@@ -1,106 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2014.04.12 at 12:22:50 PM GMT 
-//
-
-package eu.stork.peps.complex.attributes.org.w3._2000._09.xmldsig;
-
-import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElementRef;
-import javax.xml.bind.annotation.XmlMixed;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * <p>
- * Java class for SignatureMethodType complex type.
- * 
- * <p>
- * The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="SignatureMethodType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="HMACOutputLength" type="{http://www.w3.org/2000/09/xmldsig#}HMACOutputLengthType" minOccurs="0"/>
- *         &lt;any namespace='##other' maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *       &lt;attribute name="Algorithm" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "SignatureMethodType", propOrder = { "content" })
-public class SignatureMethodType {
-
-	@XmlElementRef(name = "HMACOutputLength", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false)
-	@XmlMixed
-	@XmlAnyElement(lax = true)
-	protected List<Object> content;
-	@XmlAttribute(name = "Algorithm", required = true)
-	@XmlSchemaType(name = "anyURI")
-	protected String algorithm;
-
-	/**
-	 * Gets the value of the content 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 content property.
-	 * 
-	 * <p>
-	 * For example, to add a new item, do as follows:
-	 * 
-	 * <pre>
-	 * getContent().add(newItem);
-	 * </pre>
-	 * 
-	 * 
-	 * <p>
-	 * Objects of the following type(s) are allowed in the list {@link JAXBElement }{@code <}{@link BigInteger }{@code >} {@link Object } {@link String }
-	 * 
-	 * 
-	 */
-	public List<Object> getContent() {
-		if (content == null) {
-			content = new ArrayList<Object>();
-		}
-		return this.content;
-	}
-
-	/**
-	 * Gets the value of the algorithm property.
-	 * 
-	 * @return possible object is {@link String }
-	 * 
-	 */
-	public String getAlgorithm() {
-		return algorithm;
-	}
-
-	/**
-	 * Sets the value of the algorithm property.
-	 * 
-	 * @param value
-	 *            allowed object is {@link String }
-	 * 
-	 */
-	public void setAlgorithm(String value) {
-		this.algorithm = value;
-	}
-
-}
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/SignaturePropertiesType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/SignaturePropertiesType.java
deleted file mode 100644
index 481abd165..000000000
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/SignaturePropertiesType.java
+++ /dev/null
@@ -1,104 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2014.04.12 at 12:22:50 PM GMT 
-//
-
-package eu.stork.peps.complex.attributes.org.w3._2000._09.xmldsig;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlID;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
-/**
- * <p>
- * Java class for SignaturePropertiesType complex type.
- * 
- * <p>
- * The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="SignaturePropertiesType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}SignatureProperty" maxOccurs="unbounded"/>
- *       &lt;/sequence>
- *       &lt;attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "SignaturePropertiesType", propOrder = { "signatureProperty" })
-public class SignaturePropertiesType {
-
-	@XmlElement(name = "SignatureProperty", required = true)
-	protected List<SignaturePropertyType> signatureProperty;
-	@XmlAttribute(name = "Id")
-	@XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-	@XmlID
-	@XmlSchemaType(name = "ID")
-	protected String id;
-
-	/**
-	 * Gets the value of the signatureProperty 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 signatureProperty property.
-	 * 
-	 * <p>
-	 * For example, to add a new item, do as follows:
-	 * 
-	 * <pre>
-	 * getSignatureProperty().add(newItem);
-	 * </pre>
-	 * 
-	 * 
-	 * <p>
-	 * Objects of the following type(s) are allowed in the list {@link SignaturePropertyType }
-	 * 
-	 * 
-	 */
-	public List<SignaturePropertyType> getSignatureProperty() {
-		if (signatureProperty == null) {
-			signatureProperty = new ArrayList<SignaturePropertyType>();
-		}
-		return this.signatureProperty;
-	}
-
-	/**
-	 * 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;
-	}
-
-}
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/SignaturePropertyType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/SignaturePropertyType.java
deleted file mode 100644
index 027675315..000000000
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/SignaturePropertyType.java
+++ /dev/null
@@ -1,132 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2014.04.12 at 12:22:50 PM GMT 
-//
-
-package eu.stork.peps.complex.attributes.org.w3._2000._09.xmldsig;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlID;
-import javax.xml.bind.annotation.XmlMixed;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.w3c.dom.Element;
-
-/**
- * <p>
- * Java class for SignaturePropertyType complex type.
- * 
- * <p>
- * The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="SignaturePropertyType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;choice maxOccurs="unbounded">
- *         &lt;any processContents='lax' namespace='##other'/>
- *       &lt;/choice>
- *       &lt;attribute name="Target" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *       &lt;attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "SignaturePropertyType", propOrder = { "content" })
-public class SignaturePropertyType {
-
-	@XmlMixed
-	@XmlAnyElement(lax = true)
-	protected List<Object> content;
-	@XmlAttribute(name = "Target", required = true)
-	@XmlSchemaType(name = "anyURI")
-	protected String target;
-	@XmlAttribute(name = "Id")
-	@XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-	@XmlID
-	@XmlSchemaType(name = "ID")
-	protected String id;
-
-	/**
-	 * Gets the value of the content 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 content property.
-	 * 
-	 * <p>
-	 * For example, to add a new item, do as follows:
-	 * 
-	 * <pre>
-	 * getContent().add(newItem);
-	 * </pre>
-	 * 
-	 * 
-	 * <p>
-	 * Objects of the following type(s) are allowed in the list {@link Object } {@link Element } {@link String }
-	 * 
-	 * 
-	 */
-	public List<Object> getContent() {
-		if (content == null) {
-			content = new ArrayList<Object>();
-		}
-		return this.content;
-	}
-
-	/**
-	 * Gets the value of the target property.
-	 * 
-	 * @return possible object is {@link String }
-	 * 
-	 */
-	public String getTarget() {
-		return target;
-	}
-
-	/**
-	 * Sets the value of the target property.
-	 * 
-	 * @param value
-	 *            allowed object is {@link String }
-	 * 
-	 */
-	public void setTarget(String value) {
-		this.target = 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;
-	}
-
-}
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/SignatureType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/SignatureType.java
deleted file mode 100644
index 131cee1bc..000000000
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/SignatureType.java
+++ /dev/null
@@ -1,176 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2014.04.12 at 12:22:50 PM GMT 
-//
-
-package eu.stork.peps.complex.attributes.org.w3._2000._09.xmldsig;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlID;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
-/**
- * <p>
- * Java class for SignatureType complex type.
- * 
- * <p>
- * The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="SignatureType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}SignedInfo"/>
- *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}SignatureValue"/>
- *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}KeyInfo" minOccurs="0"/>
- *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}Object" maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *       &lt;attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "SignatureType", propOrder = { "signedInfo", "signatureValue", "keyInfo", "object" })
-public class SignatureType {
-
-	@XmlElement(name = "SignedInfo", required = true)
-	protected SignedInfoType signedInfo;
-	@XmlElement(name = "SignatureValue", required = true)
-	protected SignatureValueType signatureValue;
-	@XmlElement(name = "KeyInfo")
-	protected KeyInfoType keyInfo;
-	@XmlElement(name = "Object")
-	protected List<ObjectType> object;
-	@XmlAttribute(name = "Id")
-	@XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-	@XmlID
-	@XmlSchemaType(name = "ID")
-	protected String id;
-
-	/**
-	 * Gets the value of the signedInfo property.
-	 * 
-	 * @return possible object is {@link SignedInfoType }
-	 * 
-	 */
-	public SignedInfoType getSignedInfo() {
-		return signedInfo;
-	}
-
-	/**
-	 * Sets the value of the signedInfo property.
-	 * 
-	 * @param value
-	 *            allowed object is {@link SignedInfoType }
-	 * 
-	 */
-	public void setSignedInfo(SignedInfoType value) {
-		this.signedInfo = value;
-	}
-
-	/**
-	 * Gets the value of the signatureValue property.
-	 * 
-	 * @return possible object is {@link SignatureValueType }
-	 * 
-	 */
-	public SignatureValueType getSignatureValue() {
-		return signatureValue;
-	}
-
-	/**
-	 * Sets the value of the signatureValue property.
-	 * 
-	 * @param value
-	 *            allowed object is {@link SignatureValueType }
-	 * 
-	 */
-	public void setSignatureValue(SignatureValueType value) {
-		this.signatureValue = value;
-	}
-
-	/**
-	 * Gets the value of the keyInfo property.
-	 * 
-	 * @return possible object is {@link KeyInfoType }
-	 * 
-	 */
-	public KeyInfoType getKeyInfo() {
-		return keyInfo;
-	}
-
-	/**
-	 * Sets the value of the keyInfo property.
-	 * 
-	 * @param value
-	 *            allowed object is {@link KeyInfoType }
-	 * 
-	 */
-	public void setKeyInfo(KeyInfoType value) {
-		this.keyInfo = value;
-	}
-
-	/**
-	 * Gets the value of the object 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 object property.
-	 * 
-	 * <p>
-	 * For example, to add a new item, do as follows:
-	 * 
-	 * <pre>
-	 * getObject().add(newItem);
-	 * </pre>
-	 * 
-	 * 
-	 * <p>
-	 * Objects of the following type(s) are allowed in the list {@link ObjectType }
-	 * 
-	 * 
-	 */
-	public List<ObjectType> getObject() {
-		if (object == null) {
-			object = new ArrayList<ObjectType>();
-		}
-		return this.object;
-	}
-
-	/**
-	 * 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;
-	}
-
-}
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/SignatureValueType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/SignatureValueType.java
deleted file mode 100644
index af43e55cd..000000000
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/SignatureValueType.java
+++ /dev/null
@@ -1,91 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// 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;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlID;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.XmlValue;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
-/**
- * <p>
- * Java class for SignatureValueType complex type.
- * 
- * <p>
- * The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="SignatureValueType">
- *   &lt;simpleContent>
- *     &lt;extension base="&lt;http://www.w3.org/2001/XMLSchema>base64Binary">
- *       &lt;attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *     &lt;/extension>
- *   &lt;/simpleContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "SignatureValueType", propOrder = { "value" })
-public class SignatureValueType {
-
-	@XmlValue
-	protected byte[] value;
-	@XmlAttribute(name = "Id")
-	@XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-	@XmlID
-	@XmlSchemaType(name = "ID")
-	protected String id;
-
-	/**
-	 * Gets the value of the value property.
-	 * 
-	 * @return possible object is byte[]
-	 */
-	public byte[] getValue() {
-		return value;
-	}
-
-	/**
-	 * Sets the value of the value property.
-	 * 
-	 * @param value
-	 *            allowed object is byte[]
-	 */
-	public void setValue(byte[] value) {
-		this.value = 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;
-	}
-
-}
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/SignedInfoType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/SignedInfoType.java
deleted file mode 100644
index 2523af53c..000000000
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/SignedInfoType.java
+++ /dev/null
@@ -1,152 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2014.04.12 at 12:22:50 PM GMT 
-//
-
-package eu.stork.peps.complex.attributes.org.w3._2000._09.xmldsig;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlID;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
-/**
- * <p>
- * Java class for SignedInfoType complex type.
- * 
- * <p>
- * The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="SignedInfoType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}CanonicalizationMethod"/>
- *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}SignatureMethod"/>
- *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}Reference" maxOccurs="unbounded"/>
- *       &lt;/sequence>
- *       &lt;attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "SignedInfoType", propOrder = { "canonicalizationMethod", "signatureMethod", "reference" })
-public class SignedInfoType {
-
-	@XmlElement(name = "CanonicalizationMethod", required = true)
-	protected CanonicalizationMethodType canonicalizationMethod;
-	@XmlElement(name = "SignatureMethod", required = true)
-	protected SignatureMethodType signatureMethod;
-	@XmlElement(name = "Reference", required = true)
-	protected List<ReferenceType> reference;
-	@XmlAttribute(name = "Id")
-	@XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-	@XmlID
-	@XmlSchemaType(name = "ID")
-	protected String id;
-
-	/**
-	 * Gets the value of the canonicalizationMethod property.
-	 * 
-	 * @return possible object is {@link CanonicalizationMethodType }
-	 * 
-	 */
-	public CanonicalizationMethodType getCanonicalizationMethod() {
-		return canonicalizationMethod;
-	}
-
-	/**
-	 * Sets the value of the canonicalizationMethod property.
-	 * 
-	 * @param value
-	 *            allowed object is {@link CanonicalizationMethodType }
-	 * 
-	 */
-	public void setCanonicalizationMethod(CanonicalizationMethodType value) {
-		this.canonicalizationMethod = value;
-	}
-
-	/**
-	 * Gets the value of the signatureMethod property.
-	 * 
-	 * @return possible object is {@link SignatureMethodType }
-	 * 
-	 */
-	public SignatureMethodType getSignatureMethod() {
-		return signatureMethod;
-	}
-
-	/**
-	 * Sets the value of the signatureMethod property.
-	 * 
-	 * @param value
-	 *            allowed object is {@link SignatureMethodType }
-	 * 
-	 */
-	public void setSignatureMethod(SignatureMethodType value) {
-		this.signatureMethod = value;
-	}
-
-	/**
-	 * Gets the value of the reference 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 reference property.
-	 * 
-	 * <p>
-	 * For example, to add a new item, do as follows:
-	 * 
-	 * <pre>
-	 * getReference().add(newItem);
-	 * </pre>
-	 * 
-	 * 
-	 * <p>
-	 * Objects of the following type(s) are allowed in the list {@link ReferenceType }
-	 * 
-	 * 
-	 */
-	public List<ReferenceType> getReference() {
-		if (reference == null) {
-			reference = new ArrayList<ReferenceType>();
-		}
-		return this.reference;
-	}
-
-	/**
-	 * 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;
-	}
-
-}
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/TransformType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/TransformType.java
deleted file mode 100644
index f47dc1251..000000000
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/TransformType.java
+++ /dev/null
@@ -1,106 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2014.04.12 at 12:22:50 PM GMT 
-//
-
-package eu.stork.peps.complex.attributes.org.w3._2000._09.xmldsig;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElementRef;
-import javax.xml.bind.annotation.XmlMixed;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import org.w3c.dom.Element;
-
-/**
- * <p>
- * Java class for TransformType complex type.
- * 
- * <p>
- * The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="TransformType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;choice maxOccurs="unbounded" minOccurs="0">
- *         &lt;any processContents='lax' namespace='##other'/>
- *         &lt;element name="XPath" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *       &lt;/choice>
- *       &lt;attribute name="Algorithm" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "TransformType", propOrder = { "content" })
-public class TransformType {
-
-	@XmlElementRef(name = "XPath", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false)
-	@XmlMixed
-	@XmlAnyElement(lax = true)
-	protected List<Object> content;
-	@XmlAttribute(name = "Algorithm", required = true)
-	@XmlSchemaType(name = "anyURI")
-	protected String algorithm;
-
-	/**
-	 * Gets the value of the content 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 content property.
-	 * 
-	 * <p>
-	 * For example, to add a new item, do as follows:
-	 * 
-	 * <pre>
-	 * getContent().add(newItem);
-	 * </pre>
-	 * 
-	 * 
-	 * <p>
-	 * Objects of the following type(s) are allowed in the list {@link Object } {@link JAXBElement }{@code <}{@link String }{@code >} {@link Element } {@link String }
-	 * 
-	 * 
-	 */
-	public List<Object> getContent() {
-		if (content == null) {
-			content = new ArrayList<Object>();
-		}
-		return this.content;
-	}
-
-	/**
-	 * Gets the value of the algorithm property.
-	 * 
-	 * @return possible object is {@link String }
-	 * 
-	 */
-	public String getAlgorithm() {
-		return algorithm;
-	}
-
-	/**
-	 * Sets the value of the algorithm property.
-	 * 
-	 * @param value
-	 *            allowed object is {@link String }
-	 * 
-	 */
-	public void setAlgorithm(String value) {
-		this.algorithm = value;
-	}
-
-}
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/TransformsType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/TransformsType.java
deleted file mode 100644
index b31f36764..000000000
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/TransformsType.java
+++ /dev/null
@@ -1,72 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2014.04.12 at 12:22:50 PM GMT 
-//
-
-package eu.stork.peps.complex.attributes.org.w3._2000._09.xmldsig;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * <p>
- * Java class for TransformsType complex type.
- * 
- * <p>
- * The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="TransformsType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}Transform" maxOccurs="unbounded"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "TransformsType", propOrder = { "transform" })
-public class TransformsType {
-
-	@XmlElement(name = "Transform", required = true)
-	protected List<TransformType> transform;
-
-	/**
-	 * Gets the value of the transform 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 transform property.
-	 * 
-	 * <p>
-	 * For example, to add a new item, do as follows:
-	 * 
-	 * <pre>
-	 * getTransform().add(newItem);
-	 * </pre>
-	 * 
-	 * 
-	 * <p>
-	 * Objects of the following type(s) are allowed in the list {@link TransformType }
-	 * 
-	 * 
-	 */
-	public List<TransformType> getTransform() {
-		if (transform == null) {
-			transform = new ArrayList<TransformType>();
-		}
-		return this.transform;
-	}
-
-}
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/X509DataType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/X509DataType.java
deleted file mode 100644
index b6260d67d..000000000
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/X509DataType.java
+++ /dev/null
@@ -1,89 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2014.04.12 at 12:22:50 PM GMT 
-//
-
-package eu.stork.peps.complex.attributes.org.w3._2000._09.xmldsig;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElementRef;
-import javax.xml.bind.annotation.XmlElementRefs;
-import javax.xml.bind.annotation.XmlType;
-import org.w3c.dom.Element;
-
-/**
- * <p>
- * Java class for X509DataType complex type.
- * 
- * <p>
- * The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="X509DataType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence maxOccurs="unbounded">
- *         &lt;choice>
- *           &lt;element name="X509IssuerSerial" type="{http://www.w3.org/2000/09/xmldsig#}X509IssuerSerialType"/>
- *           &lt;element name="X509SKI" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
- *           &lt;element name="X509SubjectName" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *           &lt;element name="X509Certificate" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
- *           &lt;element name="X509CRL" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
- *           &lt;any processContents='lax' namespace='##other'/>
- *         &lt;/choice>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "X509DataType", propOrder = { "x509IssuerSerialOrX509SKIOrX509SubjectName" })
-public class X509DataType {
-
-	@XmlElementRefs({ @XmlElementRef(name = "X509SubjectName", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
-			@XmlElementRef(name = "X509Certificate", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
-			@XmlElementRef(name = "X509CRL", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
-			@XmlElementRef(name = "X509SKI", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
-			@XmlElementRef(name = "X509IssuerSerial", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false) })
-	@XmlAnyElement(lax = true)
-	protected List<Object> x509IssuerSerialOrX509SKIOrX509SubjectName;
-
-	/**
-	 * Gets the value of the x509IssuerSerialOrX509SKIOrX509SubjectName 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 x509IssuerSerialOrX509SKIOrX509SubjectName property.
-	 * 
-	 * <p>
-	 * For example, to add a new item, do as follows:
-	 * 
-	 * <pre>
-	 * getX509IssuerSerialOrX509SKIOrX509SubjectName().add(newItem);
-	 * </pre>
-	 * 
-	 * 
-	 * <p>
-	 * Objects of the following type(s) are allowed in the list {@link JAXBElement }{@code <}{@link byte[]}{@code >} {@link JAXBElement }{@code <}{@link byte[]}{@code >} {@link Object } {@link Element }
-	 * {@link JAXBElement }{@code <}{@link String }{@code >} {@link JAXBElement }{@code <}{@link X509IssuerSerialType }{@code >} {@link JAXBElement }{@code <}{@link byte[]}{@code >}
-	 * 
-	 * 
-	 */
-	public List<Object> getX509IssuerSerialOrX509SKIOrX509SubjectName() {
-		if (x509IssuerSerialOrX509SKIOrX509SubjectName == null) {
-			x509IssuerSerialOrX509SKIOrX509SubjectName = new ArrayList<Object>();
-		}
-		return this.x509IssuerSerialOrX509SKIOrX509SubjectName;
-	}
-
-}
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/X509IssuerSerialType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/X509IssuerSerialType.java
deleted file mode 100644
index 7da3185c8..000000000
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/X509IssuerSerialType.java
+++ /dev/null
@@ -1,89 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2014.04.12 at 12:22:50 PM GMT 
-//
-
-package eu.stork.peps.complex.attributes.org.w3._2000._09.xmldsig;
-
-import java.math.BigInteger;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * <p>
- * Java class for X509IssuerSerialType complex type.
- * 
- * <p>
- * The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="X509IssuerSerialType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="X509IssuerName" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         &lt;element name="X509SerialNumber" type="{http://www.w3.org/2001/XMLSchema}integer"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "X509IssuerSerialType", propOrder = { "x509IssuerName", "x509SerialNumber" })
-public class X509IssuerSerialType {
-
-	@XmlElement(name = "X509IssuerName", required = true)
-	protected String x509IssuerName;
-	@XmlElement(name = "X509SerialNumber", required = true)
-	protected BigInteger x509SerialNumber;
-
-	/**
-	 * Gets the value of the x509IssuerName property.
-	 * 
-	 * @return possible object is {@link String }
-	 * 
-	 */
-	public String getX509IssuerName() {
-		return x509IssuerName;
-	}
-
-	/**
-	 * Sets the value of the x509IssuerName property.
-	 * 
-	 * @param value
-	 *            allowed object is {@link String }
-	 * 
-	 */
-	public void setX509IssuerName(String value) {
-		this.x509IssuerName = value;
-	}
-
-	/**
-	 * Gets the value of the x509SerialNumber property.
-	 * 
-	 * @return possible object is {@link BigInteger }
-	 * 
-	 */
-	public BigInteger getX509SerialNumber() {
-		return x509SerialNumber;
-	}
-
-	/**
-	 * Sets the value of the x509SerialNumber property.
-	 * 
-	 * @param value
-	 *            allowed object is {@link BigInteger }
-	 * 
-	 */
-	public void setX509SerialNumber(BigInteger value) {
-		this.x509SerialNumber = value;
-	}
-
-}
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/package-info.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/package-info.java
deleted file mode 100644
index 52572b90c..000000000
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/package-info.java
+++ /dev/null
@@ -1,10 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2014.04.12 at 12:22:50 PM GMT 
-//
-
-@javax.xml.bind.annotation.XmlSchema(namespace = "http://www.w3.org/2000/09/xmldsig#", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
-package eu.stork.peps.complex.attributes.org.w3._2000._09.xmldsig;
-