Merge tlenz into HEAD

27 files changed, 170 insertions, 1100 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GetForeignIDServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GetForeignIDServlet.java
index d42cd85dc..553b8db9d 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GetForeignIDServlet.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GetForeignIDServlet.java
@@ -173,8 +173,8 @@ public class GetForeignIDServlet extends AuthServlet {
 	    	else {

 		    	IdentityLinkAssertionParser ilParser = new IdentityLinkAssertionParser(new ByteArrayInputStream(response.getIdentityLink()));

 		    	IdentityLink identitylink = ilParser.parseIdentityLink();

-		    	session.setIdentityLink(identitylink);

-	  	   	

+		    	session.setIdentityLink(identitylink);
+		    	

 		    	String samlArtifactBase64 = 

 		    		AuthenticationServer.getInstance().getForeignAuthenticationData(session);
 		    	
diff --git a/id/server/idserverlib/src/main/java/at/gv/util/wsdl/szrgw/SZRGWType.java b/id/server/idserverlib/src/main/java/at/gv/util/wsdl/szrgw/SZRGWType.java
index 98d2702ae..01ca437c9 100644
--- a/id/server/idserverlib/src/main/java/at/gv/util/wsdl/szrgw/SZRGWType.java
+++ b/id/server/idserverlib/src/main/java/at/gv/util/wsdl/szrgw/SZRGWType.java
@@ -24,7 +24,6 @@ import at.gv.util.xsd.srzgw.CreateIdentityLinkResponse;
     at.gv.util.xsd.persondata.ObjectFactory.class,
     at.gv.util.xsd.mis.ObjectFactory.class,
     at.gv.util.xsd.saml.assertion.ObjectFactory.class,
-    at.gv.util.xsd.stork.ObjectFactory.class,
     at.gv.util.xsd.xmldsig.ObjectFactory.class
 })
 public interface SZRGWType {
diff --git a/id/server/idserverlib/src/main/java/at/gv/util/xsd/persondata/AbstractPersonType.java b/id/server/idserverlib/src/main/java/at/gv/util/xsd/persondata/AbstractPersonType.java
index 6aa819e9a..f1731d369 100644
--- a/id/server/idserverlib/src/main/java/at/gv/util/xsd/persondata/AbstractPersonType.java
+++ b/id/server/idserverlib/src/main/java/at/gv/util/xsd/persondata/AbstractPersonType.java
@@ -120,14 +120,14 @@ public class AbstractPersonType {
      * <p>
      * Objects of the following type(s) are allowed in the list
      * {@link JAXBElement }{@code <}{@link AbstractSimpleIdentificationType }{@code >}
-     * {@link JAXBElement }{@code <}{@link ERJPZahl }{@code >}
+     * {@link JAXBElement }{@code <}{@link ZMRzahl }{@code >}
      * {@link JAXBElement }{@code <}{@link AbstractSimpleIdentificationType }{@code >}
      * {@link JAXBElement }{@code <}{@link AbstractSimpleIdentificationType }{@code >}
-     * {@link JAXBElement }{@code <}{@link Firmenbuchnummer }{@code >}
-     * {@link JAXBElement }{@code <}{@link ZMRzahl }{@code >}
      * {@link JAXBElement }{@code <}{@link AbstractSimpleIdentificationType }{@code >}
      * {@link JAXBElement }{@code <}{@link Vereinsnummer }{@code >}
+     * {@link JAXBElement }{@code <}{@link ERJPZahl }{@code >}
      * {@link JAXBElement }{@code <}{@link AbstractSimpleIdentificationType }{@code >}
+     * {@link JAXBElement }{@code <}{@link Firmenbuchnummer }{@code >}
      * 
      * 
      */
diff --git a/id/server/idserverlib/src/main/java/at/gv/util/xsd/persondata/CompactPersonDataType.java b/id/server/idserverlib/src/main/java/at/gv/util/xsd/persondata/CompactPersonDataType.java
index be924f09f..c3be618fb 100644
--- a/id/server/idserverlib/src/main/java/at/gv/util/xsd/persondata/CompactPersonDataType.java
+++ b/id/server/idserverlib/src/main/java/at/gv/util/xsd/persondata/CompactPersonDataType.java
@@ -75,11 +75,11 @@ public class CompactPersonDataType
      * 
      * @return
      *     possible object is
-     *     {@link JAXBElement }{@code <}{@link CorporateBodyType }{@code >}
-     *     {@link JAXBElement }{@code <}{@link CompactPhysicalPersonType }{@code >}
      *     {@link JAXBElement }{@code <}{@link AbstractPersonType }{@code >}
-     *     {@link JAXBElement }{@code <}{@link PhysicalPersonType }{@code >}
+     *     {@link JAXBElement }{@code <}{@link CompactPhysicalPersonType }{@code >}
      *     {@link JAXBElement }{@code <}{@link CompactCorporateBodyType }{@code >}
+     *     {@link JAXBElement }{@code <}{@link CorporateBodyType }{@code >}
+     *     {@link JAXBElement }{@code <}{@link PhysicalPersonType }{@code >}
      *     
      */
     public JAXBElement<? extends AbstractPersonType> getPerson() {
@@ -91,11 +91,11 @@ public class CompactPersonDataType
      * 
      * @param value
      *     allowed object is
-     *     {@link JAXBElement }{@code <}{@link CorporateBodyType }{@code >}
-     *     {@link JAXBElement }{@code <}{@link CompactPhysicalPersonType }{@code >}
      *     {@link JAXBElement }{@code <}{@link AbstractPersonType }{@code >}
-     *     {@link JAXBElement }{@code <}{@link PhysicalPersonType }{@code >}
+     *     {@link JAXBElement }{@code <}{@link CompactPhysicalPersonType }{@code >}
      *     {@link JAXBElement }{@code <}{@link CompactCorporateBodyType }{@code >}
+     *     {@link JAXBElement }{@code <}{@link CorporateBodyType }{@code >}
+     *     {@link JAXBElement }{@code <}{@link PhysicalPersonType }{@code >}
      *     
      */
     public void setPerson(JAXBElement<? extends AbstractPersonType> value) {
@@ -120,12 +120,12 @@ public class CompactPersonDataType
      * 
      * <p>
      * Objects of the following type(s) are allowed in the list
+     * {@link JAXBElement }{@code <}{@link TelephoneAddressType }{@code >}
+     * {@link JAXBElement }{@code <}{@link PostalAddressType }{@code >}
      * {@link JAXBElement }{@code <}{@link CompactPostalAddressType }{@code >}
      * {@link JAXBElement }{@code <}{@link AbstractAddressType }{@code >}
-     * {@link JAXBElement }{@code <}{@link PostalAddressType }{@code >}
-     * {@link JAXBElement }{@code <}{@link InternetAddressType }{@code >}
-     * {@link JAXBElement }{@code <}{@link TelephoneAddressType }{@code >}
      * {@link JAXBElement }{@code <}{@link TypedPostalAddressType }{@code >}
+     * {@link JAXBElement }{@code <}{@link InternetAddressType }{@code >}
      * 
      * 
      */
@@ -238,8 +238,8 @@ public class CompactPersonDataType
          * <p>
          * Objects of the following type(s) are allowed in the list
          * {@link String }
-         * {@link Object }
          * {@link Element }
+         * {@link Object }
          * 
          * 
          */
diff --git a/id/server/idserverlib/src/main/java/at/gv/util/xsd/persondata/NationalityType.java b/id/server/idserverlib/src/main/java/at/gv/util/xsd/persondata/NationalityType.java
index 1a623c653..03fac5ba4 100644
--- a/id/server/idserverlib/src/main/java/at/gv/util/xsd/persondata/NationalityType.java
+++ b/id/server/idserverlib/src/main/java/at/gv/util/xsd/persondata/NationalityType.java
@@ -52,10 +52,10 @@ import org.w3c.dom.Element;
 public class NationalityType {
 
     @XmlElementRefs({
-        @XmlElementRef(name = "CountryNameEN", namespace = "http://reference.e-government.gv.at/namespace/persondata/20020228#", type = JAXBElement.class),
         @XmlElementRef(name = "CountryNameDE", namespace = "http://reference.e-government.gv.at/namespace/persondata/20020228#", type = JAXBElement.class),
-        @XmlElementRef(name = "ISOCode3", namespace = "http://reference.e-government.gv.at/namespace/persondata/20020228#", type = JAXBElement.class),
-        @XmlElementRef(name = "CountryNameFR", namespace = "http://reference.e-government.gv.at/namespace/persondata/20020228#", type = JAXBElement.class)
+        @XmlElementRef(name = "CountryNameEN", namespace = "http://reference.e-government.gv.at/namespace/persondata/20020228#", type = JAXBElement.class),
+        @XmlElementRef(name = "CountryNameFR", namespace = "http://reference.e-government.gv.at/namespace/persondata/20020228#", type = JAXBElement.class),
+        @XmlElementRef(name = "ISOCode3", namespace = "http://reference.e-government.gv.at/namespace/persondata/20020228#", type = JAXBElement.class)
     })
     @XmlMixed
     @XmlAnyElement(lax = true)
@@ -79,11 +79,11 @@ public class NationalityType {
      * 
      * <p>
      * Objects of the following type(s) are allowed in the list
+     * {@link String }
      * {@link JAXBElement }{@code <}{@link String }{@code >}
      * {@link JAXBElement }{@code <}{@link String }{@code >}
-     * {@link Object }
-     * {@link String }
      * {@link JAXBElement }{@code <}{@link String }{@code >}
+     * {@link Object }
      * {@link Element }
      * {@link JAXBElement }{@code <}{@link String }{@code >}
      * 
diff --git a/id/server/idserverlib/src/main/java/at/gv/util/xsd/persondata/PersonDataType.java b/id/server/idserverlib/src/main/java/at/gv/util/xsd/persondata/PersonDataType.java
index 9c91028c9..7f6d75619 100644
--- a/id/server/idserverlib/src/main/java/at/gv/util/xsd/persondata/PersonDataType.java
+++ b/id/server/idserverlib/src/main/java/at/gv/util/xsd/persondata/PersonDataType.java
@@ -75,11 +75,11 @@ public class PersonDataType
      * 
      * @return
      *     possible object is
-     *     {@link JAXBElement }{@code <}{@link CorporateBodyType }{@code >}
-     *     {@link JAXBElement }{@code <}{@link CompactPhysicalPersonType }{@code >}
      *     {@link JAXBElement }{@code <}{@link AbstractPersonType }{@code >}
-     *     {@link JAXBElement }{@code <}{@link PhysicalPersonType }{@code >}
+     *     {@link JAXBElement }{@code <}{@link CompactPhysicalPersonType }{@code >}
      *     {@link JAXBElement }{@code <}{@link CompactCorporateBodyType }{@code >}
+     *     {@link JAXBElement }{@code <}{@link CorporateBodyType }{@code >}
+     *     {@link JAXBElement }{@code <}{@link PhysicalPersonType }{@code >}
      *     
      */
     public JAXBElement<? extends AbstractPersonType> getPerson() {
@@ -91,11 +91,11 @@ public class PersonDataType
      * 
      * @param value
      *     allowed object is
-     *     {@link JAXBElement }{@code <}{@link CorporateBodyType }{@code >}
-     *     {@link JAXBElement }{@code <}{@link CompactPhysicalPersonType }{@code >}
      *     {@link JAXBElement }{@code <}{@link AbstractPersonType }{@code >}
-     *     {@link JAXBElement }{@code <}{@link PhysicalPersonType }{@code >}
+     *     {@link JAXBElement }{@code <}{@link CompactPhysicalPersonType }{@code >}
      *     {@link JAXBElement }{@code <}{@link CompactCorporateBodyType }{@code >}
+     *     {@link JAXBElement }{@code <}{@link CorporateBodyType }{@code >}
+     *     {@link JAXBElement }{@code <}{@link PhysicalPersonType }{@code >}
      *     
      */
     public void setPerson(JAXBElement<? extends AbstractPersonType> value) {
@@ -120,12 +120,12 @@ public class PersonDataType
      * 
      * <p>
      * Objects of the following type(s) are allowed in the list
+     * {@link JAXBElement }{@code <}{@link TelephoneAddressType }{@code >}
+     * {@link JAXBElement }{@code <}{@link PostalAddressType }{@code >}
      * {@link JAXBElement }{@code <}{@link CompactPostalAddressType }{@code >}
      * {@link JAXBElement }{@code <}{@link AbstractAddressType }{@code >}
-     * {@link JAXBElement }{@code <}{@link PostalAddressType }{@code >}
-     * {@link JAXBElement }{@code <}{@link InternetAddressType }{@code >}
-     * {@link JAXBElement }{@code <}{@link TelephoneAddressType }{@code >}
      * {@link JAXBElement }{@code <}{@link TypedPostalAddressType }{@code >}
+     * {@link JAXBElement }{@code <}{@link InternetAddressType }{@code >}
      * 
      * 
      */
@@ -238,8 +238,8 @@ public class PersonDataType
          * <p>
          * Objects of the following type(s) are allowed in the list
          * {@link String }
-         * {@link Object }
          * {@link Element }
+         * {@link Object }
          * 
          * 
          */
diff --git a/id/server/idserverlib/src/main/java/at/gv/util/xsd/saml/assertion/AdviceType.java b/id/server/idserverlib/src/main/java/at/gv/util/xsd/saml/assertion/AdviceType.java
index a4af90342..ae10d4c1e 100644
--- a/id/server/idserverlib/src/main/java/at/gv/util/xsd/saml/assertion/AdviceType.java
+++ b/id/server/idserverlib/src/main/java/at/gv/util/xsd/saml/assertion/AdviceType.java
@@ -41,8 +41,8 @@ import org.w3c.dom.Element;
 public class AdviceType {
 
     @XmlElementRefs({
-        @XmlElementRef(name = "AssertionIDReference", namespace = "urn:oasis:names:tc:SAML:1.0:assertion", type = JAXBElement.class, required = false),
-        @XmlElementRef(name = "Assertion", namespace = "urn:oasis:names:tc:SAML:1.0:assertion", type = JAXBElement.class, required = false)
+        @XmlElementRef(name = "Assertion", namespace = "urn:oasis:names:tc:SAML:1.0:assertion", type = JAXBElement.class, required = false),
+        @XmlElementRef(name = "AssertionIDReference", namespace = "urn:oasis:names:tc:SAML:1.0:assertion", type = JAXBElement.class, required = false)
     })
     @XmlAnyElement(lax = true)
     protected List<Object> assertionIDReferenceOrAssertionOrAny;
@@ -66,8 +66,8 @@ public class AdviceType {
      * <p>
      * Objects of the following type(s) are allowed in the list
      * {@link JAXBElement }{@code <}{@link String }{@code >}
-     * {@link Object }
      * {@link JAXBElement }{@code <}{@link AssertionType }{@code >}
+     * {@link Object }
      * {@link Element }
      * 
      * 
diff --git a/id/server/idserverlib/src/main/java/at/gv/util/xsd/saml/assertion/SubjectType.java b/id/server/idserverlib/src/main/java/at/gv/util/xsd/saml/assertion/SubjectType.java
index 6845e807a..1a24a2c13 100644
--- a/id/server/idserverlib/src/main/java/at/gv/util/xsd/saml/assertion/SubjectType.java
+++ b/id/server/idserverlib/src/main/java/at/gv/util/xsd/saml/assertion/SubjectType.java
@@ -41,8 +41,8 @@ import javax.xml.bind.annotation.XmlType;
 public class SubjectType {
 
     @XmlElementRefs({
-        @XmlElementRef(name = "NameIdentifier", namespace = "urn:oasis:names:tc:SAML:1.0:assertion", type = JAXBElement.class, required = false),
-        @XmlElementRef(name = "SubjectConfirmation", namespace = "urn:oasis:names:tc:SAML:1.0:assertion", type = JAXBElement.class, required = false)
+        @XmlElementRef(name = "SubjectConfirmation", namespace = "urn:oasis:names:tc:SAML:1.0:assertion", type = JAXBElement.class, required = false),
+        @XmlElementRef(name = "NameIdentifier", namespace = "urn:oasis:names:tc:SAML:1.0:assertion", type = JAXBElement.class, required = false)
     })
     protected List<JAXBElement<?>> content;
 
@@ -74,8 +74,8 @@ public class SubjectType {
      * 
      * <p>
      * Objects of the following type(s) are allowed in the list
-     * {@link JAXBElement }{@code <}{@link NameIdentifierType }{@code >}
      * {@link JAXBElement }{@code <}{@link SubjectConfirmationType }{@code >}
+     * {@link JAXBElement }{@code <}{@link NameIdentifierType }{@code >}
      * 
      * 
      */
diff --git a/id/server/idserverlib/src/main/java/at/gv/util/xsd/srzgw/CreateIdentityLinkRequest.java b/id/server/idserverlib/src/main/java/at/gv/util/xsd/srzgw/CreateIdentityLinkRequest.java
index 0c1f8282e..73468123b 100644
--- a/id/server/idserverlib/src/main/java/at/gv/util/xsd/srzgw/CreateIdentityLinkRequest.java
+++ b/id/server/idserverlib/src/main/java/at/gv/util/xsd/srzgw/CreateIdentityLinkRequest.java
@@ -6,8 +6,6 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
-import at.gv.util.xsd.stork.MandateContent;
-import at.gv.util.xsd.stork.RepresentationPerson;
 
 
 /**
@@ -29,9 +27,11 @@ import at.gv.util.xsd.stork.RepresentationPerson;
  *                   &lt;element name="Firstname" type="{http://www.w3.org/2001/XMLSchema}string"/>
  *                   &lt;element name="Familyname" type="{http://www.w3.org/2001/XMLSchema}string"/>
  *                   &lt;element name="DateOfBirth" type="{http://reference.e-government.gv.at/namespace/szrgw/20070807/xsd}DateOfBirthType"/>
- *                   &lt;element name="Representative" type="{urn:eu:stork:names:tc:PEPS:1.0:assertion}representationPerson" minOccurs="0"/>
- *                   &lt;element name="Represented" type="{urn:eu:stork:names:tc:PEPS:1.0:assertion}representationPerson" minOccurs="0"/>
- *                   &lt;element name="MandateContent" type="{urn:eu:stork:names:tc:PEPS:1.0:assertion}mandateContent" minOccurs="0"/>
+ *                   &lt;element name="LegalPersonTranslatableType" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *                   &lt;element name="LegalPersonCanonicalRegisteredAddress" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *                   &lt;element name="Representative" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *                   &lt;element name="Represented" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *                   &lt;element name="MandateContent" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
  *                 &lt;/sequence>
  *               &lt;/restriction>
  *             &lt;/complexContent>
@@ -148,9 +148,11 @@ public class CreateIdentityLinkRequest {
      *         &lt;element name="Firstname" type="{http://www.w3.org/2001/XMLSchema}string"/>
      *         &lt;element name="Familyname" type="{http://www.w3.org/2001/XMLSchema}string"/>
      *         &lt;element name="DateOfBirth" type="{http://reference.e-government.gv.at/namespace/szrgw/20070807/xsd}DateOfBirthType"/>
-     *         &lt;element name="Representative" type="{urn:eu:stork:names:tc:PEPS:1.0:assertion}representationPerson" minOccurs="0"/>
-     *         &lt;element name="Represented" type="{urn:eu:stork:names:tc:PEPS:1.0:assertion}representationPerson" minOccurs="0"/>
-     *         &lt;element name="MandateContent" type="{urn:eu:stork:names:tc:PEPS:1.0:assertion}mandateContent" minOccurs="0"/>
+     *         &lt;element name="LegalPersonTranslatableType" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+     *         &lt;element name="LegalPersonCanonicalRegisteredAddress" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+     *         &lt;element name="Representative" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+     *         &lt;element name="Represented" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+     *         &lt;element name="MandateContent" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
      *       &lt;/sequence>
      *     &lt;/restriction>
      *   &lt;/complexContent>
@@ -165,6 +167,8 @@ public class CreateIdentityLinkRequest {
         "firstname",
         "familyname",
         "dateOfBirth",
+        "legalPersonTranslatableType",
+        "legalPersonCanonicalRegisteredAddress",
         "representative",
         "represented",
         "mandateContent"
@@ -179,12 +183,16 @@ public class CreateIdentityLinkRequest {
         protected String familyname;
         @XmlElement(name = "DateOfBirth", required = true)
         protected String dateOfBirth;
+        @XmlElement(name = "LegalPersonTranslatableType")
+        protected String legalPersonTranslatableType;
+        @XmlElement(name = "LegalPersonCanonicalRegisteredAddress")
+        protected String legalPersonCanonicalRegisteredAddress;
         @XmlElement(name = "Representative")
-        protected RepresentationPerson representative;
+        protected String representative;
         @XmlElement(name = "Represented")
-        protected RepresentationPerson represented;
+        protected String represented;
         @XmlElement(name = "MandateContent")
-        protected MandateContent mandateContent;
+        protected String mandateContent;
 
         /**
          * Gets the value of the identifier property.
@@ -283,14 +291,62 @@ public class CreateIdentityLinkRequest {
         }
 
         /**
+         * Gets the value of the legalPersonTranslatableType property.
+         * 
+         * @return
+         *     possible object is
+         *     {@link String }
+         *     
+         */
+        public String getLegalPersonTranslatableType() {
+            return legalPersonTranslatableType;
+        }
+
+        /**
+         * Sets the value of the legalPersonTranslatableType property.
+         * 
+         * @param value
+         *     allowed object is
+         *     {@link String }
+         *     
+         */
+        public void setLegalPersonTranslatableType(String value) {
+            this.legalPersonTranslatableType = value;
+        }
+
+        /**
+         * Gets the value of the legalPersonCanonicalRegisteredAddress property.
+         * 
+         * @return
+         *     possible object is
+         *     {@link String }
+         *     
+         */
+        public String getLegalPersonCanonicalRegisteredAddress() {
+            return legalPersonCanonicalRegisteredAddress;
+        }
+
+        /**
+         * Sets the value of the legalPersonCanonicalRegisteredAddress property.
+         * 
+         * @param value
+         *     allowed object is
+         *     {@link String }
+         *     
+         */
+        public void setLegalPersonCanonicalRegisteredAddress(String value) {
+            this.legalPersonCanonicalRegisteredAddress = value;
+        }
+
+        /**
          * Gets the value of the representative property.
          * 
          * @return
          *     possible object is
-         *     {@link RepresentationPerson }
+         *     {@link String }
          *     
          */
-        public RepresentationPerson getRepresentative() {
+        public String getRepresentative() {
             return representative;
         }
 
@@ -299,10 +355,10 @@ public class CreateIdentityLinkRequest {
          * 
          * @param value
          *     allowed object is
-         *     {@link RepresentationPerson }
+         *     {@link String }
          *     
          */
-        public void setRepresentative(RepresentationPerson value) {
+        public void setRepresentative(String value) {
             this.representative = value;
         }
 
@@ -311,10 +367,10 @@ public class CreateIdentityLinkRequest {
          * 
          * @return
          *     possible object is
-         *     {@link RepresentationPerson }
+         *     {@link String }
          *     
          */
-        public RepresentationPerson getRepresented() {
+        public String getRepresented() {
             return represented;
         }
 
@@ -323,10 +379,10 @@ public class CreateIdentityLinkRequest {
          * 
          * @param value
          *     allowed object is
-         *     {@link RepresentationPerson }
+         *     {@link String }
          *     
          */
-        public void setRepresented(RepresentationPerson value) {
+        public void setRepresented(String value) {
             this.represented = value;
         }
 
@@ -335,10 +391,10 @@ public class CreateIdentityLinkRequest {
          * 
          * @return
          *     possible object is
-         *     {@link MandateContent }
+         *     {@link String }
          *     
          */
-        public MandateContent getMandateContent() {
+        public String getMandateContent() {
             return mandateContent;
         }
 
@@ -347,10 +403,10 @@ public class CreateIdentityLinkRequest {
          * 
          * @param value
          *     allowed object is
-         *     {@link MandateContent }
+         *     {@link String }
          *     
          */
-        public void setMandateContent(MandateContent value) {
+        public void setMandateContent(String value) {
             this.mandateContent = value;
         }
 
diff --git a/id/server/idserverlib/src/main/java/at/gv/util/xsd/stork/CanonicalAddressType.java b/id/server/idserverlib/src/main/java/at/gv/util/xsd/stork/CanonicalAddressType.java
deleted file mode 100644
index 23d89ffea..000000000
--- a/id/server/idserverlib/src/main/java/at/gv/util/xsd/stork/CanonicalAddressType.java
+++ /dev/null
@@ -1,255 +0,0 @@
-
-package at.gv.util.xsd.stork;
-
-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 canonicalAddressType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="canonicalAddressType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element ref="{urn:eu:stork:names:tc:PEPS:1.0:assertion}countryCodeAddress"/>
- *         &lt;element name="state" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         &lt;element name="municipalityCode" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         &lt;element name="town" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         &lt;element name="postalCode" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         &lt;element name="streetName" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         &lt;element name="streetNumber" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         &lt;element name="apartmentNumber" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "canonicalAddressType", propOrder = {
-    "countryCodeAddress",
-    "state",
-    "municipalityCode",
-    "town",
-    "postalCode",
-    "streetName",
-    "streetNumber",
-    "apartmentNumber"
-})
-public class CanonicalAddressType {
-
-    @XmlElement(required = true)
-    protected String countryCodeAddress;
-    @XmlElement(required = true)
-    protected String state;
-    protected String municipalityCode;
-    @XmlElement(required = true)
-    protected String town;
-    @XmlElement(required = true)
-    protected String postalCode;
-    @XmlElement(required = true)
-    protected String streetName;
-    protected String streetNumber;
-    protected String apartmentNumber;
-
-    /**
-     * Gets the value of the countryCodeAddress property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getCountryCodeAddress() {
-        return countryCodeAddress;
-    }
-
-    /**
-     * Sets the value of the countryCodeAddress property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setCountryCodeAddress(String value) {
-        this.countryCodeAddress = value;
-    }
-
-    /**
-     * Gets the value of the state property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getState() {
-        return state;
-    }
-
-    /**
-     * Sets the value of the state property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setState(String value) {
-        this.state = value;
-    }
-
-    /**
-     * Gets the value of the municipalityCode property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getMunicipalityCode() {
-        return municipalityCode;
-    }
-
-    /**
-     * Sets the value of the municipalityCode property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setMunicipalityCode(String value) {
-        this.municipalityCode = value;
-    }
-
-    /**
-     * Gets the value of the town property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getTown() {
-        return town;
-    }
-
-    /**
-     * Sets the value of the town property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setTown(String value) {
-        this.town = value;
-    }
-
-    /**
-     * Gets the value of the postalCode property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getPostalCode() {
-        return postalCode;
-    }
-
-    /**
-     * Sets the value of the postalCode property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setPostalCode(String value) {
-        this.postalCode = value;
-    }
-
-    /**
-     * Gets the value of the streetName property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getStreetName() {
-        return streetName;
-    }
-
-    /**
-     * Sets the value of the streetName property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setStreetName(String value) {
-        this.streetName = value;
-    }
-
-    /**
-     * Gets the value of the streetNumber property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getStreetNumber() {
-        return streetNumber;
-    }
-
-    /**
-     * Sets the value of the streetNumber property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setStreetNumber(String value) {
-        this.streetNumber = value;
-    }
-
-    /**
-     * Gets the value of the apartmentNumber property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getApartmentNumber() {
-        return apartmentNumber;
-    }
-
-    /**
-     * Sets the value of the apartmentNumber property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setApartmentNumber(String value) {
-        this.apartmentNumber = value;
-    }
-
-}
diff --git a/id/server/idserverlib/src/main/java/at/gv/util/xsd/stork/JurPerson.java b/id/server/idserverlib/src/main/java/at/gv/util/xsd/stork/JurPerson.java
deleted file mode 100644
index 57f2eef51..000000000
--- a/id/server/idserverlib/src/main/java/at/gv/util/xsd/stork/JurPerson.java
+++ /dev/null
@@ -1,201 +0,0 @@
-
-package at.gv.util.xsd.stork;
-
-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 jurPerson complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="jurPerson">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="eLPIdentifier" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         &lt;element name="legalName" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         &lt;element name="canonicalRegisteredAddress" type="{urn:eu:stork:names:tc:PEPS:1.0:assertion}canonicalAddressType"/>
- *         &lt;element name="type" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         &lt;element name="translatableType" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         &lt;element name="LPfiscalNumber" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "jurPerson", propOrder = {
-    "elpIdentifier",
-    "legalName",
-    "canonicalRegisteredAddress",
-    "type",
-    "translatableType",
-    "lPfiscalNumber"
-})
-public class JurPerson {
-
-    @XmlElement(name = "eLPIdentifier", required = true)
-    protected String elpIdentifier;
-    @XmlElement(required = true)
-    protected String legalName;
-    @XmlElement(required = true)
-    protected CanonicalAddressType canonicalRegisteredAddress;
-    protected String type;
-    @XmlElement(required = true)
-    protected String translatableType;
-    @XmlElement(name = "LPfiscalNumber")
-    protected String lPfiscalNumber;
-
-    /**
-     * Gets the value of the elpIdentifier property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getELPIdentifier() {
-        return elpIdentifier;
-    }
-
-    /**
-     * Sets the value of the elpIdentifier property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setELPIdentifier(String value) {
-        this.elpIdentifier = value;
-    }
-
-    /**
-     * Gets the value of the legalName property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getLegalName() {
-        return legalName;
-    }
-
-    /**
-     * Sets the value of the legalName property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setLegalName(String value) {
-        this.legalName = value;
-    }
-
-    /**
-     * Gets the value of the canonicalRegisteredAddress property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link CanonicalAddressType }
-     *     
-     */
-    public CanonicalAddressType getCanonicalRegisteredAddress() {
-        return canonicalRegisteredAddress;
-    }
-
-    /**
-     * Sets the value of the canonicalRegisteredAddress property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link CanonicalAddressType }
-     *     
-     */
-    public void setCanonicalRegisteredAddress(CanonicalAddressType value) {
-        this.canonicalRegisteredAddress = 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;
-    }
-
-    /**
-     * Gets the value of the translatableType property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getTranslatableType() {
-        return translatableType;
-    }
-
-    /**
-     * Sets the value of the translatableType property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setTranslatableType(String value) {
-        this.translatableType = value;
-    }
-
-    /**
-     * Gets the value of the lPfiscalNumber property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getLPfiscalNumber() {
-        return lPfiscalNumber;
-    }
-
-    /**
-     * Sets the value of the lPfiscalNumber property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setLPfiscalNumber(String value) {
-        this.lPfiscalNumber = value;
-    }
-
-}
diff --git a/id/server/idserverlib/src/main/java/at/gv/util/xsd/stork/MandateContent.java b/id/server/idserverlib/src/main/java/at/gv/util/xsd/stork/MandateContent.java
deleted file mode 100644
index c0eae22a2..000000000
--- a/id/server/idserverlib/src/main/java/at/gv/util/xsd/stork/MandateContent.java
+++ /dev/null
@@ -1,175 +0,0 @@
-
-package at.gv.util.xsd.stork;
-
-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.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.datatype.XMLGregorianCalendar;
-
-
-/**
- * <p>Java class for mandateContent complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="mandateContent">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="validFrom" type="{http://www.w3.org/2001/XMLSchema}date" minOccurs="0"/>
- *         &lt;element name="validTo" type="{http://www.w3.org/2001/XMLSchema}date" minOccurs="0"/>
- *         &lt;element name="isJoint" type="{http://www.w3.org/2001/XMLSchema}integer" minOccurs="0"/>
- *         &lt;element name="isChained" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
- *         &lt;element name="typePower" type="{http://www.w3.org/2001/XMLSchema}integer"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "mandateContent", propOrder = {
-    "validFrom",
-    "validTo",
-    "isJoint",
-    "isChained",
-    "typePower"
-})
-public class MandateContent {
-
-    @XmlSchemaType(name = "date")
-    protected XMLGregorianCalendar validFrom;
-    @XmlSchemaType(name = "date")
-    protected XMLGregorianCalendar validTo;
-    protected BigInteger isJoint;
-    protected Boolean isChained;
-    @XmlElement(required = true)
-    protected BigInteger typePower;
-
-    /**
-     * Gets the value of the validFrom property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public XMLGregorianCalendar getValidFrom() {
-        return validFrom;
-    }
-
-    /**
-     * Sets the value of the validFrom property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public void setValidFrom(XMLGregorianCalendar value) {
-        this.validFrom = value;
-    }
-
-    /**
-     * Gets the value of the validTo property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public XMLGregorianCalendar getValidTo() {
-        return validTo;
-    }
-
-    /**
-     * Sets the value of the validTo property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public void setValidTo(XMLGregorianCalendar value) {
-        this.validTo = value;
-    }
-
-    /**
-     * Gets the value of the isJoint property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BigInteger }
-     *     
-     */
-    public BigInteger getIsJoint() {
-        return isJoint;
-    }
-
-    /**
-     * Sets the value of the isJoint property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BigInteger }
-     *     
-     */
-    public void setIsJoint(BigInteger value) {
-        this.isJoint = value;
-    }
-
-    /**
-     * Gets the value of the isChained property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Boolean }
-     *     
-     */
-    public Boolean isIsChained() {
-        return isChained;
-    }
-
-    /**
-     * Sets the value of the isChained property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Boolean }
-     *     
-     */
-    public void setIsChained(Boolean value) {
-        this.isChained = value;
-    }
-
-    /**
-     * Gets the value of the typePower property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BigInteger }
-     *     
-     */
-    public BigInteger getTypePower() {
-        return typePower;
-    }
-
-    /**
-     * Sets the value of the typePower property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BigInteger }
-     *     
-     */
-    public void setTypePower(BigInteger value) {
-        this.typePower = value;
-    }
-
-}
diff --git a/id/server/idserverlib/src/main/java/at/gv/util/xsd/stork/NatPerson.java b/id/server/idserverlib/src/main/java/at/gv/util/xsd/stork/NatPerson.java
deleted file mode 100644
index 1bc255409..000000000
--- a/id/server/idserverlib/src/main/java/at/gv/util/xsd/stork/NatPerson.java
+++ /dev/null
@@ -1,176 +0,0 @@
-
-package at.gv.util.xsd.stork;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.datatype.XMLGregorianCalendar;
-
-
-/**
- * <p>Java class for natPerson complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="natPerson">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="eIdentifier" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         &lt;element name="givenName" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         &lt;element name="surname" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         &lt;element name="dateOfBirth" type="{http://www.w3.org/2001/XMLSchema}date"/>
- *         &lt;element name="fiscalNumber" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "natPerson", propOrder = {
-    "eIdentifier",
-    "givenName",
-    "surname",
-    "dateOfBirth",
-    "fiscalNumber"
-})
-public class NatPerson {
-
-    @XmlElement(required = true)
-    protected String eIdentifier;
-    @XmlElement(required = true)
-    protected String givenName;
-    @XmlElement(required = true)
-    protected String surname;
-    @XmlElement(required = true)
-    @XmlSchemaType(name = "date")
-    protected XMLGregorianCalendar dateOfBirth;
-    protected String fiscalNumber;
-
-    /**
-     * Gets the value of the eIdentifier property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getEIdentifier() {
-        return eIdentifier;
-    }
-
-    /**
-     * Sets the value of the eIdentifier property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setEIdentifier(String value) {
-        this.eIdentifier = value;
-    }
-
-    /**
-     * Gets the value of the givenName property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getGivenName() {
-        return givenName;
-    }
-
-    /**
-     * Sets the value of the givenName property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setGivenName(String value) {
-        this.givenName = value;
-    }
-
-    /**
-     * Gets the value of the surname property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getSurname() {
-        return surname;
-    }
-
-    /**
-     * Sets the value of the surname property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setSurname(String value) {
-        this.surname = value;
-    }
-
-    /**
-     * Gets the value of the dateOfBirth property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public XMLGregorianCalendar getDateOfBirth() {
-        return dateOfBirth;
-    }
-
-    /**
-     * Sets the value of the dateOfBirth property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public void setDateOfBirth(XMLGregorianCalendar value) {
-        this.dateOfBirth = value;
-    }
-
-    /**
-     * Gets the value of the fiscalNumber property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getFiscalNumber() {
-        return fiscalNumber;
-    }
-
-    /**
-     * Sets the value of the fiscalNumber property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setFiscalNumber(String value) {
-        this.fiscalNumber = value;
-    }
-
-}
diff --git a/id/server/idserverlib/src/main/java/at/gv/util/xsd/stork/ObjectFactory.java b/id/server/idserverlib/src/main/java/at/gv/util/xsd/stork/ObjectFactory.java
deleted file mode 100644
index a301f8919..000000000
--- a/id/server/idserverlib/src/main/java/at/gv/util/xsd/stork/ObjectFactory.java
+++ /dev/null
@@ -1,85 +0,0 @@
-
-package at.gv.util.xsd.stork;
-
-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 at.gv.util.xsd.stork 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 _CountryCodeAddress_QNAME = new QName("urn:eu:stork:names:tc:PEPS:1.0:assertion", "countryCodeAddress");
-
-    /**
-     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: at.gv.util.xsd.stork
-     * 
-     */
-    public ObjectFactory() {
-    }
-
-    /**
-     * Create an instance of {@link RepresentationPerson }
-     * 
-     */
-    public RepresentationPerson createRepresentationPerson() {
-        return new RepresentationPerson();
-    }
-
-    /**
-     * Create an instance of {@link MandateContent }
-     * 
-     */
-    public MandateContent createMandateContent() {
-        return new MandateContent();
-    }
-
-    /**
-     * Create an instance of {@link NatPerson }
-     * 
-     */
-    public NatPerson createNatPerson() {
-        return new NatPerson();
-    }
-
-    /**
-     * Create an instance of {@link CanonicalAddressType }
-     * 
-     */
-    public CanonicalAddressType createCanonicalAddressType() {
-        return new CanonicalAddressType();
-    }
-
-    /**
-     * Create an instance of {@link JurPerson }
-     * 
-     */
-    public JurPerson createJurPerson() {
-        return new JurPerson();
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:eu:stork:names:tc:PEPS:1.0:assertion", name = "countryCodeAddress")
-    public JAXBElement<String> createCountryCodeAddress(String value) {
-        return new JAXBElement<String>(_CountryCodeAddress_QNAME, String.class, null, value);
-    }
-
-}
diff --git a/id/server/idserverlib/src/main/java/at/gv/util/xsd/stork/RepresentationPerson.java b/id/server/idserverlib/src/main/java/at/gv/util/xsd/stork/RepresentationPerson.java
deleted file mode 100644
index 09b95790c..000000000
--- a/id/server/idserverlib/src/main/java/at/gv/util/xsd/stork/RepresentationPerson.java
+++ /dev/null
@@ -1,91 +0,0 @@
-
-package at.gv.util.xsd.stork;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for representationPerson complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="representationPerson">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;choice>
- *         &lt;sequence>
- *           &lt;element name="naturalPerson" type="{urn:eu:stork:names:tc:PEPS:1.0:assertion}natPerson"/>
- *         &lt;/sequence>
- *         &lt;sequence>
- *           &lt;element name="legalPerson" type="{urn:eu:stork:names:tc:PEPS:1.0:assertion}jurPerson"/>
- *         &lt;/sequence>
- *       &lt;/choice>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "representationPerson", propOrder = {
-    "naturalPerson",
-    "legalPerson"
-})
-public class RepresentationPerson {
-
-    protected NatPerson naturalPerson;
-    protected JurPerson legalPerson;
-
-    /**
-     * Gets the value of the naturalPerson property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link NatPerson }
-     *     
-     */
-    public NatPerson getNaturalPerson() {
-        return naturalPerson;
-    }
-
-    /**
-     * Sets the value of the naturalPerson property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link NatPerson }
-     *     
-     */
-    public void setNaturalPerson(NatPerson value) {
-        this.naturalPerson = value;
-    }
-
-    /**
-     * Gets the value of the legalPerson property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link JurPerson }
-     *     
-     */
-    public JurPerson getLegalPerson() {
-        return legalPerson;
-    }
-
-    /**
-     * Sets the value of the legalPerson property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link JurPerson }
-     *     
-     */
-    public void setLegalPerson(JurPerson value) {
-        this.legalPerson = value;
-    }
-
-}
diff --git a/id/server/idserverlib/src/main/java/at/gv/util/xsd/stork/package-info.java b/id/server/idserverlib/src/main/java/at/gv/util/xsd/stork/package-info.java
deleted file mode 100644
index 49c23d77a..000000000
--- a/id/server/idserverlib/src/main/java/at/gv/util/xsd/stork/package-info.java
+++ /dev/null
@@ -1,2 +0,0 @@
-@javax.xml.bind.annotation.XmlSchema(namespace = "urn:eu:stork:names:tc:PEPS:1.0:assertion", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
-package at.gv.util.xsd.stork;
diff --git a/id/server/idserverlib/src/main/java/at/gv/util/xsd/xmldsig/DigestMethodType.java b/id/server/idserverlib/src/main/java/at/gv/util/xsd/xmldsig/DigestMethodType.java
index f599d6cb8..3eb951488 100644
--- a/id/server/idserverlib/src/main/java/at/gv/util/xsd/xmldsig/DigestMethodType.java
+++ b/id/server/idserverlib/src/main/java/at/gv/util/xsd/xmldsig/DigestMethodType.java
@@ -65,8 +65,8 @@ public class DigestMethodType {
      * <p>
      * Objects of the following type(s) are allowed in the list
      * {@link String }
-     * {@link Object }
      * {@link Element }
+     * {@link Object }
      * 
      * 
      */
diff --git a/id/server/idserverlib/src/main/java/at/gv/util/xsd/xmldsig/KeyInfoType.java b/id/server/idserverlib/src/main/java/at/gv/util/xsd/xmldsig/KeyInfoType.java
index 63a89c29d..37f559134 100644
--- a/id/server/idserverlib/src/main/java/at/gv/util/xsd/xmldsig/KeyInfoType.java
+++ b/id/server/idserverlib/src/main/java/at/gv/util/xsd/xmldsig/KeyInfoType.java
@@ -53,13 +53,13 @@ import org.w3c.dom.Element;
 public class KeyInfoType {
 
     @XmlElementRefs({
+        @XmlElementRef(name = "KeyValue", 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 = "KeyName", 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),
         @XmlElementRef(name = "PGPData", 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 = "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 = "X509Data", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false)
     })
     @XmlMixed
     @XmlAnyElement(lax = true)
@@ -88,16 +88,16 @@ public class KeyInfoType {
      * 
      * <p>
      * Objects of the following type(s) are allowed in the list
-     * {@link JAXBElement }{@code <}{@link RetrievalMethodType }{@code >}
-     * {@link JAXBElement }{@code <}{@link String }{@code >}
-     * {@link Object }
-     * {@link JAXBElement }{@code <}{@link PGPDataType }{@code >}
+     * {@link JAXBElement }{@code <}{@link KeyValueType }{@code >}
      * {@link JAXBElement }{@code <}{@link SPKIDataType }{@code >}
-     * {@link JAXBElement }{@code <}{@link X509DataType }{@code >}
-     * {@link String }
+     * {@link JAXBElement }{@code <}{@link RetrievalMethodType }{@code >}
      * {@link Element }
+     * {@link String }
      * {@link JAXBElement }{@code <}{@link String }{@code >}
-     * {@link JAXBElement }{@code <}{@link KeyValueType }{@code >}
+     * {@link JAXBElement }{@code <}{@link String }{@code >}
+     * {@link JAXBElement }{@code <}{@link X509DataType }{@code >}
+     * {@link JAXBElement }{@code <}{@link PGPDataType }{@code >}
+     * {@link Object }
      * 
      * 
      */
diff --git a/id/server/idserverlib/src/main/java/at/gv/util/xsd/xmldsig/KeyValueType.java b/id/server/idserverlib/src/main/java/at/gv/util/xsd/xmldsig/KeyValueType.java
index 73cf64902..a4b394877 100644
--- a/id/server/idserverlib/src/main/java/at/gv/util/xsd/xmldsig/KeyValueType.java
+++ b/id/server/idserverlib/src/main/java/at/gv/util/xsd/xmldsig/KeyValueType.java
@@ -42,8 +42,8 @@ import org.w3c.dom.Element;
 public class KeyValueType {
 
     @XmlElementRefs({
-        @XmlElementRef(name = "DSAKeyValue", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
-        @XmlElementRef(name = "RSAKeyValue", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false)
+        @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)
@@ -67,10 +67,10 @@ public class KeyValueType {
      * 
      * <p>
      * Objects of the following type(s) are allowed in the list
-     * {@link JAXBElement }{@code <}{@link DSAKeyValueType }{@code >}
      * {@link JAXBElement }{@code <}{@link RSAKeyValueType }{@code >}
-     * {@link Object }
      * {@link String }
+     * {@link JAXBElement }{@code <}{@link DSAKeyValueType }{@code >}
+     * {@link Object }
      * {@link Element }
      * 
      * 
diff --git a/id/server/idserverlib/src/main/java/at/gv/util/xsd/xmldsig/ObjectFactory.java b/id/server/idserverlib/src/main/java/at/gv/util/xsd/xmldsig/ObjectFactory.java
index dc146937b..2f9de8b50 100644
--- a/id/server/idserverlib/src/main/java/at/gv/util/xsd/xmldsig/ObjectFactory.java
+++ b/id/server/idserverlib/src/main/java/at/gv/util/xsd/xmldsig/ObjectFactory.java
@@ -25,8 +25,7 @@ import javax.xml.namespace.QName;
 @XmlRegistry
 public class ObjectFactory {
 
-    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 _TransformTypeXPath_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "XPath");
     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 _CanonicalizationMethod_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "CanonicalizationMethod");
@@ -51,14 +50,15 @@ public class ObjectFactory {
     private final static QName _Transform_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "Transform");
     private final static QName _DigestValue_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "DigestValue");
     private final static QName _KeyValue_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "KeyValue");
-    private final static QName _SignatureMethodTypeHMACOutputLength_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "HMACOutputLength");
-    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");
+    private final static QName _SignatureMethodTypeHMACOutputLength_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "HMACOutputLength");
+    private final static QName _SPKIDataTypeSPKISexp_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "SPKISexp");
 
     /**
      * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: at.gv.util.xsd.xmldsig
@@ -247,18 +247,9 @@ public class ObjectFactory {
      * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "PGPKeyID", scope = PGPDataType.class)
-    public JAXBElement<String> createPGPDataTypePGPKeyID(String value) {
-        return new JAXBElement<String>(_PGPDataTypePGPKeyID_QNAME, String.class, PGPDataType.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "PGPKeyPacket", scope = PGPDataType.class)
-    public JAXBElement<String> createPGPDataTypePGPKeyPacket(String value) {
-        return new JAXBElement<String>(_PGPDataTypePGPKeyPacket_QNAME, String.class, PGPDataType.class, value);
+    @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);
     }
 
     /**
@@ -478,21 +469,21 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link BigInteger }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@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);
+    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "PGPKeyID", scope = PGPDataType.class)
+    public JAXBElement<String> createPGPDataTypePGPKeyID(String value) {
+        return new JAXBElement<String>(_PGPDataTypePGPKeyID_QNAME, String.class, PGPDataType.class, value);
     }
 
     /**
      * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SPKISexp", scope = SPKIDataType.class)
-    public JAXBElement<String> createSPKIDataTypeSPKISexp(String value) {
-        return new JAXBElement<String>(_SPKIDataTypeSPKISexp_QNAME, String.class, SPKIDataType.class, value);
+    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "PGPKeyPacket", scope = PGPDataType.class)
+    public JAXBElement<String> createPGPDataTypePGPKeyPacket(String value) {
+        return new JAXBElement<String>(_PGPDataTypePGPKeyPacket_QNAME, String.class, PGPDataType.class, value);
     }
 
     /**
@@ -541,12 +532,21 @@ public class ObjectFactory {
     }
 
     /**
+     * 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 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);
+    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SPKISexp", scope = SPKIDataType.class)
+    public JAXBElement<String> createSPKIDataTypeSPKISexp(String value) {
+        return new JAXBElement<String>(_SPKIDataTypeSPKISexp_QNAME, String.class, SPKIDataType.class, value);
     }
 
 }
diff --git a/id/server/idserverlib/src/main/java/at/gv/util/xsd/xmldsig/ObjectType.java b/id/server/idserverlib/src/main/java/at/gv/util/xsd/xmldsig/ObjectType.java
index dc107caa3..613edf984 100644
--- a/id/server/idserverlib/src/main/java/at/gv/util/xsd/xmldsig/ObjectType.java
+++ b/id/server/idserverlib/src/main/java/at/gv/util/xsd/xmldsig/ObjectType.java
@@ -77,8 +77,8 @@ public class ObjectType {
      * <p>
      * Objects of the following type(s) are allowed in the list
      * {@link String }
-     * {@link Object }
      * {@link Element }
+     * {@link Object }
      * 
      * 
      */
diff --git a/id/server/idserverlib/src/main/java/at/gv/util/xsd/xmldsig/PGPDataType.java b/id/server/idserverlib/src/main/java/at/gv/util/xsd/xmldsig/PGPDataType.java
index fb215030e..bcf41f9d3 100644
--- a/id/server/idserverlib/src/main/java/at/gv/util/xsd/xmldsig/PGPDataType.java
+++ b/id/server/idserverlib/src/main/java/at/gv/util/xsd/xmldsig/PGPDataType.java
@@ -47,8 +47,8 @@ import org.w3c.dom.Element;
 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)
+        @XmlElementRef(name = "PGPKeyID", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
+        @XmlElementRef(name = "PGPKeyPacket", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false)
     })
     @XmlAnyElement(lax = true)
     protected List<Object> content;
diff --git a/id/server/idserverlib/src/main/java/at/gv/util/xsd/xmldsig/SPKIDataType.java b/id/server/idserverlib/src/main/java/at/gv/util/xsd/xmldsig/SPKIDataType.java
index cc1d2a5e2..75622d987 100644
--- a/id/server/idserverlib/src/main/java/at/gv/util/xsd/xmldsig/SPKIDataType.java
+++ b/id/server/idserverlib/src/main/java/at/gv/util/xsd/xmldsig/SPKIDataType.java
@@ -60,8 +60,8 @@ public class SPKIDataType {
      * 
      * <p>
      * Objects of the following type(s) are allowed in the list
-     * {@link Object }
      * {@link JAXBElement }{@code <}{@link String }{@code >}
+     * {@link Object }
      * {@link Element }
      * 
      * 
diff --git a/id/server/idserverlib/src/main/java/at/gv/util/xsd/xmldsig/SignatureMethodType.java b/id/server/idserverlib/src/main/java/at/gv/util/xsd/xmldsig/SignatureMethodType.java
index 70695afdf..cfc30c199 100644
--- a/id/server/idserverlib/src/main/java/at/gv/util/xsd/xmldsig/SignatureMethodType.java
+++ b/id/server/idserverlib/src/main/java/at/gv/util/xsd/xmldsig/SignatureMethodType.java
@@ -69,8 +69,8 @@ public class SignatureMethodType {
      * <p>
      * Objects of the following type(s) are allowed in the list
      * {@link String }
-     * {@link Object }
      * {@link JAXBElement }{@code <}{@link BigInteger }{@code >}
+     * {@link Object }
      * 
      * 
      */
diff --git a/id/server/idserverlib/src/main/java/at/gv/util/xsd/xmldsig/SignaturePropertyType.java b/id/server/idserverlib/src/main/java/at/gv/util/xsd/xmldsig/SignaturePropertyType.java
index 90330b03a..deea9c9ed 100644
--- a/id/server/idserverlib/src/main/java/at/gv/util/xsd/xmldsig/SignaturePropertyType.java
+++ b/id/server/idserverlib/src/main/java/at/gv/util/xsd/xmldsig/SignaturePropertyType.java
@@ -74,8 +74,8 @@ public class SignaturePropertyType {
      * <p>
      * Objects of the following type(s) are allowed in the list
      * {@link String }
-     * {@link Object }
      * {@link Element }
+     * {@link Object }
      * 
      * 
      */
diff --git a/id/server/idserverlib/src/main/java/at/gv/util/xsd/xmldsig/TransformType.java b/id/server/idserverlib/src/main/java/at/gv/util/xsd/xmldsig/TransformType.java
index afe693961..df0789197 100644
--- a/id/server/idserverlib/src/main/java/at/gv/util/xsd/xmldsig/TransformType.java
+++ b/id/server/idserverlib/src/main/java/at/gv/util/xsd/xmldsig/TransformType.java
@@ -69,8 +69,8 @@ public class TransformType {
      * <p>
      * Objects of the following type(s) are allowed in the list
      * {@link String }
-     * {@link Object }
      * {@link JAXBElement }{@code <}{@link String }{@code >}
+     * {@link Object }
      * {@link Element }
      * 
      * 
diff --git a/id/server/idserverlib/src/main/java/at/gv/util/xsd/xmldsig/X509DataType.java b/id/server/idserverlib/src/main/java/at/gv/util/xsd/xmldsig/X509DataType.java
index 9d1ec2cd1..5c3ee0dfe 100644
--- a/id/server/idserverlib/src/main/java/at/gv/util/xsd/xmldsig/X509DataType.java
+++ b/id/server/idserverlib/src/main/java/at/gv/util/xsd/xmldsig/X509DataType.java
@@ -47,10 +47,10 @@ public class X509DataType {
 
     @XmlElementRefs({
         @XmlElementRef(name = "X509SKI", 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 = "X509IssuerSerial", 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 = "X509SubjectName", 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),
+        @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)
     })
     @XmlAnyElement(lax = true)
     protected List<Object> x509IssuerSerialOrX509SKIOrX509SubjectName;
@@ -73,13 +73,13 @@ public class X509DataType {
      * 
      * <p>
      * Objects of the following type(s) are allowed in the list
-     * {@link JAXBElement }{@code <}{@link X509IssuerSerialType }{@code >}
      * {@link JAXBElement }{@code <}{@link String }{@code >}
-     * {@link Object }
      * {@link JAXBElement }{@code <}{@link String }{@code >}
+     * {@link JAXBElement }{@code <}{@link X509IssuerSerialType }{@code >}
      * {@link JAXBElement }{@code <}{@link String }{@code >}
      * {@link JAXBElement }{@code <}{@link String }{@code >}
      * {@link Element }
+     * {@link Object }
      * 
      * 
      */