Skip to content

Commit f643a72

Browse files
committed
Move W3C Xlink schema to common directory
This way the schema can be reused in multiple different schemas.
1 parent 5b154e1 commit f643a72

File tree

4 files changed

+3
-273
lines changed

4 files changed

+3
-273
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@
104104
</xs:annotation>
105105

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

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ constructs, e.g.
2424
</xs:schema>]]></xs:documentation>
2525
</xs:annotation>
2626

27-
<xs:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="../../common/xml.xsd"/>
27+
<xs:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="xml.xsd"/>
2828

2929
<xs:attribute name="type" type="xlink:typeType"/>
3030

schemas/sds/1.2/scap-source-data-stream_1.2.xsd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<xs:import namespace="http://scap.nist.gov/schema/ocil/2.0" schemaLocation="../../ocil/2.0/ocil-2.0.xsd"/>
1616
<xs:import namespace="http://www.w3.org/2000/09/xmldsig#" schemaLocation="../../common/xmldsig-core-schema.xsd"/>
1717
<xs:import namespace="urn:oasis:names:tc:entity:xmlns:xml:catalog" schemaLocation="../../common/catalog.xsd"/>
18-
<xs:import namespace="http://www.w3.org/1999/xlink" schemaLocation="xlink.xsd"/>
18+
<xs:import namespace="http://www.w3.org/1999/xlink" schemaLocation="../../common/xlink.xsd"/>
1919
<xs:element name="data-stream-collection">
2020
<xs:annotation>
2121
<xs:documentation>Holds a collection of data streams and components.</xs:documentation>

schemas/sds/1.2/xlink.xsd

Lines changed: 0 additions & 270 deletions
This file was deleted.

0 commit comments

Comments
 (0)