Skip to content

Commit

Permalink
Mapping model relocation 1/2: delete from develop (#1850)
Browse files Browse the repository at this point in the history
* Remove mapping from modules config.

* Delete mapping model from develop to move to feature branch.
  • Loading branch information
aj-stein-nist authored Jul 11, 2023
1 parent 40e7e97 commit defe67e
Show file tree
Hide file tree
Showing 5 changed files with 0 additions and 211 deletions.
1 change: 0 additions & 1 deletion build/ci-cd/config/metaschema
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,3 @@ src/metaschema/oscal_ssp_metaschema.xml|xml,json|xml,json|xml,json
src/metaschema/oscal_poam_metaschema.xml|xml,json|xml,json|xml,json
src/metaschema/oscal_assessment-plan_metaschema.xml|xml,json|xml,json|xml,json
src/metaschema/oscal_assessment-results_metaschema.xml|xml,json|xml,json|xml,json
src/metaschema/oscal_mapping_metaschema.xml|xml,json|xml,json|xml,json
18 changes: 0 additions & 18 deletions src/metaschema/oscal_catalog_metaschema.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
</remarks>
<import href="oscal_control-common_metaschema.xml"/>
<import href="oscal_metadata_metaschema.xml"/>
<import href="oscal_mapping-common_metaschema.xml"/>
<define-assembly name="catalog">
<formal-name>Catalog</formal-name>
<description>A structured, <a href="https://pages.nist.gov/OSCAL/concepts/terminology/#catalog">organized collection</a> of control information.</description>
Expand Down Expand Up @@ -212,23 +211,6 @@
<assembly ref="part" max-occurs="unbounded">
<group-as name="parts" in-json="ARRAY"/>
</assembly>
<define-assembly name="mapping">
<formal-name>Mapping</formal-name>
<description>A mapping between the containing control and another
resource.</description>
<define-flag name="uuid" as-type="uuid" required="yes">
<formal-name>Mapping Identifier</formal-name>
<description>The unique identifier for the mapping.</description>
</define-flag>
<model>
<assembly ref="mapping-resource-reference" min-occurs="1">
<use-name>target-resource</use-name>
</assembly>
<assembly ref="map" min-occurs="1" max-occurs="unbounded">
<group-as name="maps" in-json="ARRAY"/>
</assembly>
</model>
</define-assembly>
<assembly ref="control" max-occurs="unbounded">
<group-as name="controls" in-json="ARRAY"/>
</assembly>
Expand Down
1 change: 0 additions & 1 deletion src/metaschema/oscal_complete_metaschema.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
<p>This format represents a combination of all of the OSCAL models.</p>
</remarks>
<import href="oscal_catalog_metaschema.xml"/>
<import href="oscal_mapping_metaschema.xml"/>
<import href="oscal_profile_metaschema.xml"/>
<import href="oscal_component_metaschema.xml"/>
<import href="oscal_ssp_metaschema.xml"/>
Expand Down
125 changes: 0 additions & 125 deletions src/metaschema/oscal_mapping-common_metaschema.xml

This file was deleted.

66 changes: 0 additions & 66 deletions src/metaschema/oscal_mapping_metaschema.xml

This file was deleted.

0 comments on commit defe67e

Please sign in to comment.