From 6cdbf5911d578ffba3feb0380ac13cdef33a4611 Mon Sep 17 00:00:00 2001
From: Arminta <Arminta.Jenkins@nist.gov>
Date: Wed, 28 Jun 2023 13:28:49 -0400
Subject: [PATCH 1/2] adjusted asset-type value

---
 src/metaschema/oscal_component_metaschema.xml             | 2 +-
 src/metaschema/oscal_implementation-common_metaschema.xml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/metaschema/oscal_component_metaschema.xml b/src/metaschema/oscal_component_metaschema.xml
index 7538794469..e2170730dc 100644
--- a/src/metaschema/oscal_component_metaschema.xml
+++ b/src/metaschema/oscal_component_metaschema.xml
@@ -177,7 +177,7 @@
             &allowed-values-responsible-roles-component-production;
       </allowed-values>
 
-      <allowed-values target="prop[has-oscal-namespace('http://csrc.nist.gov/ns/oscal') and @name='asset-type']/@value">
+      <allowed-values allow-other="yes" target="prop[has-oscal-namespace('http://csrc.nist.gov/ns/oscal') and @name='asset-type']/@value">
             &allowed-values-property-name-asset-type-values;
       </allowed-values>
 
diff --git a/src/metaschema/oscal_implementation-common_metaschema.xml b/src/metaschema/oscal_implementation-common_metaschema.xml
index be96cc26b2..79b422cea5 100644
--- a/src/metaschema/oscal_implementation-common_metaschema.xml
+++ b/src/metaschema/oscal_implementation-common_metaschema.xml
@@ -120,7 +120,7 @@
             &allowed-values-responsible-roles-component-production;
                   </allowed-values>
 
-                  <allowed-values target="prop[has-oscal-namespace('http://csrc.nist.gov/ns/oscal') and @name='asset-type']/@value">
+                  <allowed-values allow-other="yes" target="prop[@name='asset-type']/value()">
             &allowed-values-property-name-asset-type-values;
                   </allowed-values>
 
@@ -579,7 +579,7 @@
                         &allowed-values-component_inventory-item_property-name;
 
                   </allowed-values>
-                  <allowed-values target="prop[has-oscal-namespace('http://csrc.nist.gov/ns/oscal') and @name='asset-type']/@value">
+                  <allowed-values allow-other="yes" target="prop[@name='asset-type']/value()">
                         &allowed-values-property-name-asset-type-values;
                   </allowed-values>
 

From c707901a830c495643a2887fc54e4dd89ddb3af2 Mon Sep 17 00:00:00 2001
From: "A.J. Stein" <alexander.stein@nist.gov>
Date: Tue, 11 Jul 2023 08:50:22 -0400
Subject: [PATCH 2/2] Apply suggestions from code review

---
 src/metaschema/oscal_component_metaschema.xml             | 2 +-
 src/metaschema/oscal_implementation-common_metaschema.xml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/metaschema/oscal_component_metaschema.xml b/src/metaschema/oscal_component_metaschema.xml
index e2170730dc..92ca6b6bfa 100644
--- a/src/metaschema/oscal_component_metaschema.xml
+++ b/src/metaschema/oscal_component_metaschema.xml
@@ -177,7 +177,7 @@
             &allowed-values-responsible-roles-component-production;
       </allowed-values>
 
-      <allowed-values allow-other="yes" target="prop[has-oscal-namespace('http://csrc.nist.gov/ns/oscal') and @name='asset-type']/@value">
+      <allowed-values target="prop[has-oscal-namespace('http://csrc.nist.gov/ns/oscal') and @name='asset-type']/@value" allow-other="yes">
             &allowed-values-property-name-asset-type-values;
       </allowed-values>
 
diff --git a/src/metaschema/oscal_implementation-common_metaschema.xml b/src/metaschema/oscal_implementation-common_metaschema.xml
index 79b422cea5..c8c75ffbc2 100644
--- a/src/metaschema/oscal_implementation-common_metaschema.xml
+++ b/src/metaschema/oscal_implementation-common_metaschema.xml
@@ -120,7 +120,7 @@
             &allowed-values-responsible-roles-component-production;
                   </allowed-values>
 
-                  <allowed-values allow-other="yes" target="prop[@name='asset-type']/value()">
+                  <allowed-values target="prop[has-oscal-namespace('http://csrc.nist.gov/ns/oscal') and @name='asset-type']/@value" allow-other="yes">
             &allowed-values-property-name-asset-type-values;
                   </allowed-values>
 
@@ -579,7 +579,7 @@
                         &allowed-values-component_inventory-item_property-name;
 
                   </allowed-values>
-                  <allowed-values allow-other="yes" target="prop[@name='asset-type']/value()">
+                  <allowed-values target="prop[has-oscal-namespace('http://csrc.nist.gov/ns/oscal') and @name='asset-type']/@value" allow-other="yes">
                         &allowed-values-property-name-asset-type-values;
                   </allowed-values>