SDK Repository: add "beta release candidate" tag to XSD

This adds an optional integer>0 as "beta release candiate" to
repository packages. This will be used in tools 18 to allow
us to push beta versions of packages and still know how to
update them compared to non-beta packages.

Change-Id: I2f0d3cb75171bc23bce1eb511a4e3b86ca97245b

2 files changed, 62 insertions, 5 deletions

diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/repository/-sdk-addon-4.xsd b/sdkmanager/libs/sdklib/src/com/android/sdklib/repository/-sdk-addon-4.xsd
index 9289e1c..ef92bde 100755
--- a/sdkmanager/libs/sdklib/src/com/android/sdklib/repository/-sdk-addon-4.xsd
+++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/repository/-sdk-addon-4.xsd
@@ -124,7 +124,12 @@
 
             <!-- An optional element indicating the package is obsolete.
                  The string content is however currently not defined and ignored. -->
-            <xsd:element name="obsolete"     type="xsd:string"      minOccurs="0" />
+            <xsd:element name="obsolete"  type="xsd:string" minOccurs="0" />
+
+            <!-- An optional element indicating the package is a beta/preview.
+                 When present, it indicates the release-candidate number.
+                 When the element is absent, it indicates this is a released package. -->
+            <xsd:element name="beta-rc"   type="xsd:positiveInteger" minOccurs="0" />
 
             <!-- Optional information on the layoutlib packaged in this platform. -->
             <xsd:element name="layoutlib" type="sdk:layoutlibType"  minOccurs="0" />
@@ -218,9 +223,15 @@
             <!-- The minimal API level required by this package.
                  Optional. If present, must be an int > 0. -->
             <xsd:element name="min-api-level" type="xsd:positiveInteger" minOccurs="0" />
+
             <!-- An optional element indicating the package is obsolete.
                  The string content is however currently not defined and ignored. -->
-            <xsd:element name="obsolete"      type="xsd:string"          minOccurs="0" />
+            <xsd:element name="obsolete"      type="xsd:string" minOccurs="0" />
+
+            <!-- An optional element indicating the package is a beta/preview.
+                 When present, it indicates the release-candidate number.
+                 When the element is absent, it indicates this is a released package. -->
+            <xsd:element name="beta-rc"       type="xsd:positiveInteger" minOccurs="0" />
 
             <!-- A list of project files contributed by this package. Optional. -->
             <xsd:element name="project-files" type="sdk:projectFilesType" minOccurs="0" />
diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/repository/-sdk-repository-6.xsd b/sdkmanager/libs/sdklib/src/com/android/sdklib/repository/-sdk-repository-6.xsd
index 149f8c5..d4cc1cb 100755
--- a/sdkmanager/libs/sdklib/src/com/android/sdklib/repository/-sdk-repository-6.xsd
+++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/repository/-sdk-repository-6.xsd
@@ -134,6 +134,11 @@
             <!-- An optional element indicating the package is obsolete.
                  The string content is however currently not defined and ignored. -->
             <xsd:element name="obsolete"      type="xsd:string" minOccurs="0" />
+
+            <!-- An optional element indicating the package is a beta/preview.
+                 When present, it indicates the release-candidate number.
+                 When the element is absent, it indicates this is a released package. -->
+            <xsd:element name="beta-rc"       type="xsd:positiveInteger" minOccurs="0" />
         </xsd:all>
     </xsd:complexType>
 
@@ -194,6 +199,15 @@
 
             <!-- A list of file archives for this package. -->
             <xsd:element name="archives"  type="sdk:archivesType" />
+
+            <!-- An optional element indicating the package is obsolete.
+                 The string content is however currently not defined and ignored. -->
+            <xsd:element name="obsolete"  type="xsd:string" minOccurs="0" />
+
+            <!-- An optional element indicating the package is a beta/preview.
+                 When present, it indicates the release-candidate number.
+                 When the element is absent, it indicates this is a released package. -->
+            <xsd:element name="beta-rc"   type="xsd:positiveInteger" minOccurs="0" />
         </xsd:all>
     </xsd:complexType>
 
@@ -245,6 +259,15 @@
 
             <!-- A list of file archives for this package. -->
             <xsd:element name="archives"  type="sdk:archivesType" />
+
+            <!-- An optional element indicating the package is obsolete.
+                 The string content is however currently not defined and ignored. -->
+            <xsd:element name="obsolete"  type="xsd:string" minOccurs="0" />
+
+            <!-- An optional element indicating the package is a beta/preview.
+                 When present, it indicates the release-candidate number.
+                 When the element is absent, it indicates this is a released package. -->
+            <xsd:element name="beta-rc"   type="xsd:positiveInteger" minOccurs="0" />
         </xsd:all>
     </xsd:complexType>
 
@@ -272,13 +295,19 @@
             <xsd:element name="release-url"  type="xsd:token"       minOccurs="0" />
             <!-- A list of file archives for this package. -->
             <xsd:element name="archives"     type="sdk:archivesType" />
-            <!-- An optional element indicating the package is obsolete.
-                 The string content is however currently not defined and ignored. -->
-            <xsd:element name="obsolete"  type="xsd:string" minOccurs="0" />
 
             <!-- The minimal revision of platform-tools required by this package.
                  Mandatory. Must be an int > 0. -->
             <xsd:element name="min-platform-tools-rev" type="xsd:positiveInteger" />
+
+            <!-- An optional element indicating the package is obsolete.
+                 The string content is however currently not defined and ignored. -->
+            <xsd:element name="obsolete"  type="xsd:string" minOccurs="0" />
+
+            <!-- An optional element indicating the package is a beta/preview.
+                 When present, it indicates the release-candidate number.
+                 When the element is absent, it indicates this is a released package. -->
+            <xsd:element name="beta-rc"   type="xsd:positiveInteger" minOccurs="0" />
         </xsd:all>
     </xsd:complexType>
 
@@ -310,6 +339,11 @@
             <!-- An optional element indicating the package is obsolete.
                  The string content is however currently not defined and ignored. -->
             <xsd:element name="obsolete"  type="xsd:string" minOccurs="0" />
+
+            <!-- An optional element indicating the package is a beta/preview.
+                 When present, it indicates the release-candidate number.
+                 When the element is absent, it indicates this is a released package. -->
+            <xsd:element name="beta-rc"   type="xsd:positiveInteger" minOccurs="0" />
         </xsd:all>
     </xsd:complexType>
 
@@ -343,9 +377,15 @@
             <!-- A list of file archives for this package. -->
             <xsd:element name="archives"     type="sdk:archivesType" />
 
+
             <!-- An optional element indicating the package is obsolete.
                  The string content is however currently not defined and ignored. -->
             <xsd:element name="obsolete"  type="xsd:string" minOccurs="0" />
+
+            <!-- An optional element indicating the package is a beta/preview.
+                 When present, it indicates the release-candidate number.
+                 When the element is absent, it indicates this is a released package. -->
+            <xsd:element name="beta-rc"   type="xsd:positiveInteger" minOccurs="0" />
         </xsd:all>
     </xsd:complexType>
 
@@ -382,9 +422,15 @@
                  Optional. If present, must be an int > 0. -->
             <xsd:element name="min-tools-rev" type="xsd:positiveInteger" minOccurs="0" />
 
+
             <!-- An optional element indicating the package is obsolete.
                  The string content is however currently not defined and ignored. -->
             <xsd:element name="obsolete"  type="xsd:string" minOccurs="0" />
+
+            <!-- An optional element indicating the package is a beta/preview.
+                 When present, it indicates the release-candidate number.
+                 When the element is absent, it indicates this is a released package. -->
+            <xsd:element name="beta-rc"   type="xsd:positiveInteger" minOccurs="0" />
         </xsd:all>
     </xsd:complexType>