stork2-commons update

author: Bojan Suzic <bojan.suzic@iaik.tugraz.at> 2014-11-07 15:08:58 +0100
committer: Bojan Suzic <bojan.suzic@iaik.tugraz.at> 2014-11-07 15:08:58 +0100
commit: c559071dcf6d1fc0f3dbea3cfb0820719c42439f (patch)
tree: 0e611fbded7ed3284319151a268ef2ad454483b9
parent: 244e3e0e95af0941ac0e27ec6e619e587fdce162 (diff)
download: moa-id-spss-c559071dcf6d1fc0f3dbea3cfb0820719c42439f.tar.gz
moa-id-spss-c559071dcf6d1fc0f3dbea3cfb0820719c42439f.tar.bz2
moa-id-spss-c559071dcf6d1fc0f3dbea3cfb0820719c42439f.zip
33 files changed, 317 insertions, 3766 deletions
diff --git a/id/server/stork2-commons/pom.xml b/id/server/stork2-commons/pom.xml
index 555d6cec7..d44c02b7e 100644
--- a/id/server/stork2-commons/pom.xml
+++ b/id/server/stork2-commons/pom.xml
@@ -65,6 +65,7 @@
 		<dependency>
   		<groupId>org.opensaml</groupId>
   		<artifactId>opensaml</artifactId>
+			<version>${opensaml.version}</version>
 			<exclusions>
 				<exclusion>
 				    <groupId>org.slf4j</groupId>
@@ -129,8 +130,8 @@
 					<artifactId>maven-compiler-plugin</artifactId>
 					<version>3.1</version>
 					<configuration>
-						<source>1.6</source>
-						<target>1.6</target>
+						<source>1.7</source>
+						<target>1.7</target>
 					</configuration>
 				</plugin>
 				<plugin>
diff --git a/id/server/stork2-commons/src/main/config/embedded/pepsUtil.properties b/id/server/stork2-commons/src/main/config/embedded/pepsUtil.properties
index ae811dda7..acc79a8c9 100644
--- a/id/server/stork2-commons/src/main/config/embedded/pepsUtil.properties
+++ b/id/server/stork2-commons/src/main/config/embedded/pepsUtil.properties
@@ -33,6 +33,7 @@ max.localAddr.size=300
 max.localName.size=300
 max.apepsUrl.size=300
 max.apeps.callbackUrl.size=300
+max.spCountryCode.size=5
 
 dtl.url=http://localhost:8080/DocumentService/DocumentService
 
@@ -249,21 +250,24 @@ spepsSAMLResponse.code=200010
 spepsSAMLResponse.message=error.gen.speps.saml
 
 
-invalid.apepsRedirectUrl.code=001001
+invalid.apepsRedirectUrl.code=204001
 invalid.apepsRedirectUrl.message=invalid.apeps.redirectUrl
 
-apepsSAMLRequest.code=001002
+apepsSAMLRequest.code=204002
 apepsSAMLRequest.message=invalid.apeps.saml.request
 
-apepsSAMLResponse.code=001003
+apepsSAMLResponse.code=204003
 apepsSAMLResponse.message=invalid.apeps.saml.response
 
-invalid.apepsCallbackUrl.code=001004
+invalid.apepsCallbackUrl.code=204004
 invalid.apepsCallbackUrl.message=invalid.apeps.callback.url
 
-colleagueAttributeRequest.invalidSAML.code=001005
+colleagueAttributeRequest.invalidSAML.code=204005
 colleagueAttributeRequest.invalidSAML.message=invalid.attr.request.saml
 
+colleagueAttributeRequest.invalidCountryCode.code=204006
+colleagueAttributeRequest.invalidCountryCode.message=invalid.attr.country.code
+
 
 #Hash Digests
 hashDigest.className=org.bouncycastle.crypto.digests.SHA512Digest
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/Linker.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/Linker.java
index 6e7c891da..94882de77 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/Linker.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/Linker.java
@@ -145,7 +145,10 @@ public final class Linker implements Serializable {
 
 		//Assertion storage
 		this.assertions.put(source, attrResponse);
-
+        // previously: getTotalPersonalAttributeList() in both cases
+		if ( source.getSourceType()==AttributeSource.SOURCE_REMOTE_COUNTRY )
+			this.attributeProvidersMap.put(source, attrResponse.getTotalPersonalAttributeList());
+		else
 		this.attributeProvidersMap.put(source, attrResponse.getPersonalAttributeList());
 		//this.attributeProvidersMap.put(source, attrResponse.getTotalPersonalAttributeList());
 	}
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/PEPSErrors.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/PEPSErrors.java
index 5da9ba494..f2493db4e 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/PEPSErrors.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/PEPSErrors.java
@@ -325,8 +325,13 @@ public enum PEPSErrors {
   /**
    * Represents the 'colleagueAttributeRequest.invalidSAML' constant error identifier.
    */
-  COLLEAGUE_ATTR_REQ_INVALID_SAML("colleagueAttributeRequest.invalidSAML");
-  
+  COLLEAGUE_ATTR_REQ_INVALID_SAML("colleagueAttributeRequest.invalidSAML"),
+
+  /**
+   * Represents the 'invalid.attr.country.code' constant error identifier.
+   */
+  INVALID_COUNTRY_CODE("invalid.attr.country.code");
+
   /**
    * Represents the constant's value.
    */
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/PEPSParameters.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/PEPSParameters.java
index 15c2ae552..dd534499d 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/PEPSParameters.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/PEPSParameters.java
@@ -407,10 +407,17 @@ public enum PEPSParameters {
    * Represents the 'spCountry' constant value.
    */
   SPCOUNTRY("spCountry"),
+
   /**
    * Represents the 'spInstitution' constant value.
    */
   SPINSTITUTION("spInstitution"),
+
+  /**
+   * Represents the 'spCountryCode' constant value.
+   */
+  SP_COUNTRY_CODE("spCountryCode"),
+
   /**
    * Represents the 'storkAttribute.number' parameter constant.
    */
@@ -598,7 +605,12 @@ public enum PEPSParameters {
   /**
    * Represents the 'complexAttrListOpt' parameter constant.
    */
-  COMPLEX_ATTR_LIST_OPT("complexAttrListOpt");
+  COMPLEX_ATTR_LIST_OPT("complexAttrListOpt"),
+  /**
+   * Represents the 'idPDerivedAttrList' parameter constant.
+   */
+
+  IDP_DERIVED_ATTR_LIST("idPDerivedAttrList");
 
   /**
    * Represents the constant's value.
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/PersonalAttributeList.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/PersonalAttributeList.java
index 9a0f87488..991682c9b 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/PersonalAttributeList.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/PersonalAttributeList.java
@@ -54,13 +54,13 @@ public final class PersonalAttributeList extends
   /**
    * Hash with the latest fetched attribute name alias.
    */
-  private final Map<String, Integer> latestAttrAlias =
+  private final transient Map<String, Integer> latestAttrAlias =
     new HashMap<String, Integer>();
   
   /**
    * Hash with mapping number of alias or the attribute name.
    */
-  private final Map<String, Integer> attrAliasNumber =
+  private final transient Map<String, Integer> attrAliasNumber =
     new HashMap<String, Integer>();
   
   /**
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/STORKAttrQueryResponse.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/STORKAttrQueryResponse.java
index 1974f4f66..f6d459878 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/STORKAttrQueryResponse.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/STORKAttrQueryResponse.java
@@ -71,7 +71,7 @@ public class STORKAttrQueryResponse implements Serializable {
   private List<IPersonalAttributeList> attributeLists;
    
   /** Citizen's personal attribute list. */
-  private IPersonalAttributeList attributeList = new PersonalAttributeList();
+  private transient IPersonalAttributeList attributeList = new PersonalAttributeList();
 
     /**
      * Logger object.
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/STORKAuthnResponse.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/STORKAuthnResponse.java
index c4a3e2b6c..d2cc370d3 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/STORKAuthnResponse.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/STORKAuthnResponse.java
@@ -68,7 +68,7 @@ public final class STORKAuthnResponse implements Serializable {
   private String country;
   
   /** Citizen's personal attribute list. */
-  private IPersonalAttributeList attributeList = new PersonalAttributeList();
+  private transient IPersonalAttributeList attributeList = new PersonalAttributeList();
   
   /** List of all assertions in response **/
   private List<Assertion> assertions;
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/.svn/entries b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/.svn/entries
index 434de60f8..c7a7dfa23 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/.svn/entries
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/.svn/entries
@@ -26,14 +26,14 @@ emrepisja
 
 aa842e49-f825-43fc-93ba-11ee9fd5a035
 
-IsHCPType.java
+AcTitleType.java
 file
 
 
 
-
-2014-03-05T09:36:07.898515Z
-c7794f438dce3f5e4e27e605a642a22a
+delete
+2014-03-05T09:36:07.894515Z
+df18729d7dbd509aeeac2f17ef036e19
 2014-03-04T14:10:03.192908Z
 721
 emrepisja
@@ -58,16 +58,16 @@ emrepisja
 
 
 
-3801
+2388
 
-IsAcademicStaffType.java
+AttributeStatusType.java
 file
 
 
 
-
+delete
 2014-03-05T09:36:07.898515Z
-43d67ea6cedb4601555d0394db95417a
+4e30a60177a9ab03aececf580482fad1
 2014-03-04T14:10:03.192908Z
 721
 emrepisja
@@ -92,16 +92,16 @@ emrepisja
 
 
 
-3818
+1734
 
-HabilitationType.java
+CanonicalAddressType.java
 file
 
 
 
-
+delete
 2014-03-05T09:36:07.898515Z
-6e9cc940cbe5298156c5e7b524936f11
+63bc0e23343775a0c252a03a5a3b09d1
 2014-03-04T14:10:03.192908Z
 721
 emrepisja
@@ -126,16 +126,16 @@ emrepisja
 
 
 
-2314
+6847
 
-AttributeStatusType.java
+Habilitation.java
 file
 
 
 
-
+delete
 2014-03-05T09:36:07.898515Z
-4e30a60177a9ab03aececf580482fad1
+248b26e8c89ddc3366c528cf3852d27b
 2014-03-04T14:10:03.192908Z
 721
 emrepisja
@@ -160,16 +160,16 @@ emrepisja
 
 
 
-1734
+2298
 
-IsAdminStaffType.java
+HabilitationType.java
 file
 
 
 
-
+delete
 2014-03-05T09:36:07.898515Z
-5a49a39f1d260a3c306216069751260f
+6e9cc940cbe5298156c5e7b524936f11
 2014-03-04T14:10:03.192908Z
 721
 emrepisja
@@ -194,16 +194,16 @@ emrepisja
 
 
 
-2341
+2314
 
-MandateType.java
+HasAccountInBankType.java
 file
 
 
 
-
-2014-03-05T09:36:07.898515Z
-2fbb38548efd320e4df27959a9842731
+delete
+2014-03-05T09:36:07.894515Z
+f71b4c28dd5c9580fb87c3573435837b
 2014-03-04T14:10:03.192908Z
 721
 emrepisja
@@ -228,16 +228,16 @@ emrepisja
 
 
 
-3581
+2339
 
-HasAccountInBankType.java
+HasDegreeType.java
 file
 
 
 
-
+delete
 2014-03-05T09:36:07.894515Z
-f71b4c28dd5c9580fb87c3573435837b
+3a54a31f40c97b44d31f1a70e0767daa
 2014-03-04T14:10:03.192908Z
 721
 emrepisja
@@ -262,16 +262,16 @@ emrepisja
 
 
 
-2339
+4432
 
-IsHealthCareProfessionalType.java
+IsAcademicStaffType.java
 file
 
 
 
-
-2014-03-05T09:36:07.894515Z
-2a4106ac8c87cc056b853b7f9ffb6fbc
+delete
+2014-03-05T09:36:07.898515Z
+43d67ea6cedb4601555d0394db95417a
 2014-03-04T14:10:03.192908Z
 721
 emrepisja
@@ -296,16 +296,16 @@ emrepisja
 
 
 
-3834
+3818
 
-package-info.java
+IsAdminStaffType.java
 file
 
 
 
-
-2014-03-05T09:36:07.894515Z
-5a2f7df8040e53c9e0dc7beacc8f3457
+delete
+2014-03-05T09:36:07.898515Z
+5a49a39f1d260a3c306216069751260f
 2014-03-04T14:10:03.192908Z
 721
 emrepisja
@@ -330,16 +330,16 @@ emrepisja
 
 
 
-549
+2341
 
-IsStudentType.java
+IsCourseCoordinatorType.java
 file
 
 
 
-
-2014-03-05T09:36:07.894515Z
-a576b2ef395482c49cb968e91e33ec89
+delete
+2014-03-05T09:36:07.898515Z
+9927ea145575d05bd2984bee0e3550be
 2014-03-04T14:10:03.192908Z
 721
 emrepisja
@@ -364,16 +364,16 @@ emrepisja
 
 
 
-3714
+2423
 
-AcTitleType.java
+IsHCPType.java
 file
 
 
 
-
-2014-03-05T09:36:07.894515Z
-df18729d7dbd509aeeac2f17ef036e19
+delete
+2014-03-05T09:36:07.898515Z
+c7794f438dce3f5e4e27e605a642a22a
 2014-03-04T14:10:03.192908Z
 721
 emrepisja
@@ -398,16 +398,16 @@ emrepisja
 
 
 
-2388
+3801
 
-RequestedAttributeType.java
+IsHealthCareProfessionalType.java
 file
 
 
 
-
+delete
 2014-03-05T09:36:07.894515Z
-c6ada26a7ff439713e9a4588d1b62b0a
+2a4106ac8c87cc056b853b7f9ffb6fbc
 2014-03-04T14:10:03.192908Z
 721
 emrepisja
@@ -432,16 +432,16 @@ emrepisja
 
 
 
-6089
+3834
 
-HasDegreeType.java
+IsStudentType.java
 file
 
 
 
-
+delete
 2014-03-05T09:36:07.894515Z
-3a54a31f40c97b44d31f1a70e0767daa
+a576b2ef395482c49cb968e91e33ec89
 2014-03-04T14:10:03.192908Z
 721
 emrepisja
@@ -466,16 +466,16 @@ emrepisja
 
 
 
-4432
+3714
 
-RepresentationPersonType.java
+IsTeacherOfType.java
 file
 
 
 
-
+delete
 2014-03-05T09:36:07.898515Z
-84b6c9432085cf590c3ed06e58b4307f
+1575bd6840471d713bd61c5d337d3900
 2014-03-04T14:10:03.192908Z
 721
 emrepisja
@@ -500,16 +500,16 @@ emrepisja
 
 
 
-7205
+3668
 
-ObjectFactory.java
+MandateContentType.java
 file
 
 
 
-
+delete
 2014-03-05T09:36:07.898515Z
-bc36df4b11e93ab03119dfb25626bfb1
+debc98ce374d669b7621dea674120dfc
 2014-03-04T14:10:03.192908Z
 721
 emrepisja
@@ -534,16 +534,16 @@ emrepisja
 
 
 
-18679
+6205
 
-IsTeacherOfType.java
+MandateType.java
 file
 
 
 
-
+delete
 2014-03-05T09:36:07.898515Z
-1575bd6840471d713bd61c5d337d3900
+2fbb38548efd320e4df27959a9842731
 2014-03-04T14:10:03.192908Z
 721
 emrepisja
@@ -568,16 +568,16 @@ emrepisja
 
 
 
-3668
+3581
 
-CanonicalAddressType.java
+ObjectFactory.java
 file
 
 
 
-
+delete
 2014-03-05T09:36:07.898515Z
-63bc0e23343775a0c252a03a5a3b09d1
+bc36df4b11e93ab03119dfb25626bfb1
 2014-03-04T14:10:03.192908Z
 721
 emrepisja
@@ -602,16 +602,16 @@ emrepisja
 
 
 
-6847
+18679
 
-IsCourseCoordinatorType.java
+RepresentationPersonType.java
 file
 
 
 
-
+delete
 2014-03-05T09:36:07.898515Z
-9927ea145575d05bd2984bee0e3550be
+84b6c9432085cf590c3ed06e58b4307f
 2014-03-04T14:10:03.192908Z
 721
 emrepisja
@@ -636,16 +636,16 @@ emrepisja
 
 
 
-2423
+7205
 
-MandateContentType.java
+RequestedAttributeType.java
 file
 
 
 
-
-2014-03-05T09:36:07.898515Z
-debc98ce374d669b7621dea674120dfc
+delete
+2014-03-05T09:36:07.894515Z
+c6ada26a7ff439713e9a4588d1b62b0a
 2014-03-04T14:10:03.192908Z
 721
 emrepisja
@@ -670,16 +670,16 @@ emrepisja
 
 
 
-6205
+6089
 
-Habilitation.java
+package-info.java
 file
 
 
 
-
-2014-03-05T09:36:07.898515Z
-248b26e8c89ddc3366c528cf3852d27b
+delete
+2014-03-05T09:36:07.894515Z
+5a2f7df8040e53c9e0dc7beacc8f3457
 2014-03-04T14:10:03.192908Z
 721
 emrepisja
@@ -704,5 +704,5 @@ emrepisja
 
 
 
-2298
+549
 
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/AcTitleType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/AcTitleType.java
deleted file mode 100644
index 3c214cb7b..000000000
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/AcTitleType.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.02.17 at 10:36:59 AM GMT 
-//
-
-
-package eu.stork.peps.complex.attributes;
-
-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 acTitleType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="acTitleType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="titleNormalised" type="{urn:eu:stork:names:tc:STORK:1.0:assertion}titleNormalisedType"/>
- *         &lt;element name="AQAA" type="{urn:eu:stork:names:tc:STORK:1.0:assertion}QualityAuthenticationAssuranceLevelType"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "acTitleType", propOrder = {
-    "titleNormalised",
-    "aqaa"
-})
-public class AcTitleType {
-
-    @XmlElement(required = true)
-    protected String titleNormalised;
-    @XmlElement(name = "AQAA")
-    protected int aqaa;
-
-    /**
-     * Gets the value of the titleNormalised property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getTitleNormalised() {
-        return titleNormalised;
-    }
-
-    /**
-     * Sets the value of the titleNormalised property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setTitleNormalised(String value) {
-        this.titleNormalised = value;
-    }
-
-    /**
-     * Gets the value of the aqaa property.
-     * 
-     */
-    public int getAQAA() {
-        return aqaa;
-    }
-
-    /**
-     * Sets the value of the aqaa property.
-     * 
-     */
-    public void setAQAA(int value) {
-        this.aqaa = value;
-    }
-
-}
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/AttributeStatusType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/AttributeStatusType.java
deleted file mode 100644
index 1a815e944..000000000
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/AttributeStatusType.java
+++ /dev/null
@@ -1,61 +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.02.17 at 10:36:59 AM GMT 
-//
-
-
-package eu.stork.peps.complex.attributes;
-
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for AttributeStatusType.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * <p>
- * <pre>
- * &lt;simpleType name="AttributeStatusType">
- *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *     &lt;enumeration value="Available"/>
- *     &lt;enumeration value="NotAvailable"/>
- *     &lt;enumeration value="Withheld"/>
- *   &lt;/restriction>
- * &lt;/simpleType>
- * </pre>
- * 
- */
-@XmlType(name = "AttributeStatusType")
-@XmlEnum
-public enum AttributeStatusType {
-
-    @XmlEnumValue("Available")
-    AVAILABLE("Available"),
-    @XmlEnumValue("NotAvailable")
-    NOT_AVAILABLE("NotAvailable"),
-    @XmlEnumValue("Withheld")
-    WITHHELD("Withheld");
-    private final String value;
-
-    AttributeStatusType(String v) {
-        value = v;
-    }
-
-    public String value() {
-        return value;
-    }
-
-    public static AttributeStatusType fromValue(String v) {
-        for (AttributeStatusType c: AttributeStatusType.values()) {
-            if (c.value.equals(v)) {
-                return c;
-            }
-        }
-        throw new IllegalArgumentException(v);
-    }
-
-}
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/CanonicalAddressType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/CanonicalAddressType.java
deleted file mode 100644
index fa0289cfa..000000000
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/CanonicalAddressType.java
+++ /dev/null
@@ -1,264 +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.02.17 at 10:36:59 AM GMT 
-//
-
-
-package eu.stork.peps.complex.attributes;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
-
-/**
- * <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 name="countryCodeAddress" type="{urn:eu:stork:names:tc:STORK:1.0:assertion}CountryCodeType"/>
- *         &lt;element name="state" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         &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)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    protected String countryCodeAddress;
-    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/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/Habilitation.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/Habilitation.java
deleted file mode 100644
index 3d99c9600..000000000
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/Habilitation.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.02.17 at 10:36:59 AM GMT 
-//
-
-
-package eu.stork.peps.complex.attributes;
-
-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 habilitation complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="habilitation">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="ability" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         &lt;element name="AQAA" type="{urn:eu:stork:names:tc:STORK:1.0:assertion}QualityAuthenticationAssuranceLevelType"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "habilitation", propOrder = {
-    "ability",
-    "aqaa"
-})
-public class Habilitation {
-
-    @XmlElement(required = true)
-    protected String ability;
-    @XmlElement(name = "AQAA")
-    protected int aqaa;
-
-    /**
-     * Gets the value of the ability property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getAbility() {
-        return ability;
-    }
-
-    /**
-     * Sets the value of the ability property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setAbility(String value) {
-        this.ability = value;
-    }
-
-    /**
-     * Gets the value of the aqaa property.
-     * 
-     */
-    public int getAQAA() {
-        return aqaa;
-    }
-
-    /**
-     * Sets the value of the aqaa property.
-     * 
-     */
-    public void setAQAA(int value) {
-        this.aqaa = value;
-    }
-
-}
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/HabilitationType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/HabilitationType.java
deleted file mode 100644
index 6a5cb7b00..000000000
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/HabilitationType.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.02.17 at 10:36:59 AM GMT 
-//
-
-
-package eu.stork.peps.complex.attributes;
-
-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 habilitationType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="habilitationType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="ability" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         &lt;element name="AQAA" type="{urn:eu:stork:names:tc:STORK:1.0:assertion}QualityAuthenticationAssuranceLevelType"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "habilitationType", propOrder = {
-    "ability",
-    "aqaa"
-})
-public class HabilitationType {
-
-    @XmlElement(required = true)
-    protected String ability;
-    @XmlElement(name = "AQAA")
-    protected int aqaa;
-
-    /**
-     * Gets the value of the ability property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getAbility() {
-        return ability;
-    }
-
-    /**
-     * Sets the value of the ability property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setAbility(String value) {
-        this.ability = value;
-    }
-
-    /**
-     * Gets the value of the aqaa property.
-     * 
-     */
-    public int getAQAA() {
-        return aqaa;
-    }
-
-    /**
-     * Sets the value of the aqaa property.
-     * 
-     */
-    public void setAQAA(int value) {
-        this.aqaa = value;
-    }
-
-}
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/HasAccountInBankType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/HasAccountInBankType.java
deleted file mode 100644
index cc09f0486..000000000
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/HasAccountInBankType.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.02.17 at 10:36:59 AM GMT 
-//
-
-
-package eu.stork.peps.complex.attributes;
-
-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 hasAccountInBankType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="hasAccountInBankType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="bankName" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         &lt;element name="AQAA" type="{urn:eu:stork:names:tc:STORK:1.0:assertion}QualityAuthenticationAssuranceLevelType"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "hasAccountInBankType", propOrder = {
-    "bankName",
-    "aqaa"
-})
-public class HasAccountInBankType {
-
-    @XmlElement(required = true)
-    protected String bankName;
-    @XmlElement(name = "AQAA")
-    protected int aqaa;
-
-    /**
-     * Gets the value of the bankName property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getBankName() {
-        return bankName;
-    }
-
-    /**
-     * Sets the value of the bankName property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setBankName(String value) {
-        this.bankName = value;
-    }
-
-    /**
-     * Gets the value of the aqaa property.
-     * 
-     */
-    public int getAQAA() {
-        return aqaa;
-    }
-
-    /**
-     * Sets the value of the aqaa property.
-     * 
-     */
-    public void setAQAA(int value) {
-        this.aqaa = value;
-    }
-
-}
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/HasDegreeType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/HasDegreeType.java
deleted file mode 100644
index ea466cb18..000000000
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/HasDegreeType.java
+++ /dev/null
@@ -1,174 +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.02.17 at 10:36:59 AM GMT 
-//
-
-
-package eu.stork.peps.complex.attributes;
-
-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 hasDegreeType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="hasDegreeType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="study" type="{urn:eu:stork:names:tc:STORK:1.0:assertion}studyType"/>
- *         &lt;element name="level" type="{urn:eu:stork:names:tc:STORK:1.0:assertion}LevelType"/>
- *         &lt;element name="yearObtained" type="{http://www.w3.org/2001/XMLSchema}integer"/>
- *         &lt;element name="nameOfInstitution" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         &lt;element name="AQAA" type="{urn:eu:stork:names:tc:STORK:1.0:assertion}QualityAuthenticationAssuranceLevelType"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "hasDegreeType", propOrder = {
-    "study",
-    "level",
-    "yearObtained",
-    "nameOfInstitution",
-    "aqaa"
-})
-public class HasDegreeType {
-
-    @XmlElement(required = true)
-    protected String study;
-    @XmlElement(required = true)
-    protected String level;
-    @XmlElement(required = true)
-    protected BigInteger yearObtained;
-    @XmlElement(required = true)
-    protected String nameOfInstitution;
-    @XmlElement(name = "AQAA")
-    protected int aqaa;
-
-    /**
-     * Gets the value of the study property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getStudy() {
-        return study;
-    }
-
-    /**
-     * Sets the value of the study property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setStudy(String value) {
-        this.study = value;
-    }
-
-    /**
-     * Gets the value of the level property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getLevel() {
-        return level;
-    }
-
-    /**
-     * Sets the value of the level property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setLevel(String value) {
-        this.level = value;
-    }
-
-    /**
-     * Gets the value of the yearObtained property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BigInteger }
-     *     
-     */
-    public BigInteger getYearObtained() {
-        return yearObtained;
-    }
-
-    /**
-     * Sets the value of the yearObtained property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BigInteger }
-     *     
-     */
-    public void setYearObtained(BigInteger value) {
-        this.yearObtained = value;
-    }
-
-    /**
-     * Gets the value of the nameOfInstitution property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getNameOfInstitution() {
-        return nameOfInstitution;
-    }
-
-    /**
-     * Sets the value of the nameOfInstitution property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setNameOfInstitution(String value) {
-        this.nameOfInstitution = value;
-    }
-
-    /**
-     * Gets the value of the aqaa property.
-     * 
-     */
-    public int getAQAA() {
-        return aqaa;
-    }
-
-    /**
-     * Sets the value of the aqaa property.
-     * 
-     */
-    public void setAQAA(int value) {
-        this.aqaa = value;
-    }
-
-}
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/IsAcademicStaffType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/IsAcademicStaffType.java
deleted file mode 100644
index 02d9286d8..000000000
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/IsAcademicStaffType.java
+++ /dev/null
@@ -1,145 +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.02.17 at 10:36:59 AM GMT 
-//
-
-
-package eu.stork.peps.complex.attributes;
-
-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 isAcademicStaffType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="isAcademicStaffType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="nameOfInstitution" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         &lt;element name="occupation" type="{urn:eu:stork:names:tc:STORK:1.0:assertion}occupationType"/>
- *         &lt;element name="knowledgearea" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         &lt;element name="AQAA" type="{urn:eu:stork:names:tc:STORK:1.0:assertion}QualityAuthenticationAssuranceLevelType"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "isAcademicStaffType", propOrder = {
-    "nameOfInstitution",
-    "occupation",
-    "knowledgearea",
-    "aqaa"
-})
-public class IsAcademicStaffType {
-
-    @XmlElement(required = true)
-    protected String nameOfInstitution;
-    @XmlElement(required = true)
-    protected String occupation;
-    @XmlElement(required = true)
-    protected String knowledgearea;
-    @XmlElement(name = "AQAA")
-    protected int aqaa;
-
-    /**
-     * Gets the value of the nameOfInstitution property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getNameOfInstitution() {
-        return nameOfInstitution;
-    }
-
-    /**
-     * Sets the value of the nameOfInstitution property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setNameOfInstitution(String value) {
-        this.nameOfInstitution = value;
-    }
-
-    /**
-     * Gets the value of the occupation property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getOccupation() {
-        return occupation;
-    }
-
-    /**
-     * Sets the value of the occupation property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setOccupation(String value) {
-        this.occupation = value;
-    }
-
-    /**
-     * Gets the value of the knowledgearea property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getKnowledgearea() {
-        return knowledgearea;
-    }
-
-    /**
-     * Sets the value of the knowledgearea property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setKnowledgearea(String value) {
-        this.knowledgearea = value;
-    }
-
-    /**
-     * Gets the value of the aqaa property.
-     * 
-     */
-    public int getAQAA() {
-        return aqaa;
-    }
-
-    /**
-     * Sets the value of the aqaa property.
-     * 
-     */
-    public void setAQAA(int value) {
-        this.aqaa = value;
-    }
-
-}
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/IsAdminStaffType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/IsAdminStaffType.java
deleted file mode 100644
index 0de16ee77..000000000
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/IsAdminStaffType.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.02.17 at 10:36:59 AM GMT 
-//
-
-
-package eu.stork.peps.complex.attributes;
-
-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 isAdminStaffType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="isAdminStaffType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="adminStaff" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         &lt;element name="AQAA" type="{urn:eu:stork:names:tc:STORK:1.0:assertion}QualityAuthenticationAssuranceLevelType"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "isAdminStaffType", propOrder = {
-    "adminStaff",
-    "aqaa"
-})
-public class IsAdminStaffType {
-
-    @XmlElement(required = true)
-    protected String adminStaff;
-    @XmlElement(name = "AQAA")
-    protected int aqaa;
-
-    /**
-     * Gets the value of the adminStaff property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getAdminStaff() {
-        return adminStaff;
-    }
-
-    /**
-     * Sets the value of the adminStaff property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setAdminStaff(String value) {
-        this.adminStaff = value;
-    }
-
-    /**
-     * Gets the value of the aqaa property.
-     * 
-     */
-    public int getAQAA() {
-        return aqaa;
-    }
-
-    /**
-     * Sets the value of the aqaa property.
-     * 
-     */
-    public void setAQAA(int value) {
-        this.aqaa = value;
-    }
-
-}
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/IsCourseCoordinatorType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/IsCourseCoordinatorType.java
deleted file mode 100644
index 58caa2f22..000000000
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/IsCourseCoordinatorType.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.02.17 at 10:36:59 AM GMT 
-//
-
-
-package eu.stork.peps.complex.attributes;
-
-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 isCourseCoordinatorType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="isCourseCoordinatorType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="courseCoodinator" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         &lt;element name="AQAA" type="{urn:eu:stork:names:tc:STORK:1.0:assertion}QualityAuthenticationAssuranceLevelType"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "isCourseCoordinatorType", propOrder = {
-    "courseCoodinator",
-    "aqaa"
-})
-public class IsCourseCoordinatorType {
-
-    @XmlElement(required = true)
-    protected String courseCoodinator;
-    @XmlElement(name = "AQAA")
-    protected int aqaa;
-
-    /**
-     * Gets the value of the courseCoodinator property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getCourseCoodinator() {
-        return courseCoodinator;
-    }
-
-    /**
-     * Sets the value of the courseCoodinator property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setCourseCoodinator(String value) {
-        this.courseCoodinator = value;
-    }
-
-    /**
-     * Gets the value of the aqaa property.
-     * 
-     */
-    public int getAQAA() {
-        return aqaa;
-    }
-
-    /**
-     * Sets the value of the aqaa property.
-     * 
-     */
-    public void setAQAA(int value) {
-        this.aqaa = value;
-    }
-
-}
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/IsHCPType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/IsHCPType.java
deleted file mode 100644
index 17e315d2d..000000000
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/IsHCPType.java
+++ /dev/null
@@ -1,145 +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.02.17 at 10:36:59 AM GMT 
-//
-
-
-package eu.stork.peps.complex.attributes;
-
-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 isHCPType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="isHCPType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="nameOfOrganisation" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         &lt;element name="HCPType" type="{urn:eu:stork:names:tc:STORK:1.0:assertion}HCPType"/>
- *         &lt;element name="specialisation" type="{urn:eu:stork:names:tc:STORK:1.0:assertion}specialisationType"/>
- *         &lt;element name="AQAA" type="{urn:eu:stork:names:tc:STORK:1.0:assertion}QualityAuthenticationAssuranceLevelType"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "isHCPType", propOrder = {
-    "nameOfOrganisation",
-    "hcpType",
-    "specialisation",
-    "aqaa"
-})
-public class IsHCPType {
-
-    @XmlElement(required = true)
-    protected String nameOfOrganisation;
-    @XmlElement(name = "HCPType", required = true)
-    protected String hcpType;
-    @XmlElement(required = true)
-    protected String specialisation;
-    @XmlElement(name = "AQAA")
-    protected int aqaa;
-
-    /**
-     * Gets the value of the nameOfOrganisation property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getNameOfOrganisation() {
-        return nameOfOrganisation;
-    }
-
-    /**
-     * Sets the value of the nameOfOrganisation property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setNameOfOrganisation(String value) {
-        this.nameOfOrganisation = value;
-    }
-
-    /**
-     * Gets the value of the hcpType property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getHCPType() {
-        return hcpType;
-    }
-
-    /**
-     * Sets the value of the hcpType property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setHCPType(String value) {
-        this.hcpType = value;
-    }
-
-    /**
-     * Gets the value of the specialisation property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getSpecialisation() {
-        return specialisation;
-    }
-
-    /**
-     * Sets the value of the specialisation property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setSpecialisation(String value) {
-        this.specialisation = value;
-    }
-
-    /**
-     * Gets the value of the aqaa property.
-     * 
-     */
-    public int getAQAA() {
-        return aqaa;
-    }
-
-    /**
-     * Sets the value of the aqaa property.
-     * 
-     */
-    public void setAQAA(int value) {
-        this.aqaa = value;
-    }
-
-}
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/IsHealthCareProfessionalDeprecatedType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/IsHealthCareProfessionalDeprecatedType.java
deleted file mode 100644
index b9798537c..000000000
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/IsHealthCareProfessionalDeprecatedType.java
+++ /dev/null
@@ -1,145 +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.06.18 at 08:26:57 AM CEST 
-//
-
-
-package eu.stork.peps.complex.attributes;
-
-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 isHealthCareProfessional_deprecatedType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="isHealthCareProfessional_deprecatedType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="nameOfOrganisation" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         &lt;element ref="{urn:eu:stork:names:tc:STORK:1.0:assertion}HCPType"/>
- *         &lt;element ref="{urn:eu:stork:names:tc:STORK:1.0:assertion}specialisation"/>
- *         &lt;element name="AQAA" type="{urn:eu:stork:names:tc:STORK:1.0:assertion}QualityAuthenticationAssuranceLevelType"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "isHealthCareProfessional_deprecatedType", propOrder = {
-    "nameOfOrganisation",
-    "hcpType",
-    "specialisation",
-    "aqaa"
-})
-public class IsHealthCareProfessionalDeprecatedType {
-
-    @XmlElement(required = true)
-    protected String nameOfOrganisation;
-    @XmlElement(name = "HCPType", required = true)
-    protected String hcpType;
-    @XmlElement(required = true)
-    protected String specialisation;
-    @XmlElement(name = "AQAA")
-    protected int aqaa;
-
-    /**
-     * Gets the value of the nameOfOrganisation property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getNameOfOrganisation() {
-        return nameOfOrganisation;
-    }
-
-    /**
-     * Sets the value of the nameOfOrganisation property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setNameOfOrganisation(String value) {
-        this.nameOfOrganisation = value;
-    }
-
-    /**
-     * Gets the value of the hcpType property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getHCPType() {
-        return hcpType;
-    }
-
-    /**
-     * Sets the value of the hcpType property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setHCPType(String value) {
-        this.hcpType = value;
-    }
-
-    /**
-     * Gets the value of the specialisation property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getSpecialisation() {
-        return specialisation;
-    }
-
-    /**
-     * Sets the value of the specialisation property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setSpecialisation(String value) {
-        this.specialisation = value;
-    }
-
-    /**
-     * Gets the value of the aqaa property.
-     * 
-     */
-    public int getAQAA() {
-        return aqaa;
-    }
-
-    /**
-     * Sets the value of the aqaa property.
-     * 
-     */
-    public void setAQAA(int value) {
-        this.aqaa = value;
-    }
-
-}
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/IsHealthCareProfessionalType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/IsHealthCareProfessionalType.java
deleted file mode 100644
index 1e3b4fa78..000000000
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/IsHealthCareProfessionalType.java
+++ /dev/null
@@ -1,168 +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.06.18 at 08:26:57 AM CEST 
-//
-
-
-package eu.stork.peps.complex.attributes;
-
-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 isHealthCareProfessionalType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="isHealthCareProfessionalType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="typeOfHCP">
- *           &lt;simpleType>
- *             &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyURI">
- *               &lt;enumeration value="dentist"/>
- *               &lt;enumeration value="nurse"/>
- *               &lt;enumeration value="pharmacist"/>
- *               &lt;enumeration value="physician"/>
- *               &lt;enumeration value="nurse midwife"/>
- *               &lt;enumeration value="admission clerk"/>
- *               &lt;enumeration value="ancillary services"/>
- *               &lt;enumeration value="clinical services"/>
- *             &lt;/restriction>
- *           &lt;/simpleType>
- *         &lt;/element>
- *         &lt;element name="nameOfOrganisation" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         &lt;element name="typeOfOrganisation">
- *           &lt;simpleType>
- *             &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyURI">
- *               &lt;enumeration value="Hospital"/>
- *               &lt;enumeration value="Resident Physician"/>
- *               &lt;enumeration value="Pharmacy"/>
- *               &lt;enumeration value="Other"/>
- *               &lt;enumeration value="Unknown"/>
- *             &lt;/restriction>
- *           &lt;/simpleType>
- *         &lt;/element>
- *         &lt;element name="AQAA" type="{urn:eu:stork:names:tc:STORK:1.0:assertion}QualityAuthenticationAssuranceLevelType"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "isHealthCareProfessionalType", propOrder = {
-    "typeOfHCP",
-    "nameOfOrganisation",
-    "typeOfOrganisation",
-    "aqaa"
-})
-public class IsHealthCareProfessionalType {
-
-    @XmlElement(required = true)
-    protected String typeOfHCP;
-    @XmlElement(required = true)
-    protected String nameOfOrganisation;
-    @XmlElement(required = true)
-    protected String typeOfOrganisation;
-    @XmlElement(name = "AQAA")
-    protected int aqaa;
-
-    /**
-     * Gets the value of the typeOfHCP property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getTypeOfHCP() {
-        return typeOfHCP;
-    }
-
-    /**
-     * Sets the value of the typeOfHCP property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setTypeOfHCP(String value) {
-        this.typeOfHCP = value;
-    }
-
-    /**
-     * Gets the value of the nameOfOrganisation property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getNameOfOrganisation() {
-        return nameOfOrganisation;
-    }
-
-    /**
-     * Sets the value of the nameOfOrganisation property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setNameOfOrganisation(String value) {
-        this.nameOfOrganisation = value;
-    }
-
-    /**
-     * Gets the value of the typeOfOrganisation property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getTypeOfOrganisation() {
-        return typeOfOrganisation;
-    }
-
-    /**
-     * Sets the value of the typeOfOrganisation property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setTypeOfOrganisation(String value) {
-        this.typeOfOrganisation = value;
-    }
-
-    /**
-     * Gets the value of the aqaa property.
-     * 
-     */
-    public int getAQAA() {
-        return aqaa;
-    }
-
-    /**
-     * Sets the value of the aqaa property.
-     * 
-     */
-    public void setAQAA(int value) {
-        this.aqaa = value;
-    }
-
-}
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/IsStudentType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/IsStudentType.java
deleted file mode 100644
index 6a7dc838a..000000000
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/IsStudentType.java
+++ /dev/null
@@ -1,146 +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.02.17 at 10:36:59 AM GMT 
-//
-
-
-package eu.stork.peps.complex.attributes;
-
-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 isStudentType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="isStudentType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element ref="{urn:eu:stork:names:tc:STORK:1.0:assertion}study"/>
- *         &lt;element name="nameOfInstitution" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         &lt;element name="course" type="{http://www.w3.org/2001/XMLSchema}integer"/>
- *         &lt;element name="AQAA" type="{urn:eu:stork:names:tc:STORK:1.0:assertion}QualityAuthenticationAssuranceLevelType"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "isStudentType", propOrder = {
-    "study",
-    "nameOfInstitution",
-    "course",
-    "aqaa"
-})
-public class IsStudentType {
-
-    @XmlElement(required = true)
-    protected String study;
-    @XmlElement(required = true)
-    protected String nameOfInstitution;
-    @XmlElement(required = true)
-    protected BigInteger course;
-    @XmlElement(name = "AQAA")
-    protected int aqaa;
-
-    /**
-     * Gets the value of the study property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getStudy() {
-        return study;
-    }
-
-    /**
-     * Sets the value of the study property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setStudy(String value) {
-        this.study = value;
-    }
-
-    /**
-     * Gets the value of the nameOfInstitution property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getNameOfInstitution() {
-        return nameOfInstitution;
-    }
-
-    /**
-     * Sets the value of the nameOfInstitution property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setNameOfInstitution(String value) {
-        this.nameOfInstitution = value;
-    }
-
-    /**
-     * Gets the value of the course property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BigInteger }
-     *     
-     */
-    public BigInteger getCourse() {
-        return course;
-    }
-
-    /**
-     * Sets the value of the course property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BigInteger }
-     *     
-     */
-    public void setCourse(BigInteger value) {
-        this.course = value;
-    }
-
-    /**
-     * Gets the value of the aqaa property.
-     * 
-     */
-    public int getAQAA() {
-        return aqaa;
-    }
-
-    /**
-     * Sets the value of the aqaa property.
-     * 
-     */
-    public void setAQAA(int value) {
-        this.aqaa = value;
-    }
-
-}
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/IsTeacherOfType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/IsTeacherOfType.java
deleted file mode 100644
index 810f652c1..000000000
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/IsTeacherOfType.java
+++ /dev/null
@@ -1,145 +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.02.17 at 10:36:59 AM GMT 
-//
-
-
-package eu.stork.peps.complex.attributes;
-
-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 isTeacherOfType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="isTeacherOfType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="nameOfInstitution" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         &lt;element name="course" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         &lt;element name="role" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         &lt;element name="AQAA" type="{urn:eu:stork:names:tc:STORK:1.0:assertion}QualityAuthenticationAssuranceLevelType"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "isTeacherOfType", propOrder = {
-    "nameOfInstitution",
-    "course",
-    "role",
-    "aqaa"
-})
-public class IsTeacherOfType {
-
-    @XmlElement(required = true)
-    protected String nameOfInstitution;
-    @XmlElement(required = true)
-    protected String course;
-    @XmlElement(required = true)
-    protected String role;
-    @XmlElement(name = "AQAA")
-    protected int aqaa;
-
-    /**
-     * Gets the value of the nameOfInstitution property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getNameOfInstitution() {
-        return nameOfInstitution;
-    }
-
-    /**
-     * Sets the value of the nameOfInstitution property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setNameOfInstitution(String value) {
-        this.nameOfInstitution = value;
-    }
-
-    /**
-     * Gets the value of the course property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getCourse() {
-        return course;
-    }
-
-    /**
-     * Sets the value of the course property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setCourse(String value) {
-        this.course = value;
-    }
-
-    /**
-     * Gets the value of the role property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getRole() {
-        return role;
-    }
-
-    /**
-     * Sets the value of the role property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setRole(String value) {
-        this.role = value;
-    }
-
-    /**
-     * Gets the value of the aqaa property.
-     * 
-     */
-    public int getAQAA() {
-        return aqaa;
-    }
-
-    /**
-     * Sets the value of the aqaa property.
-     * 
-     */
-    public void setAQAA(int value) {
-        this.aqaa = value;
-    }
-
-}
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/MandateContentType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/MandateContentType.java
deleted file mode 100644
index 84ce2727b..000000000
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/MandateContentType.java
+++ /dev/null
@@ -1,233 +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.02.17 at 10:36:59 AM GMT 
-//
-
-
-package eu.stork.peps.complex.attributes;
-
-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 mandateContentType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="mandateContentType">
- *   &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"/>
- *         &lt;element name="validTo" type="{http://www.w3.org/2001/XMLSchema}date"/>
- *         &lt;element name="transactionLimit" type="{http://www.w3.org/2001/XMLSchema}integer"/>
- *         &lt;element name="transactionLimitCurrency" type="{urn:eu:stork:names:tc:STORK:1.0:assertion}currencyType"/>
- *         &lt;element name="isJoint" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         &lt;element name="ischained" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
- *         &lt;element name="typePower" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "mandateContentType", propOrder = {
-    "validFrom",
-    "validTo",
-    "transactionLimit",
-    "transactionLimitCurrency",
-    "isJoint",
-    "ischained",
-    "typePower"
-})
-public class MandateContentType {
-
-    @XmlElement(required = true)
-    @XmlSchemaType(name = "date")
-    protected XMLGregorianCalendar validFrom;
-    @XmlElement(required = true)
-    @XmlSchemaType(name = "date")
-    protected XMLGregorianCalendar validTo;
-    @XmlElement(required = true)
-    protected BigInteger transactionLimit;
-    @XmlElement(required = true)
-    protected String transactionLimitCurrency;
-    @XmlElement(required = true)
-    protected String isJoint;
-    protected boolean ischained;
-    @XmlElement(required = true)
-    protected String 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 transactionLimit property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BigInteger }
-     *     
-     */
-    public BigInteger getTransactionLimit() {
-        return transactionLimit;
-    }
-
-    /**
-     * Sets the value of the transactionLimit property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BigInteger }
-     *     
-     */
-    public void setTransactionLimit(BigInteger value) {
-        this.transactionLimit = value;
-    }
-
-    /**
-     * Gets the value of the transactionLimitCurrency property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getTransactionLimitCurrency() {
-        return transactionLimitCurrency;
-    }
-
-    /**
-     * Sets the value of the transactionLimitCurrency property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setTransactionLimitCurrency(String value) {
-        this.transactionLimitCurrency = value;
-    }
-
-    /**
-     * Gets the value of the isJoint property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getIsJoint() {
-        return isJoint;
-    }
-
-    /**
-     * Sets the value of the isJoint property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setIsJoint(String value) {
-        this.isJoint = value;
-    }
-
-    /**
-     * Gets the value of the ischained property.
-     * 
-     */
-    public boolean isIschained() {
-        return ischained;
-    }
-
-    /**
-     * Sets the value of the ischained property.
-     * 
-     */
-    public void setIschained(boolean value) {
-        this.ischained = value;
-    }
-
-    /**
-     * Gets the value of the typePower property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getTypePower() {
-        return typePower;
-    }
-
-    /**
-     * Sets the value of the typePower property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setTypePower(String value) {
-        this.typePower = value;
-    }
-
-}
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/MandateType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/MandateType.java
deleted file mode 100644
index 26597dc6b..000000000
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/MandateType.java
+++ /dev/null
@@ -1,125 +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.02.17 at 10:36:59 AM GMT 
-//
-
-
-package eu.stork.peps.complex.attributes;
-
-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 mandateType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="mandateType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="represented" type="{urn:eu:stork:names:tc:STORK:1.0:assertion}representationPersonType"/>
- *         &lt;element name="representing" type="{urn:eu:stork:names:tc:STORK:1.0:assertion}representationPersonType"/>
- *         &lt;element name="mandateContent" type="{urn:eu:stork:names:tc:STORK:1.0:assertion}mandateContentType"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "mandateType", propOrder = {
-    "represented",
-    "representing",
-    "mandateContent"
-})
-public class MandateType {
-
-    @XmlElement(required = true)
-    protected RepresentationPersonType represented;
-    @XmlElement(required = true)
-    protected RepresentationPersonType representing;
-    @XmlElement(required = true)
-    protected MandateContentType mandateContent;
-
-    /**
-     * Gets the value of the represented property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link RepresentationPersonType }
-     *     
-     */
-    public RepresentationPersonType getRepresented() {
-        return represented;
-    }
-
-    /**
-     * Sets the value of the represented property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link RepresentationPersonType }
-     *     
-     */
-    public void setRepresented(RepresentationPersonType value) {
-        this.represented = value;
-    }
-
-    /**
-     * Gets the value of the representing property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link RepresentationPersonType }
-     *     
-     */
-    public RepresentationPersonType getRepresenting() {
-        return representing;
-    }
-
-    /**
-     * Sets the value of the representing property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link RepresentationPersonType }
-     *     
-     */
-    public void setRepresenting(RepresentationPersonType value) {
-        this.representing = value;
-    }
-
-    /**
-     * Gets the value of the mandateContent property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link MandateContentType }
-     *     
-     */
-    public MandateContentType getMandateContent() {
-        return mandateContent;
-    }
-
-    /**
-     * Sets the value of the mandateContent property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link MandateContentType }
-     *     
-     */
-    public void setMandateContent(MandateContentType value) {
-        this.mandateContent = value;
-    }
-
-}
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/ObjectFactory.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/ObjectFactory.java
deleted file mode 100644
index f80a4321c..000000000
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/ObjectFactory.java
+++ /dev/null
@@ -1,443 +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.02.17 at 10:36:59 AM GMT 
-//
-
-
-package eu.stork.peps.complex.attributes;
-
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlElementDecl;
-import javax.xml.bind.annotation.XmlRegistry;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import javax.xml.namespace.QName;
-
-
-/**
- * This object contains factory methods for each 
- * Java content interface and Java element interface 
- * generated in the eu.stork.peps.complex.attributes 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 _Habilitation_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "habilitation");
-    private final static QName _HasDegree_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "hasDegree");
-    private final static QName _SpApplication_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "spApplication");
-    private final static QName _Specialisation_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "specialisation");
-    private final static QName _IsStudent_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "isStudent");
-    private final static QName _AQAA_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "AQAA");
-    private final static QName _HCPType_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "HCPType");
-    private final static QName _CanonicalResidenceAddress_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "canonicalResidenceAddress");
-    private final static QName _AcTitle_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "acTitle");
-    private final static QName _QualityAuthenticationAssuranceLevel_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "QualityAuthenticationAssuranceLevel");
-    private final static QName _IsAcademicStaff_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "isAcademicStaff");
-    private final static QName _IsTeacherOf_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "isTeacherOf");
-    private final static QName _IsCourseCoordinator_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "isCourseCoordinator");
-    private final static QName _CanonicalRegisteredAddress_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "canonicalRegisteredAddress");
-    private final static QName _SpCountry_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "spCountry");
-    private final static QName _IsAdminStaff_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "isAdminStaff");
-    private final static QName _CitizenCountryCode_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "CitizenCountryCode");
-    private final static QName _AttributeValue_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "AttributeValue");
-    private final static QName _HasAccountInBank_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "hasAccountInBank");
-    private final static QName _CountryCodeAddress_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "countryCodeAddress");
-    private final static QName _Study_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "study");
-    private final static QName _IsHealthCareProfessional_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "isHealthCareProfessional");
-    private final static QName _Mandate_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "mandate");
-    private final static QName _RequestedAttribute_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "RequestedAttribute");
-    private final static QName _SpSector_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "spSector");
-
-    /**
-     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: eu.stork.peps.complex.attributes
-     * 
-     */
-    public ObjectFactory() {
-    }
-
-    /**
-     * Create an instance of {@link RequestedAttributeType }
-     * 
-     */
-    public RequestedAttributeType createRequestedAttributeType() {
-        return new RequestedAttributeType();
-    }
-
-    /**
-     * Create an instance of {@link MandateType }
-     * 
-     */
-    public MandateType createMandateType() {
-        return new MandateType();
-    }
-
-    /**
-     * Create an instance of {@link HasAccountInBankType }
-     * 
-     */
-    public HasAccountInBankType createHasAccountInBankType() {
-        return new HasAccountInBankType();
-    }
-
-    /**
-     * Create an instance of {@link IsHealthCareProfessionalType }
-     * 
-     */
-    public IsHealthCareProfessionalType createIsHealthCareProfessionalType() {
-        return new IsHealthCareProfessionalType();
-    }
-
-    /**
-     * Create an instance of {@link IsAdminStaffType }
-     * 
-     */
-    public IsAdminStaffType createIsAdminStaffType() {
-        return new IsAdminStaffType();
-    }
-
-    /**
-     * Create an instance of {@link CanonicalAddressType }
-     * 
-     */
-    public CanonicalAddressType createCanonicalAddressType() {
-        return new CanonicalAddressType();
-    }
-
-    /**
-     * Create an instance of {@link IsCourseCoordinatorType }
-     * 
-     */
-    public IsCourseCoordinatorType createIsCourseCoordinatorType() {
-        return new IsCourseCoordinatorType();
-    }
-
-    /**
-     * Create an instance of {@link IsAcademicStaffType }
-     * 
-     */
-    public IsAcademicStaffType createIsAcademicStaffType() {
-        return new IsAcademicStaffType();
-    }
-
-    /**
-     * Create an instance of {@link IsTeacherOfType }
-     * 
-     */
-    public IsTeacherOfType createIsTeacherOfType() {
-        return new IsTeacherOfType();
-    }
-
-    /**
-     * Create an instance of {@link AcTitleType }
-     * 
-     */
-    public AcTitleType createAcTitleType() {
-        return new AcTitleType();
-    }
-
-    /**
-     * Create an instance of {@link IsStudentType }
-     * 
-     */
-    public IsStudentType createIsStudentType() {
-        return new IsStudentType();
-    }
-
-    /**
-     * Create an instance of {@link HasDegreeType }
-     * 
-     */
-    public HasDegreeType createHasDegreeType() {
-        return new HasDegreeType();
-    }
-
-    /**
-     * Create an instance of {@link HabilitationType }
-     * 
-     */
-    public HabilitationType createHabilitationType() {
-        return new HabilitationType();
-    }
-
-    /**
-     * Create an instance of {@link MandateContentType }
-     * 
-     */
-    public MandateContentType createMandateContentType() {
-        return new MandateContentType();
-    }
-
-    /**
-     * Create an instance of {@link RepresentationPersonType }
-     * 
-     */
-    public RepresentationPersonType createRepresentationPersonType() {
-        return new RepresentationPersonType();
-    }
-
-    /**
-     * Create an instance of {@link Habilitation }
-     * 
-     */
-    public Habilitation createHabilitation() {
-        return new Habilitation();
-    }
-
-    /**
-     * Create an instance of {@link IsHCPType }
-     * 
-     */
-    public IsHCPType createIsHCPType() {
-        return new IsHCPType();
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link HabilitationType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "habilitation")
-    public JAXBElement<HabilitationType> createHabilitation(HabilitationType value) {
-        return new JAXBElement<HabilitationType>(_Habilitation_QNAME, HabilitationType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link HasDegreeType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "hasDegree")
-    public JAXBElement<HasDegreeType> createHasDegree(HasDegreeType value) {
-        return new JAXBElement<HasDegreeType>(_HasDegree_QNAME, HasDegreeType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "spApplication")
-    public JAXBElement<String> createSpApplication(String value) {
-        return new JAXBElement<String>(_SpApplication_QNAME, String.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "specialisation")
-    public JAXBElement<String> createSpecialisation(String value) {
-        return new JAXBElement<String>(_Specialisation_QNAME, String.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link IsStudentType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "isStudent")
-    public JAXBElement<IsStudentType> createIsStudent(IsStudentType value) {
-        return new JAXBElement<IsStudentType>(_IsStudent_QNAME, IsStudentType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link Integer }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "AQAA")
-    public JAXBElement<Integer> createAQAA(Integer value) {
-        return new JAXBElement<Integer>(_AQAA_QNAME, Integer.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "HCPType")
-    public JAXBElement<String> createHCPType(String value) {
-        return new JAXBElement<String>(_HCPType_QNAME, String.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CanonicalAddressType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "canonicalResidenceAddress")
-    public JAXBElement<CanonicalAddressType> createCanonicalResidenceAddress(CanonicalAddressType value) {
-        return new JAXBElement<CanonicalAddressType>(_CanonicalResidenceAddress_QNAME, CanonicalAddressType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link AcTitleType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "acTitle")
-    public JAXBElement<AcTitleType> createAcTitle(AcTitleType value) {
-        return new JAXBElement<AcTitleType>(_AcTitle_QNAME, AcTitleType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link Integer }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "QualityAuthenticationAssuranceLevel")
-    public JAXBElement<Integer> createQualityAuthenticationAssuranceLevel(Integer value) {
-        return new JAXBElement<Integer>(_QualityAuthenticationAssuranceLevel_QNAME, Integer.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link IsAcademicStaffType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "isAcademicStaff")
-    public JAXBElement<IsAcademicStaffType> createIsAcademicStaff(IsAcademicStaffType value) {
-        return new JAXBElement<IsAcademicStaffType>(_IsAcademicStaff_QNAME, IsAcademicStaffType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link IsTeacherOfType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "isTeacherOf")
-    public JAXBElement<IsTeacherOfType> createIsTeacherOf(IsTeacherOfType value) {
-        return new JAXBElement<IsTeacherOfType>(_IsTeacherOf_QNAME, IsTeacherOfType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link IsCourseCoordinatorType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "isCourseCoordinator")
-    public JAXBElement<IsCourseCoordinatorType> createIsCourseCoordinator(IsCourseCoordinatorType value) {
-        return new JAXBElement<IsCourseCoordinatorType>(_IsCourseCoordinator_QNAME, IsCourseCoordinatorType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CanonicalAddressType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "canonicalRegisteredAddress")
-    public JAXBElement<CanonicalAddressType> createCanonicalRegisteredAddress(CanonicalAddressType value) {
-        return new JAXBElement<CanonicalAddressType>(_CanonicalRegisteredAddress_QNAME, CanonicalAddressType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "spCountry")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    public JAXBElement<String> createSpCountry(String value) {
-        return new JAXBElement<String>(_SpCountry_QNAME, String.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link IsAdminStaffType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "isAdminStaff")
-    public JAXBElement<IsAdminStaffType> createIsAdminStaff(IsAdminStaffType value) {
-        return new JAXBElement<IsAdminStaffType>(_IsAdminStaff_QNAME, IsAdminStaffType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "CitizenCountryCode")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    public JAXBElement<String> createCitizenCountryCode(String value) {
-        return new JAXBElement<String>(_CitizenCountryCode_QNAME, String.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link Object }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "AttributeValue")
-    public JAXBElement<Object> createAttributeValue(Object value) {
-        return new JAXBElement<Object>(_AttributeValue_QNAME, Object.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link HasAccountInBankType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "hasAccountInBank")
-    public JAXBElement<HasAccountInBankType> createHasAccountInBank(HasAccountInBankType value) {
-        return new JAXBElement<HasAccountInBankType>(_HasAccountInBank_QNAME, HasAccountInBankType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "countryCodeAddress")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    public JAXBElement<String> createCountryCodeAddress(String value) {
-        return new JAXBElement<String>(_CountryCodeAddress_QNAME, String.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "study")
-    public JAXBElement<String> createStudy(String value) {
-        return new JAXBElement<String>(_Study_QNAME, String.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link IsHealthCareProfessionalType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "isHealthCareProfessional")
-    public JAXBElement<IsHealthCareProfessionalType> createIsHealthCareProfessional(IsHealthCareProfessionalType value) {
-        return new JAXBElement<IsHealthCareProfessionalType>(_IsHealthCareProfessional_QNAME, IsHealthCareProfessionalType.class, null, value);
-    }
-
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link IsHealthCareProfessionalType }{@code >}}
-     *
-     */
-    @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "isHealthCareProfessional")
-    public JAXBElement<IsHealthCareProfessionalDeprecatedType> createIsHealthCareProfessional(IsHealthCareProfessionalDeprecatedType value) {
-        return new JAXBElement<IsHealthCareProfessionalDeprecatedType>(_IsHealthCareProfessional_QNAME, IsHealthCareProfessionalDeprecatedType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link MandateType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "mandate")
-    public JAXBElement<MandateType> createMandate(MandateType value) {
-        return new JAXBElement<MandateType>(_Mandate_QNAME, MandateType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link RequestedAttributeType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "RequestedAttribute")
-    public JAXBElement<RequestedAttributeType> createRequestedAttribute(RequestedAttributeType value) {
-        return new JAXBElement<RequestedAttributeType>(_RequestedAttribute_QNAME, RequestedAttributeType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "spSector")
-    public JAXBElement<String> createSpSector(String value) {
-        return new JAXBElement<String>(_SpSector_QNAME, String.class, null, value);
-    }
-
-}
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/RepresentationPersonType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/RepresentationPersonType.java
deleted file mode 100644
index b1d993f89..000000000
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/RepresentationPersonType.java
+++ /dev/null
@@ -1,289 +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.02.17 at 10:36:59 AM GMT 
-//
-
-
-package eu.stork.peps.complex.attributes;
-
-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 representationPersonType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="representationPersonType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;choice>
- *         &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}string"/>
- *         &lt;/sequence>
- *         &lt;sequence>
- *           &lt;element name="eLPIdentifier" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *           &lt;element name="name" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *           &lt;element name="address" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *           &lt;element name="canonicalAddress" type="{urn:eu:stork:names:tc:STORK:1.0:assertion}canonicalAddressType"/>
- *           &lt;element name="type" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         &lt;/sequence>
- *       &lt;/choice>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "representationPersonType", propOrder = {
-    "eIdentifier",
-    "givenName",
-    "surname",
-    "dateOfBirth",
-    "elpIdentifier",
-    "name",
-    "address",
-    "canonicalAddress",
-    "type"
-})
-public class RepresentationPersonType {
-
-    protected String eIdentifier;
-    protected String givenName;
-    protected String surname;
-    protected String dateOfBirth;
-    @XmlElement(name = "eLPIdentifier")
-    protected String elpIdentifier;
-    protected String name;
-    protected String address;
-    protected CanonicalAddressType canonicalAddress;
-    protected String type;
-
-    /**
-     * 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 String }
-     *     
-     */
-    public String getDateOfBirth() {
-        return dateOfBirth;
-    }
-
-    /**
-     * Sets the value of the dateOfBirth property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setDateOfBirth(String value) {
-        this.dateOfBirth = value;
-    }
-
-    /**
-     * 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 name property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getName() {
-        return name;
-    }
-
-    /**
-     * Sets the value of the name property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setName(String value) {
-        this.name = value;
-    }
-
-    /**
-     * Gets the value of the address property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getAddress() {
-        return address;
-    }
-
-    /**
-     * Sets the value of the address property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setAddress(String value) {
-        this.address = value;
-    }
-
-    /**
-     * Gets the value of the canonicalAddress property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link CanonicalAddressType }
-     *     
-     */
-    public CanonicalAddressType getCanonicalAddress() {
-        return canonicalAddress;
-    }
-
-    /**
-     * Sets the value of the canonicalAddress property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link CanonicalAddressType }
-     *     
-     */
-    public void setCanonicalAddress(CanonicalAddressType value) {
-        this.canonicalAddress = 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/RequestedAttributeType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/RequestedAttributeType.java
deleted file mode 100644
index 6a7c0b443..000000000
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/RequestedAttributeType.java
+++ /dev/null
@@ -1,212 +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.02.17 at 10:36:59 AM GMT 
-//
-
-
-package eu.stork.peps.complex.attributes;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyAttribute;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.namespace.QName;
-
-
-/**
- * <p>Java class for RequestedAttributeType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="RequestedAttributeType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element ref="{urn:eu:stork:names:tc:STORK:1.0:assertion}AttributeValue" maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *       &lt;attribute name="Name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="NameFormat" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *       &lt;attribute name="FriendlyName" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="isRequired" type="{http://www.w3.org/2001/XMLSchema}boolean" />
- *       &lt;anyAttribute processContents='lax' namespace='##other'/>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "RequestedAttributeType", propOrder = {
-    "attributeValue"
-})
-public class RequestedAttributeType {
-
-    @XmlElement(name = "AttributeValue")
-    protected List<Object> attributeValue;
-    @XmlAttribute(name = "Name", required = true)
-    protected String name;
-    @XmlAttribute(name = "NameFormat", required = true)
-    @XmlSchemaType(name = "anyURI")
-    protected String nameFormat;
-    @XmlAttribute(name = "FriendlyName")
-    protected String friendlyName;
-    @XmlAttribute(name = "isRequired")
-    protected Boolean isRequired;
-    @XmlAnyAttribute
-    private Map<QName, String> otherAttributes = new HashMap<QName, String>();
-
-    /**
-     * Gets the value of the attributeValue 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 attributeValue property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAttributeValue().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAttributeValue() {
-        if (attributeValue == null) {
-            attributeValue = new ArrayList<Object>();
-        }
-        return this.attributeValue;
-    }
-
-    /**
-     * Gets the value of the name property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getName() {
-        return name;
-    }
-
-    /**
-     * Sets the value of the name property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setName(String value) {
-        this.name = value;
-    }
-
-    /**
-     * Gets the value of the nameFormat property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getNameFormat() {
-        return nameFormat;
-    }
-
-    /**
-     * Sets the value of the nameFormat property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setNameFormat(String value) {
-        this.nameFormat = value;
-    }
-
-    /**
-     * Gets the value of the friendlyName property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getFriendlyName() {
-        return friendlyName;
-    }
-
-    /**
-     * Sets the value of the friendlyName property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setFriendlyName(String value) {
-        this.friendlyName = value;
-    }
-
-    /**
-     * Gets the value of the isRequired property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Boolean }
-     *     
-     */
-    public Boolean isIsRequired() {
-        return isRequired;
-    }
-
-    /**
-     * Sets the value of the isRequired property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Boolean }
-     *     
-     */
-    public void setIsRequired(Boolean value) {
-        this.isRequired = value;
-    }
-
-    /**
-     * Gets a map that contains attributes that aren't bound to any typed property on this class.
-     * 
-     * <p>
-     * the map is keyed by the name of the attribute and 
-     * the value is the string value of the attribute.
-     * 
-     * the map returned by this method is live, and you can add new attribute
-     * by updating the map directly. Because of this design, there's no setter.
-     * 
-     * 
-     * @return
-     *     always non-null
-     */
-    public Map<QName, String> getOtherAttributes() {
-        return otherAttributes;
-    }
-
-}
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/package-info.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/package-info.java
deleted file mode 100644
index 47e225d22..000000000
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/package-info.java
+++ /dev/null
@@ -1,9 +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.02.17 at 10:36:59 AM GMT 
-//
-
-@javax.xml.bind.annotation.XmlSchema(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
-package eu.stork.peps.complex.attributes;
diff --git a/id/server/stork2-commons/src/main/resources/.svn/entries b/id/server/stork2-commons/src/main/resources/.svn/entries
index 3cafa50cf..e8296f4cd 100644
--- a/id/server/stork2-commons/src/main/resources/.svn/entries
+++ b/id/server/stork2-commons/src/main/resources/.svn/entries
@@ -26,17 +26,17 @@ emrepisja
 
 aa842e49-f825-43fc-93ba-11ee9fd5a035
 
-log4j.xml
+StorkcomplexAttributes.xsd
 file
 
 
 
-
-2013-12-20T12:27:56.554475Z
-aa8c46e41a236b8c7049713b3eeecc49
-2013-07-25T08:54:09.995385Z
-7
-emsomavmi
+delete
+2014-03-05T09:36:07.834515Z
+312be97fd22ecb2f274bf9fdebd85b29
+2014-03-04T14:10:03.192908Z
+721
+emrepisja
 
 
 
@@ -58,19 +58,19 @@ emsomavmi
 
 
 
-660
+10938
 
-StorkcomplexAttributes.xsd
+log4j.xml
 file
 
 
 
 
-2014-03-05T09:36:07.834515Z
-312be97fd22ecb2f274bf9fdebd85b29
-2014-03-04T14:10:03.192908Z
-721
-emrepisja
+2013-12-20T12:27:56.554475Z
+aa8c46e41a236b8c7049713b3eeecc49
+2013-07-25T08:54:09.995385Z
+7
+emsomavmi
 
 
 
@@ -92,5 +92,5 @@ emrepisja
 
 
 
-10938
+660
 
diff --git a/id/server/stork2-commons/src/main/resources/StorkcomplexAttributes.xsd b/id/server/stork2-commons/src/main/resources/StorkcomplexAttributes.xsd
deleted file mode 100644
index ab9e89712..000000000
--- a/id/server/stork2-commons/src/main/resources/StorkcomplexAttributes.xsd
+++ /dev/null
@@ -1,338 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema elementFormDefault="qualified"
-	targetNamespace="urn:eu:stork:names:tc:STORK:1.0:assertion" 
-	xmlns:xs="http://www.w3.org/2001/XMLSchema"
-	xmlns:storkp="urn:eu:stork:names:tc:STORK:1.0:protocol" 
-	xmlns:stork="urn:eu:stork:names:tc:STORK:1.0:assertion">
-	<!--QAA -->
-	<xs:element name="QualityAuthenticationAssuranceLevel"
-		type="stork:QualityAuthenticationAssuranceLevelType" />
-	<xs:element name="spSector" type="stork:SPSectorType" />
-	<xs:element name="spApplication" type="stork:SPApplicationType" />
-	<xs:element name="spCountry" type="stork:CountryCodeType" />
-	<xs:element name="CitizenCountryCode" type="stork:CountryCodeType" />
-	<xs:element name="RequestedAttribute" type="stork:RequestedAttributeType" />
-	<xs:element name="AttributeValue" type="xs:anyType" />
-	<xs:element name="canonicalResidenceAddress" type="stork:canonicalAddressType" />
-	<xs:element name="countryCodeAddress" type="stork:CountryCodeType" />
-
-	<xs:element name="hasDegree" type="stork:hasDegreeType" />
-	<xs:element name="isStudent" type="stork:isStudentType" />
-	<xs:element name="isAcademicStaff" type="stork:isAcademicStaffType" />
-	<xs:element name="isTeacherOf" type="stork:isTeacherOfType" />
-	<xs:element name="isCourseCoordinator" type="stork:isCourseCoordinatorType" />
-	<xs:element name="isAdminStaff" type="stork:isAdminStaffType" />
-	<xs:element name="habilitation" type="stork:habilitationType" />
-	<xs:element name="acTitle" type="stork:acTitleType" />
-	<xs:element name="hasAccountInBank" type="stork:hasAccountInBankType" />
-	<xs:element name="isHealthCareProfessional" type="stork:isHealthCareProfessionalType" />
-	<xs:element name="canonicalRegisteredAddress" type="stork:canonicalAddressType" />
-	<xs:element name="AQAA"
-		type="stork:QualityAuthenticationAssuranceLevelType" />
-	<xs:element name="mandate" type="stork:mandateType" />
-	<xs:element name="study" type="stork:studyType" />
-	<xs:element name="HCPType" type="stork:HCPType" />
-	<xs:element name="isHealthCareProfessional_deprecated" type="stork:isHealthCareProfessional_deprecatedType" />
-
-	<xs:attribute name="AttributeStatus" type="stork:AttributeStatusType" />
-
-	<xs:simpleType name="SPSectorType">
-		<xs:restriction base="xs:string">
-			<xs:minLength value="1" />
-			<xs:maxLength value="20" />
-		</xs:restriction>
-	</xs:simpleType>
-
-	<xs:simpleType name="SPApplicationType">
-		<xs:restriction base="xs:string">
-			<xs:minLength value="1" />
-			<xs:maxLength value="100" />
-		</xs:restriction>
-	</xs:simpleType>
-
-	<xs:simpleType name="AttributeStatusType">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="Available" />
-			<xs:enumeration value="NotAvailable" />
-			<xs:enumeration value="Withheld" />
-		</xs:restriction>
-	</xs:simpleType>
-
-	<xs:simpleType name="studyType">
-		<xs:restriction base="xs:string">
-			<xs:minLength value="2" />
-			<xs:maxLength value="5" />
-		</xs:restriction>
-	</xs:simpleType>
-
-	<xs:simpleType name="LevelType">
-		<xs:restriction base="xs:string">
-			<xs:minLength value="1" />
-			<xs:maxLength value="1" />
-		</xs:restriction>
-	</xs:simpleType>
-
-	<xs:simpleType name="currencyType">
-		<xs:restriction base="xs:string">
-			<xs:minLength value="3" />
-			<xs:maxLength value="3" />
-		</xs:restriction>
-	</xs:simpleType>
-
-	<xs:simpleType name="occupationType">
-		<xs:restriction base="xs:string">
-			<xs:minLength value="1" />
-			<xs:maxLength value="1" />
-		</xs:restriction>
-	</xs:simpleType>
-
-	<xs:simpleType name="titleNormalisedType">
-		<xs:restriction base="xs:string">
-			<xs:minLength value="1" />
-			<xs:maxLength value="1" />
-		</xs:restriction>
-	</xs:simpleType>
-
-	<xs:simpleType name="HCPType">
-		<xs:restriction base="xs:string">
-			<xs:minLength value="1" />
-			<xs:maxLength value="1" />
-		</xs:restriction>
-	</xs:simpleType>
-
-	<xs:simpleType name="specialisationType">
-		<xs:restriction base="xs:string">
-			<xs:minLength value="1" />
-			<xs:maxLength value="1" />
-		</xs:restriction>
-	</xs:simpleType>
-
-
-	<xs:simpleType name="QualityAuthenticationAssuranceLevelType">
-		<xs:restriction base="xs:integer">
-			<xs:minInclusive value="1" />
-			<xs:maxInclusive value="4" />
-		</xs:restriction>
-	</xs:simpleType>
-
-	<xs:complexType name="canonicalAddressType">
-		<xs:sequence>
-			<xs:element name="countryCodeAddress" type="stork:CountryCodeType" />
-			<xs:element name="state" type="xs:string" minOccurs="0" />
-			<xs:element name="municipalityCode" type="xs:string"
-				minOccurs="0" />
-			<xs:element name="town" type="xs:string" />
-			<xs:element name="postalCode" type="xs:string" />
-			<xs:element name="streetName" type="xs:string" />
-			<xs:element name="streetNumber" type="xs:string"
-				minOccurs="0" />
-			<xs:element name="apartmentNumber" type="xs:string"
-				minOccurs="0" />
-		</xs:sequence>
-	</xs:complexType>
-
-	<xs:complexType name="hasDegreeType">
-		<xs:sequence>
-			<xs:element name="study" type="stork:studyType" />
-			<xs:element name="level" type="stork:LevelType" />
-			<xs:element name="yearObtained" type="xs:integer" />
-			<xs:element name="nameOfInstitution" type="xs:string" />
-			<xs:element name="AQAA"
-				type="stork:QualityAuthenticationAssuranceLevelType" />
-		</xs:sequence>
-	</xs:complexType>
-
-	<xs:complexType name="isAcademicStaffType">
-		<xs:sequence>
-			<xs:element name="nameOfInstitution" type="xs:string" />
-			<xs:element name="occupation" type="stork:occupationType" />
-			<xs:element name="knowledgearea" type="xs:string" />
-			<xs:element name="AQAA"
-				type="stork:QualityAuthenticationAssuranceLevelType" />
-		</xs:sequence>
-	</xs:complexType>
-
-	<xs:complexType name="isTeacherOfType">
-		<xs:sequence>
-			<xs:element name="nameOfInstitution" type="xs:string" />
-			<xs:element name="course" type="xs:string" />
-			<xs:element name="role" type="xs:string" />
-			<xs:element name="AQAA"
-				type="stork:QualityAuthenticationAssuranceLevelType" />
-		</xs:sequence>
-	</xs:complexType>
-
-	<xs:complexType name="isCourseCoordinatorType">
-		<xs:sequence>
-			<xs:element name="courseCoodinator" type="xs:string" />
-			<xs:element name="AQAA"
-				type="stork:QualityAuthenticationAssuranceLevelType" />
-		</xs:sequence>
-	</xs:complexType>
-
-	<xs:complexType name="isAdminStaffType">
-		<xs:sequence>
-			<xs:element name="adminStaff" type="xs:string" />
-			<xs:element name="AQAA"
-				type="stork:QualityAuthenticationAssuranceLevelType" />
-		</xs:sequence>
-	</xs:complexType>
-
-	<xs:complexType name="habilitation">
-		<xs:sequence>
-			<xs:element name="ability" type="xs:string" />
-			<xs:element name="AQAA"
-				type="stork:QualityAuthenticationAssuranceLevelType" />
-		</xs:sequence>
-	</xs:complexType>
-
-	<xs:complexType name="acTitleType">
-		<xs:sequence>
-			<xs:element name="titleNormalised" type="stork:titleNormalisedType" />
-			<xs:element name="AQAA"
-				type="stork:QualityAuthenticationAssuranceLevelType" />
-		</xs:sequence>
-	</xs:complexType>
-
-	<xs:complexType name="hasAccountInBankType">
-		<xs:sequence>
-			<xs:element name="bankName" type="xs:string" />
-			<xs:element name="AQAA"
-				type="stork:QualityAuthenticationAssuranceLevelType" />
-		</xs:sequence>
-	</xs:complexType>
-
-	<xs:complexType name="isHCPType">
-		<xs:sequence>
-			<xs:element name="nameOfOrganisation" type="xs:string" />
-			<xs:element name="HCPType" type="stork:HCPType" />
-			<xs:element name="specialisation" type="stork:specialisationType" />
-			<xs:element name="AQAA"
-				type="stork:QualityAuthenticationAssuranceLevelType" />
-		</xs:sequence>
-	</xs:complexType>
-
-	<xs:complexType name="representationPersonType">
-		<xs:choice>
-			<xs:sequence>
-				<xs:element name="eIdentifier" type="xs:string" />
-				<xs:element name="givenName" type="xs:string" />
-				<xs:element name="surname" type="xs:string" />
-				<xs:element name="dateOfBirth" type="xs:string" />
-			</xs:sequence>
-			<xs:sequence>
-				<xs:element name="eLPIdentifier" type="xs:string" />
-				<xs:element name="name" type="xs:string" />
-				<xs:element name="address" type="xs:string" />
-				<xs:element name="canonicalAddress" type="stork:canonicalAddressType" />
-				<xs:element name="type" type="xs:string" />
-			</xs:sequence>
-		</xs:choice>
-	</xs:complexType>
-
-	<xs:complexType name="mandateType">
-		<xs:sequence>
-			<xs:element name="represented" type="stork:representationPersonType" />
-			<xs:element name="representing" type="stork:representationPersonType" />
-			<xs:element name="mandateContent" type="stork:mandateContentType" />
-		</xs:sequence>
-	</xs:complexType>
-
-	<xs:complexType name="mandateContentType">
-		<xs:sequence>
-			<xs:element name="validFrom" type="xs:date" />
-			<xs:element name="validTo" type="xs:date" />
-			<xs:element name="transactionLimit" type="xs:integer" />
-			<xs:element name="transactionLimitCurrency" type="stork:currencyType" />
-			<xs:element name="isJoint" type="xs:string" />
-			<xs:element name="ischained" type="xs:boolean" />
-			<xs:element name="typePower" type="xs:string" />
-		</xs:sequence>
-	</xs:complexType>
-
-	<xs:simpleType name="CountryCodeType">
-		<xs:restriction base="xs:token">
-			<xs:pattern value="[A-Z]{2}" />
-		</xs:restriction>
-	</xs:simpleType>
-
-	<xs:complexType name="RequestedAttributeType">
-		<xs:sequence>
-			<xs:element minOccurs="0" maxOccurs="unbounded" ref="stork:AttributeValue" />
-		</xs:sequence>
-		<xs:attribute name="Name" use="required" type="xs:string" />
-		<xs:attribute name="NameFormat" use="required" type="xs:anyURI" />
-		<xs:attribute name="FriendlyName" use="optional" type="xs:string" />
-		<xs:attribute name="isRequired" use="optional" type="xs:boolean" />
-		<xs:anyAttribute namespace="##other" processContents="lax" />
-	</xs:complexType>
-
-	<xs:complexType name="isStudentType">
-		<xs:sequence>
-			<xs:element ref="stork:study" />
-			<xs:element name="nameOfInstitution" type="xs:string" />
-			<xs:element name="course" type="xs:integer" />
-			<xs:element name="AQAA"
-				type="stork:QualityAuthenticationAssuranceLevelType" />
-		</xs:sequence>
-	</xs:complexType>
-
-	<xs:complexType name="habilitationType">
-		<xs:sequence>
-			<xs:element name="ability" type="xs:string" />
-			<xs:element name="AQAA"
-				type="stork:QualityAuthenticationAssuranceLevelType" />
-		</xs:sequence>
-	</xs:complexType>
-
-	<xs:complexType name="isHealthCareProfessional_deprecatedType">
-		<xs:sequence>
-			<xs:element name="nameOfOrganisation" type="xs:string" />
-			<xs:element ref="stork:HCPType" />
-			<xs:element ref="stork:specialisation" />
-			<xs:element name="AQAA"
-				type="stork:QualityAuthenticationAssuranceLevelType" />
-		</xs:sequence>
-	</xs:complexType>
-
-	<xs:element name="specialisation" type="stork:specialisationType" />
-	<xs:simpleType name="medical">
-		<xs:restriction base="xs:string">
-			<xs:maxLength value="2" />
-			<xs:minLength value="2" />
-		</xs:restriction>
-	</xs:simpleType>
-
-	<xs:complexType name="isHealthCareProfessionalType">
-		<xs:sequence>
-			<xs:element name="typeOfHCP">
-				<xs:simpleType>
-					<xs:restriction base="xs:anyURI">
-						<xs:enumeration value="dentist" />
-						<xs:enumeration value="nurse" />
-						<xs:enumeration value="pharmacist" />
-						<xs:enumeration value="physician" />
-						<xs:enumeration value="nurse midwife" />
-						<xs:enumeration value="admission clerk" />
-						<xs:enumeration value="ancillary services" />
-						<xs:enumeration value="clinical services" />
-					</xs:restriction>
-				</xs:simpleType>
-			</xs:element>
-			<xs:element name="nameOfOrganisation" type="xs:string" />
-			<xs:element name="typeOfOrganisation">
-				<xs:simpleType>
-					<xs:restriction base="xs:anyURI">
-						<xs:enumeration value="Hospital" />
-						<xs:enumeration value="Resident Physician" />
-						<xs:enumeration value="Pharmacy" />
-						<xs:enumeration value="Other" />
-						<xs:enumeration value="Unknown" />
-					</xs:restriction>
-				</xs:simpleType>
-			</xs:element>
-			<xs:element name="AQAA" type="stork:QualityAuthenticationAssuranceLevelType" />
-		</xs:sequence>
-	</xs:complexType>
-
-</xs:schema>
diff --git a/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/ComplexAttributesMarshalling.java b/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/ComplexAttributesMarshalling.java
index d411a2f42..fc6e65f70 100644
--- a/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/ComplexAttributesMarshalling.java
+++ b/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/ComplexAttributesMarshalling.java
@@ -1,22 +1,11 @@
 /*
- * This work is Open Source and licensed by the European Commission under the
- * conditions of the European Public License v1.1 
- *  
- * (http://www.osor.eu/eupl/european-union-public-licence-eupl-v.1.1); 
- * 
- * any use of this file implies acceptance of the conditions of this license. 
- * Unless required by applicable law or agreed to in writing, software 
- * distributed under the License is distributed on an "AS IS" BASIS,  WITHOUT 
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the 
- * License for the specific language governing permissions and limitations 
- * under the License.
- * 
- * ---
- * 
- * Test cases for marshalling complex attributes.
- * 
- * Implemented are two testcases for marshalling and unmarshalling.  These testcases are
- * for canonical residenc address and has bank account.
+ * This work is Open Source and licensed by the European Commission under the conditions of the European Public License
+ * v1.1 (http://www.osor.eu/eupl/european-union-public-licence-eupl-v.1.1); any use of this file implies acceptance of
+ * the conditions of this license. Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ * implied. See the License for the specific language governing permissions and limitations under the License. --- Test
+ * cases for marshalling complex attributes. Implemented are two testcases for marshalling and unmarshalling. These
+ * testcases are for canonical residenc address and has bank account.
  */
 
 package eu.stork.peps.tests;
@@ -24,6 +13,7 @@ package eu.stork.peps.tests;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
+import java.io.StringWriter;
 
 import javax.xml.bind.JAXBContext;
 import javax.xml.bind.JAXBElement;
@@ -32,38 +22,55 @@ import javax.xml.bind.Marshaller;
 import javax.xml.bind.Unmarshaller;
 import javax.xml.transform.stream.StreamSource;
 
+import org.joda.time.DateTime;
 import org.junit.Test;
 
-import eu.stork.peps.complex.attributes.CanonicalAddressType;
-import eu.stork.peps.complex.attributes.HasAccountInBankType;
-import eu.stork.peps.complex.attributes.ObjectFactory;
+import eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._1_0.assertion.CanonicalAddressType;
+import eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._1_0.assertion.HasAccountInBankType;
+import eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._1_0.assertion.MandateContentType;
+import eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._1_0.assertion.MandateType;
+import eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._1_0.assertion.ObjectFactory;
+import eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._1_0.assertion.RepresentationPersonType;
 
 /**
- * @author Advania
- * 
- * Examples on how to use the jaxb marshaller.
- * 
- * The classes are created from the StorkcomplexAttributes.xsd schema located in resources.
- * 
+ * @author Advania Examples on how to use the jaxb marshaller. The classes are created from the
+ *         StorkcomplexAttributes.xsd schema located in resources.
  * @version $Revision: 1.00 $, $Date: 2014-17-02 11:15:00 $ 
  *
  */
 
 public class ComplexAttributesMarshalling {
 
+    MandateContentType       mtObject  = new MandateContentType();
+    RepresentationPersonType rpObject  = new RepresentationPersonType();
+    RepresentationPersonType rptObject = new RepresentationPersonType();
+
+    void initMandateValues() {
+        // Fill in the information ...
+        mtObject.setIsChained(false);
+        // mtObject.setIsJoined("IsJoined");
+        mtObject.setTypeOfPower("The Force");
+        mtObject.setIsChained(false);
+        // ... fill in info for the representative
+        rpObject.setTextRegisteredAddress("Address at some street");
+        rpObject.setDateOfBirth(DateTime.now().toString());
+        rpObject.setEIdentifier("123456");
+        rpObject.setGivenName("Name of some person");
+        rpObject.setLegalForm("Type of person");
+        // .... fill in the info for the represented
+        rptObject.setTextRegisteredAddress("Another Address at some street");
+        rptObject.setDateOfBirth(DateTime.now().toString());
+        rptObject.setEIdentifier("654321");
+        rptObject.setGivenName("Another Name of some person");
+        rptObject.setLegalForm("Yet another type of person");
+    }
+
 	/**
-	 * Test marshalling canonical address
-	 * <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+     * Test marshalling canonical address <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 	 *  <canonicalResidenceAddress xmlns="urn:eu:stork:names:tc:STORK:1.0:assertion">
-	 *   <countryCodeAddress>IS</countryCodeAddress>
-	 *   <state>Reykjavik</state>
-	 *   <municipalityCode>RVK</municipalityCode>
-	 *   <town>Reykjavik</town>
-	 *   <postalCode>101</postalCode>
-	 *   <streetName>Laugavegur</streetName>
-	 *   <streetNumber>1</streetNumber>
-	 *   <apartmentNumber>10</apartmentNumber>
-	 *	</canonicalResidenceAddress>
+     * <countryCodeAddress>IS</countryCodeAddress> <state>Reykjavik</state> <municipalityCode>RVK</municipalityCode>
+     * <town>Reykjavik</town> <postalCode>101</postalCode> <streetName>Laugavegur</streetName>
+     * <streetNumber>1</streetNumber> <apartmentNumber>10</apartmentNumber> </canonicalResidenceAddress>
 	 */
 	@Test
 	public void testMarshallCanonicalResidencAddress() 
@@ -88,30 +95,133 @@ public class ComplexAttributesMarshalling {
 		    m.marshal(objf.createCanonicalResidenceAddress(object), new FileOutputStream("CanonicalAddressType.xml"));		    
 			m.marshal(objf.createCanonicalResidenceAddress(object), System.out);
 		}
-		catch (JAXBException e ) 
-		{
-			e.printStackTrace();
-			
-		} catch (FileNotFoundException e) {
+        catch ( Exception e ) {
 			e.printStackTrace();
+        }
+    }
+
+    @Test
+    public void testForDiana() {
+        initMandateValues();
 			
+        try {
+            // Create the marshallers'
+
+            final JAXBContext mandateTypeContext = JAXBContext.newInstance(MandateType.class);
+            final Marshaller mandateMarshaller = mandateTypeContext.createMarshaller();
+            final Unmarshaller mandateUnmarshaller = mandateTypeContext.createUnmarshaller();
+
+            // final JAXBContext MandateContentTypecontext = JAXBContext.newInstance(MandateContentType.class);
+            // final Marshaller mandM = MandateContentTypecontext.createMarshaller();
+            //
+            // final JAXBContext RepresentationPersonTypecontext =
+            // JAXBContext.newInstance(RepresentationPersonType.class);
+            // final Marshaller repM = RepresentationPersonTypecontext.createMarshaller();
+            //
+
+            final ObjectFactory objf = new ObjectFactory();
+            MandateType mandate = new MandateType();
+            RepresentationPersonType representative = new RepresentationPersonType();
+            representative.setDateOfBirth("1990-01-01");
+            representative.setGivenName("Bilbo");
+            representative.setSurname("Baggins");
+            representative.setEIdentifier("IT/IT/12345678990");
+            mandate.setRepresentative(representative);
+
+            RepresentationPersonType represented = new RepresentationPersonType();
+            represented.setTextRegisteredAddress("Via....");
+            represented.setELPIdentifier("IT/1111111");
+            represented.setLegalName("Shire Corp.");
+            mandate.setRepresented(represented);
+
+            MandateContentType mandateContent1 = new MandateContentType();
+            // OriginalMandateType omt1 = new OriginalMandateType();
+            // omt1.setMimeType("text/plain");
+            // omt1.setValue("Chief executive officer".getBytes());
+            mandateContent1.setOriginalMandate("Chief executive officer".getBytes());
+            mandateContent1.setOriginalMandateType("text/plain");
+            MandateContentType mandateContent2 = new MandateContentType();
+            // mandateContent2.setOriginalMandate(omt1);
+            mandateContent2.setOriginalMandate("Chief executive officer2".getBytes());
+            mandateContent2.setOriginalMandateType("text/plain");
+            mandate.getMandateContent().add(mandateContent1);
+            mandate.getMandateContent().add(mandateContent2);
+
+            // create a hashmap
+            // HashMap<String, String> complexMandate = new HashMap<String, String>();
+
+            // marshall the mandatecontent
+            StringWriter sw = new StringWriter();
+            mandateMarshaller.marshal(objf.createMandate(mandate), sw);
+
+            System.out.print(sw.toString());
+
+            // add it to the hashmap
+            // complexMandate.put("representative", sw.toString());
+            // sw.flush();
+            //
+            // // continue with the rest of the objects.
+            // repM.marshal(objf.createRepresentationPerson(rpObject), sw);
+            // System.out.print(sw.toString());
+            // complexMandate.put("representative", sw.toString());
+            // sw.flush();
+            //
+            // MandateType mandateType = new MandateType();
+            //
+            // repM.marshal(objf.createRepresentationPerson(rptObject), sw);
+            // System.out.print(sw.toString());
+            // complexMandate.put("represented", sw.toString());
+            // sw.flush();
+            //
+            // // add the complex values to the attr.list.
+            // PersonalAttribute pal = new PersonalAttribute();
+            //
+            // pal.setName("mandateContent");
+            // pal.setIsRequired(pal.isRequired());
+            // pal.setStatus(STORKStatusCode.STATUS_AVAILABLE.toString());
+            // pal.setComplexValue(complexMandate);
+            //
+            // System.out.println(pal.toString());
 		}
-		
+        catch ( JAXBException e ) {
+            e.printStackTrace();
+        }
+    }
+
+    @Test
+    public void testMandateContent() {
+        initMandateValues();
+        try {
+            final MandateType object = new MandateType();
+            // Make the object ....
+            object.getMandateContent().add(mtObject);
+            object.setRepresented(rpObject);
+            object.setRepresentative(rptObject);
+
+            final JAXBContext context = JAXBContext.newInstance(MandateType.class);
+            // Create the marshaller
+            final Marshaller m = context.createMarshaller();
+            m.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true);
+            final ObjectFactory objf = new ObjectFactory();
+            // Various types of output
+            m.marshal(objf.createMandate(object), new FileOutputStream("MandateContentType.xml"));
+            m.marshal(objf.createMandate(object), System.out);
+
+            StringWriter sw = new StringWriter();
+            m.marshal(objf.createMandate(object), sw);
+
 	}
+        catch ( Exception e ) {
+            e.printStackTrace();
+        }
+    }
 
 	/**
-	 * Test unmarshalling canonical address
-	 * <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+     * Test unmarshalling canonical address <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 	 *  <canonicalResidenceAddress xmlns="urn:eu:stork:names:tc:STORK:1.0:assertion">
-	 *   <countryCodeAddress>IS</countryCodeAddress>
-	 *   <state>Reykjavik</state>
-	 *   <municipalityCode>RVK</municipalityCode>
-	 *   <town>Reykjavik</town>
-	 *   <postalCode>101</postalCode>
-	 *   <streetName>Laugavegur</streetName>
-	 *   <streetNumber>1</streetNumber>
-	 *   <apartmentNumber>10</apartmentNumber>
-	 *	</canonicalResidenceAddress>
+     * <countryCodeAddress>IS</countryCodeAddress> <state>Reykjavik</state> <municipalityCode>RVK</municipalityCode>
+     * <town>Reykjavik</town> <postalCode>101</postalCode> <streetName>Laugavegur</streetName>
+     * <streetNumber>1</streetNumber> <apartmentNumber>10</apartmentNumber> </canonicalResidenceAddress>
 	 */
 	@Test
 	public void testUnmarshallCanonicalAddress() 
@@ -140,12 +250,8 @@ public class ComplexAttributesMarshalling {
 	}
 
 	/**
-	 * Test marshalling has bank account
-	 * <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-	 * 		<hasAccountInBank xmlns="urn:eu:stork:names:tc:STORK:1.0:assertion">
-	 * 			<bankName>Arion</bankName>
-	 * 			<AQAA>3</AQAA>
-	 * 		</hasAccountInBank>
+     * Test marshalling has bank account <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <hasAccountInBank
+     * xmlns="urn:eu:stork:names:tc:STORK:1.0:assertion"> <bankName>Arion</bankName> <AQAA>3</AQAA> </hasAccountInBank>
 	 */
 	@Test
 	public void testMarshallHasBankAccount()
@@ -162,22 +268,18 @@ public class ComplexAttributesMarshalling {
 			m.marshal(o.createHasAccountInBank(object), System.out);
 			
 		}
-		catch (JAXBException e ) 
-		{
+        catch (FileNotFoundException e) {
+            e.printStackTrace();
+
+        }catch ( Exception e ) {
 			e.printStackTrace();
 			
-		} catch (FileNotFoundException e) {
-			e.printStackTrace();
-				
 		}
 	}
+
 	/**
-	 * Test unmarshalling has bank account
-	 * <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-	 * 		<hasAccountInBank xmlns="urn:eu:stork:names:tc:STORK:1.0:assertion">
-	 * 			<bankName>Arion</bankName>
-	 * 			<AQAA>3</AQAA>
-	 * 		</hasAccountInBank>
+     * Test unmarshalling has bank account <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <hasAccountInBank
+     * xmlns="urn:eu:stork:names:tc:STORK:1.0:assertion"> <bankName>Arion</bankName> <AQAA>3</AQAA> </hasAccountInBank>
 	 */
 	@Test
 	public void testUnmarshallHasBankAccount()
author	Bojan Suzic <bojan.suzic@iaik.tugraz.at>	2014-11-07 15:08:58 +0100
committer	Bojan Suzic <bojan.suzic@iaik.tugraz.at>	2014-11-07 15:08:58 +0100
commit	c559071dcf6d1fc0f3dbea3cfb0820719c42439f (patch)
tree	0e611fbded7ed3284319151a268ef2ad454483b9
parent	244e3e0e95af0941ac0e27ec6e619e587fdce162 (diff)
download	moa-id-spss-c559071dcf6d1fc0f3dbea3cfb0820719c42439f.tar.gz moa-id-spss-c559071dcf6d1fc0f3dbea3cfb0820719c42439f.tar.bz2 moa-id-spss-c559071dcf6d1fc0f3dbea3cfb0820719c42439f.zip