3 files changed, 347 insertions, 146 deletions
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
new file mode 100644
index 000000000..e57769254
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/IsHealthCareProfessionalDeprecatedType.java
@@ -0,0 +1,145 @@
+//
+// 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.names.tc.stork._1_0.assertion;
+
+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
index de2003a3f..1e3b4fa78 100644
--- 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
@@ -1,145 +1,168 @@
-//
-// 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 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="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 = "isHealthCareProfessionalType", propOrder = {
-    "nameOfOrganisation",
-    "hcpType",
-    "specialisation",
-    "aqaa"
-})
-public class IsHealthCareProfessionalType {
-
-    @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;
-    }
-
-}
+//
+// 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/resources/StorkcomplexAttributes.xsd b/id/server/stork2-commons/src/main/resources/StorkcomplexAttributes.xsd
index 3c56bd318..ab9e89712 100644
--- a/id/server/stork2-commons/src/main/resources/StorkcomplexAttributes.xsd
+++ b/id/server/stork2-commons/src/main/resources/StorkcomplexAttributes.xsd
@@ -32,6 +32,7 @@
 	<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" />
 
@@ -284,7 +285,7 @@
 		</xs:sequence>
 	</xs:complexType>
 
-	<xs:complexType name="isHealthCareProfessionalType">
+	<xs:complexType name="isHealthCareProfessional_deprecatedType">
 		<xs:sequence>
 			<xs:element name="nameOfOrganisation" type="xs:string" />
 			<xs:element ref="stork:HCPType" />
@@ -302,4 +303,36 @@
 		</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>