Merge pull request #1334 from jan-cerny/scap-1.3-maint-1.2

Backport #1326 to maint-1.2

Author: ggbecker

ac_probes/configure.ac.tpl

@@ -728,6 +728,7 @@ AC_CONFIG_FILES([Makefile
                  src/DS/Makefile
                  tests/DS/Makefile
                  tests/DS/ds_sds_index/Makefile
+                 tests/DS/sds_detect_version/Makefile
                  tests/DS/signed/Makefile
                  tests/DS/validate/Makefile
 

configure.ac

@@ -1548,6 +1548,7 @@ AC_CONFIG_FILES([Makefile
                  src/DS/Makefile
                  tests/DS/Makefile
                  tests/DS/ds_sds_index/Makefile
+                 tests/DS/sds_detect_version/Makefile
                  tests/DS/signed/Makefile
                  tests/DS/validate/Makefile
 

schemas/Makefile.am

@@ -15,6 +15,7 @@ xccdf11dir = $(pkgdatadir)/schemas/xccdf/1.1/
 xccdf11tailoringdir = $(pkgdatadir)/schemas/xccdf/1.1-tailoring/
 xccdf12dir = $(pkgdatadir)/schemas/xccdf/1.2/
 sds12dir = $(pkgdatadir)/schemas/sds/1.2/
+sds13dir = $(pkgdatadir)/schemas/sds/1.3/
 arf11dir = $(pkgdatadir)/schemas/arf/1.1/
 ocil20dir = $(pkgdatadir)/schemas/ocil/2.0/
 cpe20dir = $(pkgdatadir)/schemas/cpe/2.0/
@@ -46,6 +47,7 @@ xccdf11tailoring_DATA = $(wildcard $(srcdir)/xccdf/1.1-tailoring/*.xsd $(srcdir)
 xccdf12_DATA = $(wildcard $(srcdir)/xccdf/1.2/*.xsd $(srcdir)/xccdf/1.2/*.dtd $(srcdir)/xccdf/1.2/*.xsl)
 
 sds12_DATA = $(wildcard $(srcdir)/sds/1.2/*.xsd $(srcdir)/sds/1.2/*.dtd)
+sds13_DATA = $(wildcard $(srcdir)/sds/1.3/*.xsd $(srcdir)/sds/1.3/*.dtd)
 arf11_DATA = $(wildcard $(srcdir)/arf/1.1/*.xsd)
 
 ocil20_DATA = $(wildcard $(srcdir)/ocil/2.0/*.xsd $(srcdir)/sds/2.0/*.dtd)
@@ -77,6 +79,7 @@ EXTRA_DIST = \
 	$(xccdf11tailoring_DATA) \
 	$(xccdf12_DATA) \
 	$(sds12_DATA) \
+	$(sds13_DATA) \
 	$(arf11_DATA) \
 	$(ocil20_DATA) \
 	$(cpe20_DATA) \

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>