From c0d938ba46568a6e9be0df467f71a250d6e88b7e Mon Sep 17 00:00:00 2001
From: jdvorak <jdvorak@100.96.79.117>
Date: Fri, 24 Feb 2017 10:07:49 +0100
Subject: [PATCH] added JAXB customisations to work around multiple properties
 of the same name (albeit different namespaces)

---
 examples/nl-pop/schemas/p-o-p-profile-schema.xsd | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/examples/nl-pop/schemas/p-o-p-profile-schema.xsd b/examples/nl-pop/schemas/p-o-p-profile-schema.xsd
index f2565f4..c9d2d51 100644
--- a/examples/nl-pop/schemas/p-o-p-profile-schema.xsd
+++ b/examples/nl-pop/schemas/p-o-p-profile-schema.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:cflink="http://eurocris.org/cerif/annotations#" xmlns:cfprocess="http://eurocris.org/cerif/preprocessing#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:cflink="http://eurocris.org/cerif/annotations#" xmlns:cfprocess="http://eurocris.org/cerif/preprocessing#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jxb="http://java.sun.com/xml/ns/jaxb"
 	xsi:schemaLocation="http://www.w3.org/2001/XMLSchema https://www.w3.org/2012/04/XMLSchema.xsd http://eurocris.org/cerif/annotations# http://eurocris.org/cerif/xml/schemas/annotations.xsd"
-	elementFormDefault="qualified" attributeFormDefault="unqualified" xml:lang="en" targetNamespace="urn:xmlns:nl:pop-project:cerif-profile-1.0-EXPERIMENTAL" xmlns="urn:xmlns:nl:pop-project:cerif-profile-1.0-EXPERIMENTAL">
+	elementFormDefault="qualified" attributeFormDefault="unqualified" xml:lang="en" targetNamespace="urn:xmlns:nl:pop-project:cerif-profile-1.0-EXPERIMENTAL" xmlns="urn:xmlns:nl:pop-project:cerif-profile-1.0-EXPERIMENTAL" jxb:version="1.0">
 
 	<xs:annotation>
 		<xs:documentation>This is the XML Schema for CERIF (Common European Research Information Format) profile for the P-O-P project in the Netherlands.
@@ -344,6 +344,9 @@
 						<xs:element ref="Subject" xmlns="urn:xmlns:nl:pop-project:vocab:Subjects#" minOccurs="0" maxOccurs="unbounded">
 							<xs:annotation>
 								<xs:documentation>The subject classification(s) of the project</xs:documentation>
+								<xs:appinfo>
+									<jxb:property name="narcisSubject"/>
+								</xs:appinfo>
 							</xs:annotation>
 						</xs:element>
 						<xs:element name="Subject" type="cfGenericClassification__Type" minOccurs="0" maxOccurs="unbounded" cflink:link="cfProj_Class" cfprocess:expandBy="Classification(Subject)">
@@ -424,6 +427,9 @@
 						<xs:element ref="Type" xmlns="urn:xmlns:nl:pop-project:vocab:FundingTypes#" minOccurs="0">
 							<xs:annotation>
 								<xs:documentation>The type of the funding</xs:documentation>
+								<xs:appinfo source="JAXB">
+									<jxb:property name="popFundingType"/>
+								</xs:appinfo>
 							</xs:annotation>
 						</xs:element>