Reorganising test resources

src/test/resources/grsf_profile.xsd

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified"
-	xmlns:xs="http://www.w3.org/2001/XMLSchema"
-	xmlns:vc="http://www.w3.org/2007/XMLSchema-versioning"
-    vc:minVersion="1.1">
-
-<xs:redefine schemaLocation="profile5.xsd">
-  <xs:complexType name="Extra">
-    <xs:element name="country"/>
-  </xs:complexType>
-</xs:redefine>
-
-
-</xs:schema>

src/test/resources/profile_schemas/grsf_profile.xsd

@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified"
+	xmlns:xs="http://www.w3.org/2001/XMLSchema"
+	xmlns:vc="http://www.w3.org/2007/XMLSchema-versioning"
+    vc:minVersion="1.1">
+
+	<xs:redefine schemaLocation="profile5.xsd">
+		<xs:complexType name="Extra">
+			<xs:complexContent>
+				<xs:extension base="Extra">
+					<xs:sequence>
+						<xs:element type="GRSFType" name="grsf" minOccurs="1" maxOccurs="1" />
+					</xs:sequence>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:redefine>
+
+	<xs:complexType name="GRSFType">
+		<xs:sequence>
+			<xs:element type="xs:string" name="srcField" minOccurs="1" maxOccurs="1" />
+			<xs:element type="xs:string" name="srcType" minOccurs="1" maxOccurs="1" />
+			<xs:element type="xs:string" name="mandatory" minOccurs="1" maxOccurs="1" />
+			<xs:element type="xs:boolean" name="isSensitive" minOccurs="1" maxOccurs="1" />
+			<xs:element name="dstTypes" minOccurs="1" maxOccurs="1">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element type="DestinationType" name="dstType" minOccurs="1" maxOccurs="unbounded"/>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+        </xs:sequence>
+	</xs:complexType>
+
+	<xs:simpleType name="BaseDestinationType">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="Field"/>
+			<xs:enumeration value="Resource"/>
+			<xs:enumeration value="TimeSeries"/>
+		</xs:restriction>
+	</xs:simpleType>
+	
+	<xs:complexType name="DestinationType">	
+	    <xs:simpleContent>
+        	<xs:extension base="BaseDestinationType">
+            	<xs:attribute type="xs:string" name="maxOccur" />
+        	</xs:extension>
+    	</xs:simpleContent>
+	</xs:complexType>
+
+</xs:schema>

src/test/resources/profiles/AssessmentUnit.xml

@@ -235,7 +235,9 @@
 				<srcField>catches</srcField>
 				<mandatory>false</mandatory>
 				<isSensitive>true</isSensitive>
-				<type>TimeSeries</type>
+				<dstTypes>
+					<dstType>TimeSeries</dstType>
+				</dstTypes>
 			</grsf>
 		</extra>
 	</metadatafield>
@@ -256,7 +258,9 @@
 				<srcField>landings</srcField>
 				<mandatory>false</mandatory>
 				<isSensitive>true</isSensitive>
-				<type>TimeSeries</type>
+				<dstTypes>
+					<dstType>TimeSeries</dstType>
+				</dstTypes>
 			</grsf>
 		</extra>
 	</metadatafield>
@@ -272,7 +276,9 @@
 				<srcField></srcField>
 				<mandatory>aggregated</mandatory>
 				<isSensitive>false</isSensitive>
-				<type>Field</type>
+				<dstTypes>
+					<dstType>Field</dstType>
+				</dstTypes>
 			</grsf>
 		</extra>
 	</metadatafield>
@@ -289,7 +295,9 @@
 				<srcField></srcField>
 				<mandatory>aggregated</mandatory>
 				<isSensitive>false</isSensitive>
-				<type>Field</type>
+				<dstTypes>
+					<dstType>Field</dstType>
+				</dstTypes>
 			</grsf>
 		</extra>
 	</metadatafield>