Added CreatedDate to Schema - headers have it included with a choice for Created...

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@276 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/Tools/XMLSchema/FrameworkDataElements.xsd b/Tools/XMLSchema/FrameworkDataElements.xsd
index e5b5dc1ee7e362fcd8a4771138bb7fa85b282638..51c2e59e4e5cc76e217c1b710b36b74bff4ae162 100644 (file)
--- a/Tools/XMLSchema/FrameworkDataElements.xsd
+++ b/Tools/XMLSchema/FrameworkDataElements.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" xmlns="http://www.TianoCore.org/2006/Edk2.0" targetNamespace="http://www.TianoCore.org/2006/Edk2.0">\r
 <?xml version="1.0" encoding="UTF-8"?>\r
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" xmlns="http://www.TianoCore.org/2006/Edk2.0" targetNamespace="http://www.TianoCore.org/2006/Edk2.0">\r

-    <!--\r
+  <!--\r

     Filename: FrameworkDataElements.xsd\r
     \r
     Copyright (c) 2006, Intel Corp.\r
     Filename: FrameworkDataElements.xsd\r
     \r
     Copyright (c) 2006, Intel Corp.\r


@@ -12,40 +12,33 @@
     WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
     \r
   -->\r
     WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
     \r
   -->\r

+  <xs:annotation>\r
+    <xs:documentation xml:lang="en"> This schema defines EFI and Framework Data Elements </xs:documentation>\r
+  </xs:annotation>\r
+  <xs:include schemaLocation="NamingConvention.xsd"/>\r
+  <xs:include schemaLocation="FrameworkDataTypes.xsd"/>\r
+  <xs:element name="Abstract" type="Sentence">\r

     <xs:annotation>\r
     <xs:annotation>\r

-        <xs:documentation xml:lang="en"> This schema defines EFI and Framework Data Elements </xs:documentation>\r
+      <xs:documentation xml:lang="en">Abstract is valid for all Description Files</xs:documentation>\r
+      <xs:documentation xml:lang="en">This section is required. This is a single sentence to describe the module and will be used in sample files as the abstract data in the header comment section.</xs:documentation>\r

     </xs:annotation>\r
     </xs:annotation>\r

-    <xs:include schemaLocation="NamingConvention.xsd"/>\r
-    <xs:include schemaLocation="FrameworkDataTypes.xsd"/>\r
-    <xs:element name="Abstract">\r
-        <xs:annotation>\r
-            <xs:documentation xml:lang="en">Abstract is valid for all Description Files</xs:documentation>\r
-            <xs:documentation xml:lang="en">This section is required. This is a single sentence to describe the module and will be used in sample files as the abstract data in the header comment section.</xs:documentation>\r
-        </xs:annotation>\r
-        <xs:complexType>\r
-            <xs:simpleContent>\r
-                <xs:extension base="Sentence">\r
-                    <xs:attribute name="URL" type="xs:anyURI"/>\r
-                </xs:extension>\r
-            </xs:simpleContent>\r
-        </xs:complexType>\r
-    </xs:element>\r
-    <xs:element name="AntCmd">\r
-        <xs:annotation>\r
-            <xs:documentation xml:lang="en">This is a sub-element of AntTask</xs:documentation>\r
-            <xs:documentation xml:lang="en">This is an ant command that will be inserted into a biuld sequence. Since ant commands are valid XML statements, special care must be taken to use the correct tokens for reserved words and escape quote characters.</xs:documentation>\r
-        </xs:annotation>\r
-        <xs:complexType>\r
-            <xs:sequence>\r
-                <xs:element minOccurs="0" name="Id" type="xs:int"/>\r
-                <xs:element name="ExecutionOrder">\r
-                    <xs:simpleType>\r
-                        <xs:list itemType="xs:normalizedString"/>\r
-                    </xs:simpleType>\r
-                </xs:element>\r
-            </xs:sequence>\r
-            <xs:attributeGroup ref="SectionAttributes"/>\r
-        </xs:complexType>\r
+  </xs:element>\r
+  <xs:element name="AntCmd">\r
+    <xs:annotation>\r
+      <xs:documentation xml:lang="en">This is a sub-element of AntTask</xs:documentation>\r
+      <xs:documentation xml:lang="en">This is an ant command that will be inserted into a biuld sequence. Since ant commands are valid XML statements, special care must be taken to use the correct tokens for reserved words and escape quote characters.</xs:documentation>\r
+    </xs:annotation>\r
+    <xs:complexType>\r
+      <xs:sequence>\r
+        <xs:element minOccurs="0" name="Id" type="xs:int"/>\r
+          <xs:element name="ExecutionOrder">\r
+            <xs:simpleType>\r
+              <xs:list itemType="xs:normalizedString"/>\r
+            </xs:simpleType>\r
+          </xs:element>\r
+        </xs:sequence>\r
+        <xs:attributeGroup ref="SectionAttributes"/>\r
+      </xs:complexType>\r

     </xs:element>\r
     <xs:element name="AntTask">\r
         <xs:annotation>\r
     </xs:element>\r
     <xs:element name="AntTask">\r
         <xs:annotation>\r


@@ -172,6 +165,7 @@
     <xs:element name="Constructor" type="C_Name"/>\r
     <xs:element name="Copyright" type="Sentence"/>\r
     <xs:element name="Created" type="DateType"/>\r
     <xs:element name="Constructor" type="C_Name"/>\r
     <xs:element name="Copyright" type="Sentence"/>\r
     <xs:element name="Created" type="DateType"/>\r

+    <xs:element name="CreatedDate" type="DateType"/>\r

     <xs:element name="CreatedBy" type="UserName"/>\r
     <xs:element name="DataHubs">\r
         <xs:annotation>\r
     <xs:element name="CreatedBy" type="UserName"/>\r
     <xs:element name="DataHubs">\r
         <xs:annotation>\r

diff --git a/Tools/XMLSchema/FrameworkHeaders.xsd b/Tools/XMLSchema/FrameworkHeaders.xsd
index 952789271cd465591312839d39a495495dcfdb33..83c7ebf4d52c135b2782837f886eab9b81bf7f01 100644 (file)
--- a/Tools/XMLSchema/FrameworkHeaders.xsd
+++ b/Tools/XMLSchema/FrameworkHeaders.xsd
@@ -24,7 +24,10 @@
                 <xs:element minOccurs="0" maxOccurs="1" ref="GuidValue"/>\r
                 <xs:element minOccurs="1" maxOccurs="1" ref="Version"/>\r
                 <xs:element minOccurs="0" maxOccurs="1" ref="Path"/>\r
                 <xs:element minOccurs="0" maxOccurs="1" ref="GuidValue"/>\r
                 <xs:element minOccurs="1" maxOccurs="1" ref="Version"/>\r
                 <xs:element minOccurs="0" maxOccurs="1" ref="Path"/>\r

-                <xs:element minOccurs="1" maxOccurs="1" ref="Created"/>\r
+                <xs:choice minOccurs="1" maxOccurs="1">\r
+                  <xs:element minOccurs="0" maxOccurs="1" ref="Created"/>\r
+                  <xs:element minOccurs="0" maxOccurs="1" ref="CreatedDate"/>\r
+                </xs:choice>\r

                 <xs:element minOccurs="0" maxOccurs="1" ref="Updated"/>\r
                 <xs:element minOccurs="1" maxOccurs="1" ref="Abstract"/>\r
                 <xs:element minOccurs="1" maxOccurs="1" ref="Description"/>\r
                 <xs:element minOccurs="0" maxOccurs="1" ref="Updated"/>\r
                 <xs:element minOccurs="1" maxOccurs="1" ref="Abstract"/>\r
                 <xs:element minOccurs="1" maxOccurs="1" ref="Description"/>\r


@@ -45,8 +48,14 @@
                 <xs:element minOccurs="1" maxOccurs="1" ref="Description"/>\r
                 <xs:element minOccurs="1" maxOccurs="1" ref="Copyright"/>\r
                 <xs:element minOccurs="1" maxOccurs="1" ref="License"/>\r
                 <xs:element minOccurs="1" maxOccurs="1" ref="Description"/>\r
                 <xs:element minOccurs="1" maxOccurs="1" ref="Copyright"/>\r
                 <xs:element minOccurs="1" maxOccurs="1" ref="License"/>\r

-                <xs:element minOccurs="1" maxOccurs="1" ref="Created"/>\r
-                <xs:element minOccurs="0" maxOccurs="1" ref="Modified"/>\r
+                <xs:choice minOccurs="1" maxOccurs="1">\r
+                  <xs:element minOccurs="0" maxOccurs="1" ref="Created"/>\r
+                  <xs:element minOccurs="0" maxOccurs="1" ref="CreatedDate"/>\r
+                </xs:choice>\r
+                <xs:choice minOccurs="1" maxOccurs="1">\r
+                  <xs:element minOccurs="0" maxOccurs="1" ref="Modified"/>\r
+                  <xs:element minOccurs="0" maxOccurs="1" ref="ModifiedDate"/>\r
+                </xs:choice>\r

             </xs:sequence>\r
         </xs:complexType>\r
     </xs:element>\r
             </xs:sequence>\r
         </xs:complexType>\r
     </xs:element>\r


@@ -62,8 +71,14 @@
                 <xs:element minOccurs="1" maxOccurs="1" ref="Description"/>\r
                 <xs:element minOccurs="1" maxOccurs="1" ref="Copyright"/>\r
                 <xs:element minOccurs="1" maxOccurs="1" ref="License"/>\r
                 <xs:element minOccurs="1" maxOccurs="1" ref="Description"/>\r
                 <xs:element minOccurs="1" maxOccurs="1" ref="Copyright"/>\r
                 <xs:element minOccurs="1" maxOccurs="1" ref="License"/>\r

-                <xs:element minOccurs="1" maxOccurs="1" ref="Created"/>\r
-                <xs:element minOccurs="0" maxOccurs="1" ref="Modified"/>\r
+                <xs:choice minOccurs="1" maxOccurs="1">\r
+                  <xs:element minOccurs="0" maxOccurs="1" ref="Created"/>\r
+                  <xs:element minOccurs="0" maxOccurs="1" ref="CreatedDate"/>\r
+                </xs:choice>\r
+                <xs:choice minOccurs="1" maxOccurs="1">\r
+                  <xs:element minOccurs="0" maxOccurs="1" ref="Modified"/>\r
+                  <xs:element minOccurs="0" maxOccurs="1" ref="ModifiedDate"/>\r
+                </xs:choice>\r

             </xs:sequence>\r
         </xs:complexType>\r
     </xs:element>\r
             </xs:sequence>\r
         </xs:complexType>\r
     </xs:element>\r


@@ -83,9 +98,12 @@
                 <xs:element minOccurs="1" maxOccurs="1" ref="Description"/>\r
                 <xs:element minOccurs="1" maxOccurs="1" ref="Copyright"/>\r
                 <xs:element minOccurs="1" maxOccurs="1" ref="License"/>\r
                 <xs:element minOccurs="1" maxOccurs="1" ref="Description"/>\r
                 <xs:element minOccurs="1" maxOccurs="1" ref="Copyright"/>\r
                 <xs:element minOccurs="1" maxOccurs="1" ref="License"/>\r

-                <xs:element minOccurs="0" maxOccurs="1" ref="Specification"/>\r
-                <xs:element minOccurs="1" maxOccurs="1" ref="Created"/>\r
+                <xs:choice minOccurs="1" maxOccurs="1">\r
+                  <xs:element minOccurs="0" maxOccurs="1" ref="Created"/>\r
+                  <xs:element minOccurs="0" maxOccurs="1" ref="CreatedDate"/>\r
+                </xs:choice>\r

                 <xs:element minOccurs="0" maxOccurs="1" ref="Updated"/>\r
                 <xs:element minOccurs="0" maxOccurs="1" ref="Updated"/>\r

+                <xs:element minOccurs="0" maxOccurs="1" ref="Specification"/>\r

             </xs:sequence>\r
         </xs:complexType>\r
     </xs:element>\r
             </xs:sequence>\r
         </xs:complexType>\r
     </xs:element>\r


@@ -104,9 +122,12 @@
                 <xs:element minOccurs="1" maxOccurs="1" ref="Description"/>\r
                 <xs:element minOccurs="1" maxOccurs="1" ref="Copyright"/>\r
                 <xs:element minOccurs="1" maxOccurs="1" ref="License"/>\r
                 <xs:element minOccurs="1" maxOccurs="1" ref="Description"/>\r
                 <xs:element minOccurs="1" maxOccurs="1" ref="Copyright"/>\r
                 <xs:element minOccurs="1" maxOccurs="1" ref="License"/>\r

-                <xs:element minOccurs="0" maxOccurs="1" ref="Specification"/>\r
-                <xs:element minOccurs="1" maxOccurs="1" ref="Created"/>\r
+                <xs:choice minOccurs="1" maxOccurs="1">\r
+                  <xs:element minOccurs="0" maxOccurs="1" ref="Created"/>\r
+                  <xs:element minOccurs="0" maxOccurs="1" ref="CreatedDate"/>\r
+                </xs:choice>\r

                 <xs:element minOccurs="0" maxOccurs="1" ref="Updated"/>\r
                 <xs:element minOccurs="0" maxOccurs="1" ref="Updated"/>\r

+                <xs:element minOccurs="0" maxOccurs="1" ref="Specification"/>\r

             </xs:sequence>\r
         </xs:complexType>\r
     </xs:element>\r
             </xs:sequence>\r
         </xs:complexType>\r
     </xs:element>\r


@@ -128,7 +149,10 @@
                 <xs:element minOccurs="1" maxOccurs="1" ref="Description"/>\r
                 <xs:element minOccurs="0" maxOccurs="1" ref="Copyright"/>\r
                 <xs:element minOccurs="0" maxOccurs="1" ref="License"/>\r
                 <xs:element minOccurs="1" maxOccurs="1" ref="Description"/>\r
                 <xs:element minOccurs="0" maxOccurs="1" ref="Copyright"/>\r
                 <xs:element minOccurs="0" maxOccurs="1" ref="License"/>\r

-                <xs:element minOccurs="1" maxOccurs="1" ref="Created"/>\r
+                <xs:choice minOccurs="1" maxOccurs="1">\r
+                  <xs:element minOccurs="0" maxOccurs="1" ref="Created"/>\r
+                  <xs:element minOccurs="0" maxOccurs="1" ref="CreatedDate"/>\r
+                </xs:choice>\r

                 <xs:element minOccurs="0" maxOccurs="1" ref="CreatedBy">\r
                    <xs:annotation>\r
                        <xs:documentation xml:lang="en">DO NOT USE! removing from XMLSchema</xs:documentation>\r
                 <xs:element minOccurs="0" maxOccurs="1" ref="CreatedBy">\r
                    <xs:annotation>\r
                        <xs:documentation xml:lang="en">DO NOT USE! removing from XMLSchema</xs:documentation>\r


@@ -153,7 +177,10 @@
                 <xs:element minOccurs="1" maxOccurs="1" ref="Description"/>\r
                 <xs:element minOccurs="1" maxOccurs="1" ref="Copyright"/>\r
                 <xs:element minOccurs="1" maxOccurs="1" ref="License"/>\r
                 <xs:element minOccurs="1" maxOccurs="1" ref="Description"/>\r
                 <xs:element minOccurs="1" maxOccurs="1" ref="Copyright"/>\r
                 <xs:element minOccurs="1" maxOccurs="1" ref="License"/>\r

-                <xs:element minOccurs="1" maxOccurs="1" ref="Created"/>\r
+                <xs:choice minOccurs="1" maxOccurs="1">\r
+                  <xs:element minOccurs="0" maxOccurs="1" ref="Created"/>\r
+                  <xs:element minOccurs="0" maxOccurs="1" ref="CreatedDate"/>\r
+                </xs:choice>\r

                 <xs:element minOccurs="0" maxOccurs="1" ref="E-Mail"/>\r
                 <xs:element minOccurs="0" maxOccurs="1" ref="Updated"/>\r
                 <xs:element minOccurs="0" maxOccurs="1" ref="URL"/>\r
                 <xs:element minOccurs="0" maxOccurs="1" ref="E-Mail"/>\r
                 <xs:element minOccurs="0" maxOccurs="1" ref="Updated"/>\r
                 <xs:element minOccurs="0" maxOccurs="1" ref="URL"/>\r