Merge pull request #1326 from jan-cerny/scap13_schema

Add SCAP 1.3 schema and enable XML validation

Author: matusmarhefka

schemas/arf/1.1/asset-reporting-format_1.1.0.xsd

@@ -104,7 +104,7 @@
     </xs:annotation>
 
     <xs:import namespace="http://scap.nist.gov/schema/asset-identification/1.1" schemaLocation="asset-identification_1.1.0.xsd"/>
-    <xs:import namespace="http://www.w3.org/1999/xlink" schemaLocation="xlink.xsd"/>
+    <xs:import namespace="http://www.w3.org/1999/xlink" schemaLocation="../../common/xlink.xsd"/>
     <xs:import namespace="http://scap.nist.gov/schema/reporting-core/1.1" schemaLocation="reporting-core_1.1.0.xsd"/>
     <xs:element name="asset-report-collection">
         <xs:annotation>

schemas/sds/1.2/catalog.xsd renamed to schemas/common/catalog.xsd

@@ -24,7 +24,7 @@ constructs, e.g.
 </xs:schema>]]></xs:documentation>
  </xs:annotation>
 
- <xs:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="../../common/xml.xsd"/>
+ <xs:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="xml.xsd"/>
 
  <xs:attribute name="type" type="xlink:typeType"/>
 

schemas/arf/1.1/xlink.xsd renamed to schemas/common/xlink.xsd

@@ -14,8 +14,8 @@
   <xs:import namespace="http://cpe.mitre.org/dictionary/2.0" schemaLocation="cpe-dictionary_2.3.xsd"/>
   <xs:import namespace="http://scap.nist.gov/schema/ocil/2.0" schemaLocation="../../ocil/2.0/ocil-2.0.xsd"/>
   <xs:import namespace="http://www.w3.org/2000/09/xmldsig#" schemaLocation="../../common/xmldsig-core-schema.xsd"/>
-  <xs:import namespace="urn:oasis:names:tc:entity:xmlns:xml:catalog" schemaLocation="catalog.xsd"/>
-  <xs:import namespace="http://www.w3.org/1999/xlink" schemaLocation="xlink.xsd"/>
+  <xs:import namespace="urn:oasis:names:tc:entity:xmlns:xml:catalog" schemaLocation="../../common/catalog.xsd"/>
+  <xs:import namespace="http://www.w3.org/1999/xlink" schemaLocation="../../common/xlink.xsd"/>
   <xs:element name="data-stream-collection">
     <xs:annotation>
       <xs:documentation>Holds a collection of data streams and components.</xs:documentation>