#104661# Adjust schema for using oor:package everywhere; remove oor:context

5 files changed, 10 insertions, 18 deletions

diff --git a/officecfg/registry/component-schema.dtd b/officecfg/registry/component-schema.dtd
index 27accdbbe6b3..0e0a3d0544a4 100644
--- a/officecfg/registry/component-schema.dtd
+++ b/officecfg/registry/component-schema.dtd
@@ -43,7 +43,6 @@
 <!ATTLIST group
     oor:name CDATA #REQUIRED
     oor:extensible (true | false) #IMPLIED
-    oor:component CDATA #IMPLIED
 >
 
 <!ELEMENT set (info?, prop*, item*)>
diff --git a/officecfg/registry/component-schema.xsd b/officecfg/registry/component-schema.xsd
index 26666c9f5365..9e6abd397f6a 100644
--- a/officecfg/registry/component-schema.xsd
+++ b/officecfg/registry/component-schema.xsd
@@ -208,15 +208,7 @@
         </xs:element>
       </xs:sequence>
       <xs:attribute name="name" type="xs:NMTOKEN" use="required"/>
-      <xs:attribute name="package" type="xs:NMTOKEN" use="required">
-        <xs:annotation>
-          <xs:documentation>contains the name of the package. 
-                    Package names are composed similar to java packages. 
-                    Packages are used to structure component configuration data. 
-                    An example of a package is 'org.openoffice', 
-                    where 'org' and 'openoffice' each define a package.</xs:documentation>
-        </xs:annotation>
-      </xs:attribute>
+      <xs:attribute ref="oor:package"/>
       <xs:attribute name="version" type="xs:string" use="optional">
         <xs:annotation>
           <xs:documentation>identifies the version of the component. The version number is build of major.minor.micro</xs:documentation>
diff --git a/officecfg/registry/component-types.xsd b/officecfg/registry/component-types.xsd
index e82145f30d75..00323cc9135c 100644
--- a/officecfg/registry/component-types.xsd
+++ b/officecfg/registry/component-types.xsd
@@ -11,9 +11,13 @@
       <xs:documentation>identifies a node or an attribute within a tree, must be unique for all siblings.</xs:documentation>
     </xs:annotation>
   </xs:attribute>
-  <xs:attribute name="context" type="xs:string" use="optional">
+  <xs:attribute name="package" type="xs:NMTOKEN" use="required">
     <xs:annotation>
-      <xs:documentation>specifies the environment of a node fragment, typically contains a component path and optionally a node path</xs:documentation>
+      <xs:documentation>contains the name of the package. 
+                Package names are composed similar to java packages. 
+                Packages are used to structure component configuration data. 
+                An example of a package is 'org.openoffice', 
+                where 'org' and 'openoffice' each define a package.</xs:documentation>
     </xs:annotation>
   </xs:attribute>
   <xs:attribute name="node-type" type="xs:NMTOKEN">
diff --git a/officecfg/registry/component-update.dtd b/officecfg/registry/component-update.dtd
index c666f41527b6..6887a13933a5 100644
--- a/officecfg/registry/component-update.dtd
+++ b/officecfg/registry/component-update.dtd
@@ -2,13 +2,10 @@
 
 <!ELEMENT oor:node ((prop|node)*)>
 <!ATTLIST oor:node
-  oor:name CDATA #REQUIRED
-  oor:context CDATA #REQUIRED
-  oor:component CDATA #IMPLIED
+  oor:name NMTOKEN #REQUIRED
+  oor:package NMTOKEN #REQUIRED
   oor:finalized (true | false) #IMPLIED
-  oor:mandatory (true | false) #IMPLIED
   oor:op (modify | replace | remove | reset) #IMPLIED
-  oor:node-type NMTOKEN #IMPLIED
   xmlns:oor CDATA #FIXED "http://openoffice.org/2001/registry"
   xmlns:xs CDATA #FIXED "http://www.w3.org/2001/XMLSchema"
   xmlns:xsi CDATA #FIXED "http://www.w3.org/2001/XMLSchema-instance"
diff --git a/officecfg/registry/component-update.xsd b/officecfg/registry/component-update.xsd
index 4e89642c4295..7825151c8f02 100644
--- a/officecfg/registry/component-update.xsd
+++ b/officecfg/registry/component-update.xsd
@@ -22,6 +22,7 @@
 						</xs:element>
 					</xs:choice>
 					<xs:attributeGroup ref="oor:update-info"/>
+                    <xs:attribute ref="oor:package" use="optional"/>
 					<xs:attribute ref="oor:node-type" use="optional"/>
 				</xs:extension>
 			</xs:complexContent>
@@ -55,7 +56,6 @@
 	</xs:redefine>
 	<xs:attributeGroup name="update-info">
 		<xs:attribute ref="oor:finalized"/>
-		<xs:attribute ref="oor:context"/>
 		<xs:attribute ref="oor:mandatory"/>
 		<xs:attribute ref="oor:readonly"/>
 		<xs:attribute ref="oor:op"/>