Added CreatedDate to Schema - headers have it included with a choice for Created or CreatedDate so that we can migrate to the new CreatedDate at some point in the future in all of the Framework files.

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

2 files changed, 65 insertions, 44 deletions

diff --git a/Tools/XMLSchema/FrameworkDataElements.xsd b/Tools/XMLSchema/FrameworkDataElements.xsd
index e5b5dc1..51c2e59 100644
--- a/Tools/XMLSchema/FrameworkDataElements.xsd
+++ b/Tools/XMLSchema/FrameworkDataElements.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <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">

-    <!--

+  <!--

     Filename: FrameworkDataElements.xsd

     

     Copyright (c) 2006, Intel Corp.

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

     

   -->

+  <xs:annotation>

+    <xs:documentation xml:lang="en"> This schema defines EFI and Framework Data Elements </xs:documentation>

+  </xs:annotation>

+  <xs:include schemaLocation="NamingConvention.xsd"/>

+  <xs:include schemaLocation="FrameworkDataTypes.xsd"/>

+  <xs:element name="Abstract" type="Sentence">

     <xs:annotation>

-        <xs:documentation xml:lang="en"> This schema defines EFI and Framework Data Elements </xs:documentation>

+      <xs:documentation xml:lang="en">Abstract is valid for all Description Files</xs:documentation>

+      <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>

     </xs:annotation>

-    <xs:include schemaLocation="NamingConvention.xsd"/>

-    <xs:include schemaLocation="FrameworkDataTypes.xsd"/>

-    <xs:element name="Abstract">

-        <xs:annotation>

-            <xs:documentation xml:lang="en">Abstract is valid for all Description Files</xs:documentation>

-            <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>

-        </xs:annotation>

-        <xs:complexType>

-            <xs:simpleContent>

-                <xs:extension base="Sentence">

-                    <xs:attribute name="URL" type="xs:anyURI"/>

-                </xs:extension>

-            </xs:simpleContent>

-        </xs:complexType>

-    </xs:element>

-    <xs:element name="AntCmd">

-        <xs:annotation>

-            <xs:documentation xml:lang="en">This is a sub-element of AntTask</xs:documentation>

-            <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>

-        </xs:annotation>

-        <xs:complexType>

-            <xs:sequence>

-                <xs:element minOccurs="0" name="Id" type="xs:int"/>

-                <xs:element name="ExecutionOrder">

-                    <xs:simpleType>

-                        <xs:list itemType="xs:normalizedString"/>

-                    </xs:simpleType>

-                </xs:element>

-            </xs:sequence>

-            <xs:attributeGroup ref="SectionAttributes"/>

-        </xs:complexType>

+  </xs:element>

+  <xs:element name="AntCmd">

+    <xs:annotation>

+      <xs:documentation xml:lang="en">This is a sub-element of AntTask</xs:documentation>

+      <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>

+    </xs:annotation>

+    <xs:complexType>

+      <xs:sequence>

+        <xs:element minOccurs="0" name="Id" type="xs:int"/>

+          <xs:element name="ExecutionOrder">

+            <xs:simpleType>

+              <xs:list itemType="xs:normalizedString"/>

+            </xs:simpleType>

+          </xs:element>

+        </xs:sequence>

+        <xs:attributeGroup ref="SectionAttributes"/>

+      </xs:complexType>

     </xs:element>

     <xs:element name="AntTask">

         <xs:annotation>

@@ -172,6 +165,7 @@
     <xs:element name="Constructor" type="C_Name"/>

     <xs:element name="Copyright" type="Sentence"/>

     <xs:element name="Created" type="DateType"/>

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

     <xs:element name="CreatedBy" type="UserName"/>

     <xs:element name="DataHubs">

         <xs:annotation>

diff --git a/Tools/XMLSchema/FrameworkHeaders.xsd b/Tools/XMLSchema/FrameworkHeaders.xsd
index 9527892..83c7ebf 100644
--- a/Tools/XMLSchema/FrameworkHeaders.xsd
+++ b/Tools/XMLSchema/FrameworkHeaders.xsd
@@ -24,7 +24,10 @@
                 <xs:element minOccurs="0" maxOccurs="1" ref="GuidValue"/>

                 <xs:element minOccurs="1" maxOccurs="1" ref="Version"/>

                 <xs:element minOccurs="0" maxOccurs="1" ref="Path"/>

-                <xs:element minOccurs="1" maxOccurs="1" ref="Created"/>

+                <xs:choice minOccurs="1" maxOccurs="1">

+                  <xs:element minOccurs="0" maxOccurs="1" ref="Created"/>

+                  <xs:element minOccurs="0" maxOccurs="1" ref="CreatedDate"/>

+                </xs:choice>

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

                 <xs:element minOccurs="1" maxOccurs="1" ref="Abstract"/>

                 <xs:element minOccurs="1" maxOccurs="1" ref="Description"/>

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

                 <xs:element minOccurs="1" maxOccurs="1" ref="Copyright"/>

                 <xs:element minOccurs="1" maxOccurs="1" ref="License"/>

-                <xs:element minOccurs="1" maxOccurs="1" ref="Created"/>

-                <xs:element minOccurs="0" maxOccurs="1" ref="Modified"/>

+                <xs:choice minOccurs="1" maxOccurs="1">

+                  <xs:element minOccurs="0" maxOccurs="1" ref="Created"/>

+                  <xs:element minOccurs="0" maxOccurs="1" ref="CreatedDate"/>

+                </xs:choice>

+                <xs:choice minOccurs="1" maxOccurs="1">

+                  <xs:element minOccurs="0" maxOccurs="1" ref="Modified"/>

+                  <xs:element minOccurs="0" maxOccurs="1" ref="ModifiedDate"/>

+                </xs:choice>

             </xs:sequence>

         </xs:complexType>

     </xs:element>

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

                 <xs:element minOccurs="1" maxOccurs="1" ref="Copyright"/>

                 <xs:element minOccurs="1" maxOccurs="1" ref="License"/>

-                <xs:element minOccurs="1" maxOccurs="1" ref="Created"/>

-                <xs:element minOccurs="0" maxOccurs="1" ref="Modified"/>

+                <xs:choice minOccurs="1" maxOccurs="1">

+                  <xs:element minOccurs="0" maxOccurs="1" ref="Created"/>

+                  <xs:element minOccurs="0" maxOccurs="1" ref="CreatedDate"/>

+                </xs:choice>

+                <xs:choice minOccurs="1" maxOccurs="1">

+                  <xs:element minOccurs="0" maxOccurs="1" ref="Modified"/>

+                  <xs:element minOccurs="0" maxOccurs="1" ref="ModifiedDate"/>

+                </xs:choice>

             </xs:sequence>

         </xs:complexType>

     </xs:element>

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

                 <xs:element minOccurs="1" maxOccurs="1" ref="Copyright"/>

                 <xs:element minOccurs="1" maxOccurs="1" ref="License"/>

-                <xs:element minOccurs="0" maxOccurs="1" ref="Specification"/>

-                <xs:element minOccurs="1" maxOccurs="1" ref="Created"/>

+                <xs:choice minOccurs="1" maxOccurs="1">

+                  <xs:element minOccurs="0" maxOccurs="1" ref="Created"/>

+                  <xs:element minOccurs="0" maxOccurs="1" ref="CreatedDate"/>

+                </xs:choice>

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

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

             </xs:sequence>

         </xs:complexType>

     </xs:element>

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

                 <xs:element minOccurs="1" maxOccurs="1" ref="Copyright"/>

                 <xs:element minOccurs="1" maxOccurs="1" ref="License"/>

-                <xs:element minOccurs="0" maxOccurs="1" ref="Specification"/>

-                <xs:element minOccurs="1" maxOccurs="1" ref="Created"/>

+                <xs:choice minOccurs="1" maxOccurs="1">

+                  <xs:element minOccurs="0" maxOccurs="1" ref="Created"/>

+                  <xs:element minOccurs="0" maxOccurs="1" ref="CreatedDate"/>

+                </xs:choice>

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

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

             </xs:sequence>

         </xs:complexType>

     </xs:element>

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

                 <xs:element minOccurs="0" maxOccurs="1" ref="Copyright"/>

                 <xs:element minOccurs="0" maxOccurs="1" ref="License"/>

-                <xs:element minOccurs="1" maxOccurs="1" ref="Created"/>

+                <xs:choice minOccurs="1" maxOccurs="1">

+                  <xs:element minOccurs="0" maxOccurs="1" ref="Created"/>

+                  <xs:element minOccurs="0" maxOccurs="1" ref="CreatedDate"/>

+                </xs:choice>

                 <xs:element minOccurs="0" maxOccurs="1" ref="CreatedBy">

                    <xs:annotation>

                        <xs:documentation xml:lang="en">DO NOT USE! removing from XMLSchema</xs:documentation>

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

                 <xs:element minOccurs="1" maxOccurs="1" ref="Copyright"/>

                 <xs:element minOccurs="1" maxOccurs="1" ref="License"/>

-                <xs:element minOccurs="1" maxOccurs="1" ref="Created"/>

+                <xs:choice minOccurs="1" maxOccurs="1">

+                  <xs:element minOccurs="0" maxOccurs="1" ref="Created"/>

+                  <xs:element minOccurs="0" maxOccurs="1" ref="CreatedDate"/>

+                </xs:choice>

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

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

                 <xs:element minOccurs="0" maxOccurs="1" ref="URL"/>