Merge branch 'development'

This commit is contained in:
Peter Mosmans
2016-08-25 15:35:05 +02:00
107 changed files with 7698 additions and 536 deletions
+120 -2
View File
@@ -32,6 +32,7 @@
<xs:element ref="iban"/>
</xs:sequence>
<xs:attribute ref="xml:base"/>
<xs:attribute ref="xml:lang"/>
</xs:complexType>
</xs:element>
@@ -99,6 +100,7 @@
<xs:element ref="vat_no"/>
</xs:sequence>
<xs:attribute ref="xml:base"/>
<xs:attribute ref="xml:lang"/>
<xs:attribute name="id" type="xs:ID"/>
</xs:complexType>
</xs:element>
@@ -108,7 +110,6 @@
<xs:element name="duration" type="xs:nonNegativeInteger"/>
<xs:element name="test_planning" type="xs:string"/>
<xs:element name="report_writing" type="xs:string"/>
<xs:element name="report_due" type="xs:string"/>
<xs:element name="nature" type="xs:string"/>
<xs:element name="type">
@@ -219,7 +220,7 @@
<xs:attribute ref="xml:base"/>
</xs:complexType>
</xs:element>
<xs:element name="version_history">
<xs:complexType>
<xs:sequence>
@@ -294,6 +295,23 @@
</xs:simpleContent>
</xs:complexType>
</xs:element>
<xs:element name="bibref">
<xs:complexType>
<xs:simpleContent>
<xs:extension base="xs:string">
<xs:attribute name="ref" use="optional" type="xs:anyURI"/>
</xs:extension>
</xs:simpleContent>
</xs:complexType>
</xs:element>
<xs:element name="fnref">
<xs:complexType mixed="true">
<xs:choice maxOccurs="unbounded">
<xs:group ref="inline-except-fnref"/>
<xs:group ref="placeholders"/>
</xs:choice>
</xs:complexType>
</xs:element>
<xs:element name="b">
<xs:complexType mixed="true">
<xs:choice maxOccurs="unbounded">
@@ -350,6 +368,79 @@
</xs:choice>
</xs:complexType>
</xs:element>
<xs:element name="biblioentries">
<xs:complexType>
<xs:sequence minOccurs="1" maxOccurs="unbounded">
<xs:element ref="biblioentry"></xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="biblioentry">
<xs:complexType>
<xs:sequence>
<xs:element ref="author" minOccurs="0" maxOccurs="unbounded"/>
<xs:element ref="title"/>
<xs:choice>
<xs:element ref="journal" minOccurs="0"/>
<xs:element ref="website" minOccurs="0"/>
</xs:choice>
<xs:element ref="info" minOccurs="0"/>
<xs:element ref="publisher" minOccurs="0"/>
<xs:element ref="pubdate" minOccurs="0"/>
<xs:element ref="link" minOccurs="0"/>
</xs:sequence>
<xs:attribute ref="role"/>
<xs:attribute name="id" use="required" type="xs:ID"/>
</xs:complexType>
</xs:element>
<xs:attribute name="role">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:enumeration value="book"/>
<xs:enumeration value="article"/>
</xs:restriction>
</xs:simpleType>
</xs:attribute>
<xs:element name="author">
<xs:complexType>
<xs:sequence>
<xs:element ref="surname" minOccurs="0" maxOccurs="1"/>
<xs:element ref="firstname" minOccurs="0" maxOccurs="1"/>
<xs:element ref="org" minOccurs="0" maxOccurs="1"/>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="publisher">
<xs:complexType>
<xs:sequence>
<xs:element ref="name" minOccurs="0" maxOccurs="1"/>
<xs:element ref="location" minOccurs="0" maxOccurs="1"/>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="link">
<xs:complexType>
<xs:sequence>
<xs:element ref="a" minOccurs="1" maxOccurs="1"/>
<xs:element ref="accessed" minOccurs="0" maxOccurs="1"/>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="surname" type="xs:string"/>
<xs:element name="firstname" type="xs:string"/>
<xs:element name="org" type="xs:string"/>
<xs:element name="journal" type="xs:string"/>
<xs:element name="info" type="xs:string"/>
<xs:element name="location" type="xs:string"/>
<xs:element name="pubdate" type="xs:string"/>
<xs:element name="accessed" type="xs:date"/>
<!-- attributes -->
<xs:attribute name="break">
@@ -380,6 +471,21 @@
<xs:element minOccurs="0" maxOccurs="unbounded" ref="monospace"/>
<xs:element minOccurs="0" maxOccurs="unbounded" ref="sup"/>
<xs:element minOccurs="0" maxOccurs="unbounded" ref="sub"/>
<xs:element minOccurs="0" maxOccurs="unbounded" ref="bibref"/>
<xs:element minOccurs="0" maxOccurs="unbounded" ref="fnref"/>
</xs:choice>
</xs:group>
<xs:group name="inline-except-fnref">
<xs:choice>
<xs:element minOccurs="0" maxOccurs="unbounded" ref="a"/>
<xs:element minOccurs="0" maxOccurs="unbounded" ref="br"/>
<xs:element minOccurs="0" maxOccurs="unbounded" ref="i"/>
<xs:element minOccurs="0" maxOccurs="unbounded" ref="b"/>
<xs:element minOccurs="0" maxOccurs="unbounded" ref="u"/>
<xs:element minOccurs="0" maxOccurs="unbounded" ref="monospace"/>
<xs:element minOccurs="0" maxOccurs="unbounded" ref="sup"/>
<xs:element minOccurs="0" maxOccurs="unbounded" ref="sub"/>
<xs:element minOccurs="0" maxOccurs="unbounded" ref="bibref"/>
</xs:choice>
</xs:group>
<xs:group name="inline-except-b">
@@ -391,6 +497,8 @@
<xs:element minOccurs="0" maxOccurs="unbounded" ref="monospace"/>
<xs:element minOccurs="0" maxOccurs="unbounded" ref="sup"/>
<xs:element minOccurs="0" maxOccurs="unbounded" ref="sub"/>
<xs:element minOccurs="0" maxOccurs="unbounded" ref="bibref"/>
<xs:element minOccurs="0" maxOccurs="unbounded" ref="fnref"/>
</xs:choice>
</xs:group>
<xs:group name="inline-except-sup">
@@ -402,6 +510,8 @@
<xs:element minOccurs="0" maxOccurs="unbounded" ref="b"/>
<xs:element minOccurs="0" maxOccurs="unbounded" ref="monospace"/>
<xs:element minOccurs="0" maxOccurs="unbounded" ref="sub"/>
<xs:element minOccurs="0" maxOccurs="unbounded" ref="bibref"/>
<xs:element minOccurs="0" maxOccurs="unbounded" ref="fnref"/>
</xs:choice>
</xs:group>
<xs:group name="inline-except-sub">
@@ -413,6 +523,8 @@
<xs:element minOccurs="0" maxOccurs="unbounded" ref="b"/>
<xs:element minOccurs="0" maxOccurs="unbounded" ref="monospace"/>
<xs:element minOccurs="0" maxOccurs="unbounded" ref="sup"/>
<xs:element minOccurs="0" maxOccurs="unbounded" ref="bibref"/>
<xs:element minOccurs="0" maxOccurs="unbounded" ref="fnref"/>
</xs:choice>
</xs:group>
<xs:group name="inline-except-i">
@@ -424,6 +536,8 @@
<xs:element minOccurs="0" maxOccurs="unbounded" ref="monospace"/>
<xs:element minOccurs="0" maxOccurs="unbounded" ref="sup"/>
<xs:element minOccurs="0" maxOccurs="unbounded" ref="sub"/>
<xs:element minOccurs="0" maxOccurs="unbounded" ref="bibref"/>
<xs:element minOccurs="0" maxOccurs="unbounded" ref="fnref"/>
</xs:choice>
</xs:group>
<xs:group name="inline-except-u">
@@ -435,6 +549,8 @@
<xs:element minOccurs="0" maxOccurs="unbounded" ref="monospace"/>
<xs:element minOccurs="0" maxOccurs="unbounded" ref="sup"/>
<xs:element minOccurs="0" maxOccurs="unbounded" ref="sub"/>
<xs:element minOccurs="0" maxOccurs="unbounded" ref="bibref"/>
<xs:element minOccurs="0" maxOccurs="unbounded" ref="fnref"/>
</xs:choice>
</xs:group>
<xs:group name="inline-except-monospace">
@@ -446,6 +562,8 @@
<xs:element minOccurs="0" maxOccurs="unbounded" ref="u"/>
<xs:element minOccurs="0" maxOccurs="unbounded" ref="sup"/>
<xs:element minOccurs="0" maxOccurs="unbounded" ref="sub"/>
<xs:element minOccurs="0" maxOccurs="unbounded" ref="bibref"/>
<xs:element minOccurs="0" maxOccurs="unbounded" ref="fnref"/>
</xs:choice>
</xs:group>
+146
View File
@@ -0,0 +1,146 @@
<?xml version="1.0" encoding="UTF-8"?>
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
<xs:import namespace="http://www.w3.org/XML/1998/namespace"
schemaLocation="http://www.w3.org/2001/xml.xsd"/>
<xs:import namespace="http://www.w3.org/2001/XInclude"
schemaLocation="http://www.w3.org/2001/XInclude/XInclude.xsd"/>
<xs:include schemaLocation="common.xsd"/>
<xs:element name="contract_info">
<xs:complexType>
<xs:sequence>
<xs:element ref="company"/>
<xs:element ref="scope"/>
<xs:element ref="contractor"/>
<xs:element ref="work"/>
</xs:sequence>
<xs:attribute ref="xml:lang"/>
</xs:complexType>
</xs:element>
<xs:element name="scope">
<xs:complexType>
<xs:sequence>
<xs:element ref="contract_type"/>
<xs:element ref="engagement_description"/>
<xs:element ref="secondpartyrole"/>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="contract_type">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:enumeration value="single_engagement"/>
<xs:enumeration value="fixed_term"/>
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="engagement_description" type="xs:string"/>
<xs:element name="secondpartyrole" type="xs:string"/>
<xs:element name="contractor">
<xs:complexType>
<xs:sequence>
<xs:element ref="name"/>
<xs:element ref="ctcompany"/>
<xs:element ref="address"/>
<xs:element ref="postal_code"/>
<xs:element ref="city"/>
<xs:element ref="country"/>
<xs:element ref="email"/>
<xs:element ref="hourly_fee"/>
</xs:sequence>
<xs:attribute name="sex" use="required">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:enumeration value="F"/>
<xs:enumeration value="M"/>
<xs:enumeration value="O"/>
</xs:restriction>
</xs:simpleType>
</xs:attribute>
</xs:complexType>
</xs:element>
<xs:element name="ctcompany" type="xs:string"/>
<xs:element name="work">
<xs:complexType>
<xs:sequence>
<xs:element ref="activities"/>
<xs:element ref="start_date"/>
<xs:element ref="end_date"/>
<xs:element ref="planning"/>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="activities">
<xs:complexType>
<xs:sequence>
<xs:element maxOccurs="unbounded" ref="activity"/>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="activity" type="xs:string"/>
<xs:element name="start_date" type="xs:date"/>
<xs:element name="end_date" type="xs:date"/>
<xs:element name="planning">
<xs:complexType>
<xs:sequence>
<xs:element ref="hours"/>
<xs:element ref="per"/>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="hours" type="xs:integer"/>
<xs:element name="per">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:enumeration value="week"/>
<xs:enumeration value="month"/>
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="hourly_fee">
<xs:complexType>
<xs:simpleContent>
<xs:extension base="xs:integer">
<xs:attribute name="denomination" use="required">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:enumeration value="eur"/>
<xs:enumeration value="gbp"/>
<xs:enumeration value="usd"/>
</xs:restriction>
</xs:simpleType>
</xs:attribute>
</xs:extension>
</xs:simpleContent>
</xs:complexType>
</xs:element>
<xs:group name="placeholders">
<xs:choice>
<xs:element name="company_long"/>
<xs:element name="company_short"/>
<xs:element name="company_address"/>
<xs:element name="company_postalcode"/>
<xs:element name="company_city"/>
<xs:element name="company_country"/>
<xs:element name="company_poc1"/>
<xs:element name="company_email"/>
<xs:element name="engagement_description"/>
<xs:element name="secondpartyrole"/>
<xs:element name="contract_start_date"/>
<xs:element name="contract_end_date"/>
<xs:element name="contract_period"/>
<xs:element name="contract_total_fee"/>
<xs:element name="contract_planned_hours"/>
<xs:element name="contract_period_unit"/>
<xs:element name="contract_activities"/>
<xs:element name="contractor_name"/>
<xs:element name="contractor_company"/>
<xs:element name="contractor_address"/>
<xs:element name="contractor_postalcode"/>
<xs:element name="contractor_city"/>
<xs:element name="contractor_country"/>
<xs:element name="contractor_email"/>
<xs:element name="contractor_hourly_fee"/>
</xs:choice>
</xs:group>
</xs:schema>
+2
View File
@@ -77,6 +77,7 @@
<xs:element ref="ol"/>
<xs:element ref="img"/>
<xs:element ref="div"/>
<xs:element ref="biblioentries"/>
</xs:choice>
</xs:sequence>
<xs:attribute name="id" use="required" type="xs:ID"/>
@@ -116,6 +117,7 @@
</xs:complexType>
<!-- Placeholders -->
<xs:group name="placeholders">
<xs:choice/>
</xs:group>
+4 -5
View File
@@ -68,7 +68,6 @@
<xs:sequence>
<xs:element ref="duration"/>
<xs:element ref="test_planning"/>
<xs:element ref="report_writing"/>
<xs:element ref="report_due"/>
<xs:element ref="nature"/>
<xs:element ref="type"/>
@@ -114,6 +113,7 @@
</xs:choice>
</xs:sequence>
<xs:attribute ref="xml:base"/>
<xs:attribute ref="xml:lang"/>
<xs:attribute ref="visibility" use="optional"/>
</xs:complexType>
</xs:element>
@@ -122,11 +122,10 @@
<xs:complexType>
<xs:sequence>
<xs:element ref="standard_waiver"/>
<xs:choice>
<xs:element ref="alternative_waiver"/>
</xs:choice>
<xs:element ref="alternative_waiver" minOccurs="0"/>
</xs:sequence>
<xs:attribute ref="xml:base"/>
<xs:attribute ref="xml:lang"/>
</xs:complexType>
</xs:element>
@@ -192,6 +191,7 @@
<xs:attribute name="id" use="optional" type="xs:ID"/>
<xs:attribute ref="break" use="optional"/>
<xs:attribute ref="xml:base"/>
<xs:attribute ref="xml:lang"/>
</xs:complexType>
</xs:element>
@@ -232,7 +232,6 @@
<xs:element name="p_boxtype"/>
<xs:element name="p_fee"/>
<xs:element name="p_testingduration"/>
<xs:element name="p_reportwritingduration"/>
<xs:element name="p_reportdue"/>
<xs:element name="signee_long"/>
<xs:element name="signee_short"/>
+41 -9
View File
@@ -25,6 +25,7 @@
</xs:restriction>
</xs:simpleType>
</xs:attribute>
<xs:attribute ref="xml:lang"/>
</xs:complexType>
</xs:element>
@@ -48,7 +49,6 @@
<xs:sequence>
<xs:element ref="duration"/>
<xs:element ref="test_planning"/>
<xs:element ref="report_writing"/>
<xs:element ref="report_due"/>
<xs:element ref="nature"/>
<xs:element ref="type"/>
@@ -126,9 +126,18 @@
</xs:sequence>
<xs:attribute name="id" use="required" type="xs:ID"/>
<xs:attribute ref="visibility" use="optional"/>
<xs:attribute ref="xml:lang"/>
</xs:complexType>
</xs:element>
<xs:complexType name="block" mixed="true">
<xs:choice maxOccurs="unbounded">
<xs:group ref="inline-all"/>
<xs:group ref="placeholders"/>
</xs:choice>
<xs:attribute ref="xml:base"/>
</xs:complexType>
<xs:element name="generate_testteam">
<xs:complexType/>
</xs:element>
@@ -158,6 +167,7 @@
<xs:attribute ref="break" use="optional"/>
<xs:attribute ref="visibility" use="optional"/>
<xs:attribute ref="xml:base"/>
<xs:attribute ref="xml:lang"/>
</xs:complexType>
</xs:element>
@@ -186,11 +196,31 @@
<xs:element name="generate_recommendations">
<xs:complexType>
<xs:attribute name="Ref" use="optional" type="xs:IDREF"/>
<xs:attribute name="status" use="optional">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:enumeration value="new"/>
<xs:enumeration value="resolved"/>
<xs:enumeration value="unresolved"/>
<xs:enumeration value="not_retested"/>
</xs:restriction>
</xs:simpleType>
</xs:attribute>
</xs:complexType>
</xs:element>
<xs:element name="generate_findings">
<xs:complexType>
<xs:attribute name="Ref" use="optional" type="xs:IDREF"/>
<xs:attribute name="status" use="optional">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:enumeration value="new"/>
<xs:enumeration value="resolved"/>
<xs:enumeration value="unresolved"/>
<xs:enumeration value="not_retested"/>
</xs:restriction>
</xs:simpleType>
</xs:attribute>
</xs:complexType>
</xs:element>
<xs:element name="finding">
@@ -225,6 +255,16 @@
</xs:restriction>
</xs:simpleType>
</xs:attribute>
<xs:attribute name="status" use="optional">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:enumeration value="new"/>
<xs:enumeration value="resolved"/>
<xs:enumeration value="unresolved"/>
<xs:enumeration value="not_retested"/>
</xs:restriction>
</xs:simpleType>
</xs:attribute>
<xs:attribute name="type" use="required"/>
<xs:attribute name="break" use="optional">
<xs:simpleType>
@@ -305,14 +345,6 @@
</xs:complexType>
</xs:element>
<xs:complexType name="block" mixed="true">
<xs:choice maxOccurs="unbounded">
<xs:group ref="inline-all"/>
<xs:group ref="placeholders"/>
</xs:choice>
<xs:attribute ref="xml:base"/>
</xs:complexType>
<!-- Placeholders -->
<xs:group name="placeholders">
<xs:choice>