INTEGRATION: CWS configxml01 (1.4.24); FILE MERGED

2003/05/16 14:38:34 jb 1.4.24.1: #109668# Rename oor:node -> oor:component-data

1 files changed, 51 insertions, 37 deletions

diff --git a/officecfg/registry/component-update.xsd b/officecfg/registry/component-update.xsd
index 4842341db824..b61688e73ad6 100644
--- a/officecfg/registry/component-update.xsd
+++ b/officecfg/registry/component-update.xsd
@@ -6,28 +6,6 @@
          additional information for merging and access control</xs:documentation>
 	</xs:annotation>
 	<xs:redefine schemaLocation="component-types.xsd">
-		<xs:complexType name="node">
-			<xs:annotation>
-				<xs:documentation>identifies a node in the schema by it's name and position within the hierarchy. Overrides or adds information from the base layer. A node can be of type set or group.</xs:documentation>
-			</xs:annotation>
-			<xs:complexContent>
-				<xs:extension base="oor:node">
-					<xs:choice minOccurs="0" maxOccurs="unbounded">
-						<xs:element name="node" type="oor:node"/>
-						<xs:element name="prop" type="oor:prop" nillable="true">
-							<xs:unique name="uniqueLang">
-								<xs:selector xpath="oor:value"/>
-								<xs:field xpath="@xml:lang"/>
-							</xs:unique>
-						</xs:element>
-					</xs:choice>
-					<xs:attributeGroup ref="oor:update-info"/>
-		            <xs:attribute ref="oor:mandatory"/>
-                    <xs:attribute ref="oor:package" use="optional"/>
-					<xs:attributeGroup ref="oor:node-type-info" use="optional"/>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
 		<xs:complexType name="value">
 			<xs:annotation>
 				<xs:documentation>adds the xml:lang attribute for localized information. Only the update format is allowed to contain localized data.</xs:documentation>
@@ -38,21 +16,42 @@
 				</xs:extension>
 			</xs:simpleContent>
 		</xs:complexType>
-		<xs:complexType name="prop">
-			<xs:annotation>
-				<xs:documentation>adds operational info to a property, should only be applied for dynamic properties. Dynamic properties are not available in the component schema and are added or removed during runtime.</xs:documentation>
-			</xs:annotation>
-			<xs:complexContent>
-				<xs:extension base="oor:prop">
-					<xs:sequence minOccurs="0" maxOccurs="unbounded">
-						<xs:element name="value" type="oor:value" nillable="true"/>
-					</xs:sequence>
-					<xs:attributeGroup ref="oor:update-info"/>
-					<xs:attribute ref="oor:type" use="optional"/>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
 	</xs:redefine>
+	<xs:complexType name="node">
+		<xs:annotation>
+			<xs:documentation>Identifies a node in the schema by it's name and position within the hierarchy. Overrides or adds information from the base layer. A node can be of type set or group.</xs:documentation>
+		</xs:annotation>
+		<xs:complexContent>
+			<xs:extension base="oor:basic-node">
+				<xs:choice minOccurs="0" maxOccurs="unbounded">
+					<xs:element name="node" type="oor:node"/>
+					<xs:element name="prop" type="oor:prop">
+						<xs:unique name="uniqueLang">
+							<xs:selector xpath="oor:value"/>
+							<xs:field xpath="@xml:lang"/>
+						</xs:unique>
+					</xs:element>
+				</xs:choice>
+				<xs:attributeGroup ref="oor:update-info"/>
+	            <xs:attribute ref="oor:mandatory"/>
+				<xs:attributeGroup ref="oor:node-type-info" use="optional"/>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="prop">
+		<xs:annotation>
+			<xs:documentation>adds operational info to a property, should only be applied for dynamic properties. Dynamic properties are not available in the component schema and are added or removed during runtime.</xs:documentation>
+		</xs:annotation>
+		<xs:complexContent>
+			<xs:extension base="oor:basic-prop">
+				<xs:sequence minOccurs="0" maxOccurs="unbounded">
+					<xs:element name="value" type="oor:value" nillable="true"/>
+				</xs:sequence>
+				<xs:attributeGroup ref="oor:update-info"/>
+				<xs:attribute ref="oor:type" use="optional"/>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
 	<xs:attributeGroup name="update-info">
 		<xs:attribute ref="oor:finalized"/>
 		<xs:attribute ref="oor:readonly"/>
@@ -86,10 +85,25 @@
 			<xs:documentation>determines, whether a node and its descendants are readonly or not. This is a computed attribute and can not be set by an application.</xs:documentation>
 		</xs:annotation>
 	</xs:attribute>
-	<xs:element name="node" type="oor:node">
+	<xs:element name="component-data">
 		<xs:annotation>
 			<xs:documentation>root element of the update document.</xs:documentation>
 		</xs:annotation>
+		<xs:complexType>
+			<xs:extension base="oor:basic-node">
+				<xs:choice minOccurs="0" maxOccurs="unbounded">
+					<xs:element name="node" type="oor:node"/>
+					<xs:element name="prop" type="oor:prop">
+						<xs:unique name="uniqueLang">
+							<xs:selector xpath="oor:value"/>
+							<xs:field xpath="@xml:lang"/>
+						</xs:unique>
+					</xs:element>
+				</xs:choice>
+				<xs:attributeGroup ref="oor:update-info"/>
+                <xs:attribute ref="oor:package"/>
+			</xs:extension>
+		</xs:complexType>
 		<xs:unique name="member">
 			<xs:selector xpath="oor:node|oor:prop"/>
 			<xs:field xpath="@oor:name"/>