Fix manifest xsd schema

Remove unnecessary sequence indicator.

Change-Id: I43bfdf723ae58e1f7af0fd51c1c24eec0ff4a988
Signed-off-by: Sangyoon Jang <jeremy.jang@samsung.com>

diff --git a/parser/manifest.xsd.in b/parser/manifest.xsd.in
index c9b356f..11144fa 100644 (file)
--- a/parser/manifest.xsd.in
+++ b/parser/manifest.xsd.in
@@ -4,32 +4,30 @@
 
   <xs:element name="manifest">
     <xs:complexType>
 
   <xs:element name="manifest">
     <xs:complexType>

-      <xs:sequence>
-        <xs:choice maxOccurs="unbounded">
-          <xs:element ref="packages:label"/>
-          <xs:element ref="packages:icon"/>
-          <xs:element ref="packages:author"/>
-          <xs:element ref="packages:description"/>
-          <xs:element ref="packages:compatibility"/>
-          <xs:element ref="packages:profile"/>
-          <xs:element ref="packages:watch-application"/>
-          <xs:element ref="packages:watchface"/>
-          <xs:element ref="packages:service-application"/>
-          <xs:element ref="packages:ui-application"/>
-          <xs:element ref="packages:ime-application"/>
-          <xs:element ref="packages:shortcut-list"/>
-          <xs:element ref="packages:widget"/>
-          <xs:element ref="packages:widget-application"/>
-          <xs:element ref="packages:account"/>
-          <xs:element ref="packages:notifications"/>
-          <xs:element ref="packages:privileges"/>
-          <xs:element ref="packages:font"/>
-          <xs:element ref="packages:ime"/>
-          <xs:element ref="packages:feature"/>
-          <xs:element ref="packages:trust-anchor"/>
-        </xs:choice>
+      <xs:choice maxOccurs="unbounded">
+        <xs:element ref="packages:label"/>
+        <xs:element ref="packages:icon"/>
+        <xs:element ref="packages:author"/>
+        <xs:element ref="packages:description"/>
+        <xs:element ref="packages:compatibility"/>
+        <xs:element ref="packages:profile"/>
+        <xs:element ref="packages:watch-application"/>
+        <xs:element ref="packages:watchface"/>
+        <xs:element ref="packages:service-application"/>
+        <xs:element ref="packages:ui-application"/>
+        <xs:element ref="packages:ime-application"/>
+        <xs:element ref="packages:shortcut-list"/>
+        <xs:element ref="packages:widget"/>
+        <xs:element ref="packages:widget-application"/>
+        <xs:element ref="packages:account"/>
+        <xs:element ref="packages:notifications"/>
+        <xs:element ref="packages:privileges"/>
+        <xs:element ref="packages:font"/>
+        <xs:element ref="packages:ime"/>
+        <xs:element ref="packages:feature"/>
+        <xs:element ref="packages:trust-anchor"/>

         <xs:any minOccurs="0" maxOccurs="unbounded" namespace="##any" processContents="lax"/>
         <xs:any minOccurs="0" maxOccurs="unbounded" namespace="##any" processContents="lax"/>

-      </xs:sequence>
+      </xs:choice>

       <xs:attribute name="storeclient-id" type="xs:string"/>
       <xs:attribute name="install-location" type="xs:string"/>
       <xs:attribute name="package" use="required" type="xs:string"/>
       <xs:attribute name="storeclient-id" type="xs:string"/>
       <xs:attribute name="install-location" type="xs:string"/>
       <xs:attribute name="package" use="required" type="xs:string"/>


@@ -76,13 +74,11 @@
   </xs:element>
   <xs:element name="watch-application">
     <xs:complexType>
   </xs:element>
   <xs:element name="watch-application">
     <xs:complexType>

-      <xs:sequence>
-        <xs:choice maxOccurs="unbounded" minOccurs="0">
-          <xs:element ref="packages:label"/>
-          <xs:element ref="packages:icon"/>
-        </xs:choice>
+      <xs:choice maxOccurs="unbounded" minOccurs="0">
+        <xs:element ref="packages:label"/>
+        <xs:element ref="packages:icon"/>

         <xs:any minOccurs="0" maxOccurs="unbounded" namespace="##any" processContents="lax"/>
         <xs:any minOccurs="0" maxOccurs="unbounded" namespace="##any" processContents="lax"/>

-      </xs:sequence>
+      </xs:choice>

       <xs:attribute name="appid" use="required" type="xs:string"/>
       <xs:attribute name="exec" use="required"/>
       <xs:attribute name="ambient-support" type="xs:boolean"/>
       <xs:attribute name="appid" use="required" type="xs:string"/>
       <xs:attribute name="exec" use="required"/>
       <xs:attribute name="ambient-support" type="xs:boolean"/>


@@ -93,20 +89,18 @@
   </xs:element>
   <xs:element name="service-application">
     <xs:complexType>
   </xs:element>
   <xs:element name="service-application">
     <xs:complexType>

-      <xs:sequence>
-        <xs:choice maxOccurs="unbounded" minOccurs="0">
-          <xs:element ref="packages:label"/>
-          <xs:element ref="packages:icon"/>
-          <xs:element ref="packages:application-service"/>
-          <xs:element ref="packages:app-control"/>
-          <xs:element ref="packages:category"/>
-          <xs:element ref="packages:metadata"/>
-          <xs:element ref="packages:permission"/>
-          <xs:element ref="packages:datacontrol"/>
-          <xs:element ref="packages:background-category"/>
-        </xs:choice>
+      <xs:choice maxOccurs="unbounded" minOccurs="0">
+        <xs:element ref="packages:label"/>
+        <xs:element ref="packages:icon"/>
+        <xs:element ref="packages:application-service"/>
+        <xs:element ref="packages:app-control"/>
+        <xs:element ref="packages:category"/>
+        <xs:element ref="packages:metadata"/>
+        <xs:element ref="packages:permission"/>
+        <xs:element ref="packages:datacontrol"/>
+        <xs:element ref="packages:background-category"/>

         <xs:any minOccurs="0" maxOccurs="unbounded" namespace="##any" processContents="lax"/>
         <xs:any minOccurs="0" maxOccurs="unbounded" namespace="##any" processContents="lax"/>

-      </xs:sequence>
+      </xs:choice>

       <xs:attribute name="appid" use="required" type="xs:string"/>
       <xs:attribute name="auto-restart" type="xs:boolean"/>
       <xs:attribute name="exec" use="required"/>
       <xs:attribute name="appid" use="required" type="xs:string"/>
       <xs:attribute name="auto-restart" type="xs:boolean"/>
       <xs:attribute name="exec" use="required"/>


@@ -122,22 +116,20 @@
   </xs:element>
   <xs:element name="ui-application">
     <xs:complexType>
   </xs:element>
   <xs:element name="ui-application">
     <xs:complexType>

-      <xs:sequence>
-        <xs:choice maxOccurs="unbounded" minOccurs="0">
-          <xs:element ref="packages:label"/>
-          <xs:element ref="packages:icon"/>
-          <xs:element ref="packages:image"/>
-          <xs:element ref="packages:application-service"/>
-          <xs:element ref="packages:app-control"/>
-          <xs:element ref="packages:category"/>
-          <xs:element ref="packages:metadata"/>
-          <xs:element ref="packages:permission"/>
-          <xs:element ref="packages:datacontrol"/>
-          <xs:element ref="packages:background-category"/>
-          <xs:element ref="packages:splash-screens"/>
-        </xs:choice>
+      <xs:choice maxOccurs="unbounded" minOccurs="0">
+        <xs:element ref="packages:label"/>
+        <xs:element ref="packages:icon"/>
+        <xs:element ref="packages:image"/>
+        <xs:element ref="packages:application-service"/>
+        <xs:element ref="packages:app-control"/>
+        <xs:element ref="packages:category"/>
+        <xs:element ref="packages:metadata"/>
+        <xs:element ref="packages:permission"/>
+        <xs:element ref="packages:datacontrol"/>
+        <xs:element ref="packages:background-category"/>
+        <xs:element ref="packages:splash-screens"/>

         <xs:any minOccurs="0" maxOccurs="unbounded" namespace="##any" processContents="lax"/>
         <xs:any minOccurs="0" maxOccurs="unbounded" namespace="##any" processContents="lax"/>

-      </xs:sequence>
+      </xs:choice>

       <xs:attribute name="appid" use="required" type="xs:string"/>
       <xs:attribute name="exec" use="required"/>
       <xs:attribute name="multiple" type="xs:boolean"/>
       <xs:attribute name="appid" use="required" type="xs:string"/>
       <xs:attribute name="exec" use="required"/>
       <xs:attribute name="multiple" type="xs:boolean"/>


@@ -174,13 +166,11 @@
   </xs:element>
   <xs:element name="ime-application">
     <xs:complexType>
   </xs:element>
   <xs:element name="ime-application">
     <xs:complexType>

-      <xs:sequence>
-        <xs:choice maxOccurs="unbounded">
-          <xs:element ref="packages:label"/>
-          <xs:element ref="packages:icon"/>
-        </xs:choice>
+      <xs:choice maxOccurs="unbounded">
+        <xs:element ref="packages:label"/>
+        <xs:element ref="packages:icon"/>

         <xs:any minOccurs="0" maxOccurs="unbounded" namespace="##any" processContents="lax"/>
         <xs:any minOccurs="0" maxOccurs="unbounded" namespace="##any" processContents="lax"/>

-      </xs:sequence>
+      </xs:choice>

       <xs:attribute name="appid" use="required" type="xs:string"/>
       <xs:attribute name="exec" use="required" type="xs:NCName"/>
       <xs:attribute name="multiple" type="xs:boolean"/>
       <xs:attribute name="appid" use="required" type="xs:string"/>
       <xs:attribute name="exec" use="required" type="xs:NCName"/>
       <xs:attribute name="multiple" type="xs:boolean"/>


@@ -195,15 +185,13 @@
   </xs:element>
   <xs:element name="widget-application">
     <xs:complexType>
   </xs:element>
   <xs:element name="widget-application">
     <xs:complexType>

-      <xs:sequence>
-        <xs:choice maxOccurs="unbounded" minOccurs="0">
-          <xs:element ref="packages:label"/>
-          <xs:element ref="packages:icon"/>
-          <xs:element ref="packages:metadata"/>
-          <xs:element ref="packages:support-size"/>
-        </xs:choice>
+      <xs:choice maxOccurs="unbounded" minOccurs="0">
+        <xs:element ref="packages:label"/>
+        <xs:element ref="packages:icon"/>
+        <xs:element ref="packages:metadata"/>
+        <xs:element ref="packages:support-size"/>

         <xs:any minOccurs="0" maxOccurs="unbounded" namespace="##any" processContents="lax"/>
         <xs:any minOccurs="0" maxOccurs="unbounded" namespace="##any" processContents="lax"/>

-      </xs:sequence>
+      </xs:choice>

       <xs:attribute name="appid" use="required" type="xs:string"/>
       <xs:attribute name="exec" use="required"/>
       <xs:attribute name="main" type="xs:boolean"/>
       <xs:attribute name="appid" use="required" type="xs:string"/>
       <xs:attribute name="exec" use="required"/>
       <xs:attribute name="main" type="xs:boolean"/>


@@ -229,12 +217,10 @@
   </xs:element>
   <xs:element name="privileges">
     <xs:complexType>
   </xs:element>
   <xs:element name="privileges">
     <xs:complexType>

-      <xs:sequence>
-        <xs:choice maxOccurs="unbounded" minOccurs="0">
-          <xs:element ref="packages:privilege"/>
-          <xs:element ref="packages:appdefined-privilege"/>
-        </xs:choice>
-      </xs:sequence>
+      <xs:choice maxOccurs="unbounded" minOccurs="0">
+        <xs:element ref="packages:privilege"/>
+        <xs:element ref="packages:appdefined-privilege"/>
+      </xs:choice>

     </xs:complexType>
   </xs:element>
   <xs:element name="privilege">
     </xs:complexType>
   </xs:element>
   <xs:element name="privilege">


@@ -244,11 +230,9 @@
   </xs:element>
   <xs:element name="provides-appdefined-privileges">
     <xs:complexType>
   </xs:element>
   <xs:element name="provides-appdefined-privileges">
     <xs:complexType>

-      <xs:sequence>
-        <xs:choice maxOccurs="unbounded" minOccurs="0">
-          <xs:element ref="packages:appdefined-privilege"/>
-        </xs:choice>
-      </xs:sequence>
+      <xs:choice maxOccurs="unbounded" minOccurs="0">
+        <xs:element ref="packages:appdefined-privilege"/>
+      </xs:choice>

     </xs:complexType>
   </xs:element>
   <xs:element name="appdefined-privilege">
     </xs:complexType>
   </xs:element>
   <xs:element name="appdefined-privilege">


@@ -283,37 +267,31 @@
   </xs:element>
   <xs:element name="application-service">
     <xs:complexType>
   </xs:element>
   <xs:element name="application-service">
     <xs:complexType>

-      <xs:sequence>
-        <xs:choice maxOccurs="unbounded">
-          <xs:element ref="packages:operation"/>
-          <xs:element ref="packages:uri"/>
-          <xs:element ref="packages:mime"/>
-          <xs:element ref="packages:subapp"/>
-          <xs:any minOccurs="0" maxOccurs="unbounded" namespace="##any" processContents="lax"/>
-        </xs:choice>
-      </xs:sequence>
+      <xs:choice maxOccurs="unbounded">
+        <xs:element ref="packages:operation"/>
+        <xs:element ref="packages:uri"/>
+        <xs:element ref="packages:mime"/>
+        <xs:element ref="packages:subapp"/>
+        <xs:any minOccurs="0" maxOccurs="unbounded" namespace="##any" processContents="lax"/>
+      </xs:choice>

     </xs:complexType>
   </xs:element>
   <xs:element name="app-control">
     <xs:complexType>
     </xs:complexType>
   </xs:element>
   <xs:element name="app-control">
     <xs:complexType>

-      <xs:sequence>
-        <xs:choice maxOccurs="unbounded">
-          <xs:element ref="packages:operation"/>
-          <xs:element ref="packages:uri"/>
-          <xs:element ref="packages:mime"/>
-          <xs:element ref="packages:subapp"/>
-          <xs:any minOccurs="0" maxOccurs="unbounded" namespace="##any" processContents="lax"/>
-        </xs:choice>
-      </xs:sequence>
+      <xs:choice maxOccurs="unbounded">
+        <xs:element ref="packages:operation"/>
+        <xs:element ref="packages:uri"/>
+        <xs:element ref="packages:mime"/>
+        <xs:element ref="packages:subapp"/>
+        <xs:any minOccurs="0" maxOccurs="unbounded" namespace="##any" processContents="lax"/>
+      </xs:choice>

     </xs:complexType>
   </xs:element>
   <xs:element name="category">
     <xs:complexType>
     </xs:complexType>
   </xs:element>
   <xs:element name="category">
     <xs:complexType>

-      <xs:sequence>
-        <xs:choice maxOccurs="unbounded">
-          <xs:any minOccurs="0" processContents="lax"/>
-        </xs:choice>
-      </xs:sequence>
+      <xs:choice maxOccurs="unbounded">
+        <xs:any minOccurs="0" processContents="lax"/>
+      </xs:choice>

       <xs:attribute name="name" use="required"/>
       <xs:anyAttribute processContents="lax"/>
     </xs:complexType>
       <xs:attribute name="name" use="required"/>
       <xs:anyAttribute processContents="lax"/>
     </xs:complexType>


@@ -333,11 +311,9 @@
   </xs:element>
   <xs:element name="datacontrol">
   <xs:complexType>
   </xs:element>
   <xs:element name="datacontrol">
   <xs:complexType>

-    <xs:sequence>
-      <xs:choice maxOccurs="unbounded" minOccurs="0">
-        <xs:element ref="packages:privilege"/>
-      </xs:choice>
-    </xs:sequence>
+    <xs:choice maxOccurs="unbounded" minOccurs="0">
+      <xs:element ref="packages:privilege"/>
+    </xs:choice>

     <xs:attribute name="providerid" type="xs:string"/>
     <xs:attribute name="access" type="xs:string"/>
     <xs:attribute name="type" type="xs:string"/>
     <xs:attribute name="providerid" type="xs:string"/>
     <xs:attribute name="access" type="xs:string"/>
     <xs:attribute name="type" type="xs:string"/>


@@ -379,12 +355,10 @@
   </xs:element>
   <xs:element name="splash-screens">
     <xs:complexType>
   </xs:element>
   <xs:element name="splash-screens">
     <xs:complexType>

-      <xs:sequence>
-        <xs:choice maxOccurs="unbounded" minOccurs="0">
+      <xs:choice maxOccurs="unbounded" minOccurs="0">

         <xs:element ref="packages:splash-screen"/>
         <xs:any minOccurs="0" maxOccurs="unbounded" namespace="##any" processContents="lax"/>
         <xs:element ref="packages:splash-screen"/>
         <xs:any minOccurs="0" maxOccurs="unbounded" namespace="##any" processContents="lax"/>

-        </xs:choice>
-      </xs:sequence>
+      </xs:choice>

     </xs:complexType>
   </xs:element>
   <xs:element name="splash-screen">
     </xs:complexType>
   </xs:element>
   <xs:element name="splash-screen">

diff --git a/parser/manifest.xsd.ref b/parser/manifest.xsd.ref
index 815571c..90b9884 100644 (file)
--- a/parser/manifest.xsd.ref
+++ b/parser/manifest.xsd.ref
@@ -4,31 +4,29 @@
 
   <xs:element name="manifest">
     <xs:complexType>
 
   <xs:element name="manifest">
     <xs:complexType>

-      <xs:sequence>
-        <xs:choice maxOccurs="unbounded">
-          <xs:element ref="packages:label"/>
-          <xs:element ref="packages:icon"/>
-          <xs:element ref="packages:author"/>
-          <xs:element ref="packages:description"/>
-          <xs:element ref="packages:compatibility"/>
-          <xs:element ref="packages:profile"/>
-          <xs:element ref="packages:watch-application"/>
-          <xs:element ref="packages:watchface"/>
-          <xs:element ref="packages:service-application"/>
-          <xs:element ref="packages:ui-application"/>
-          <xs:element ref="packages:ime-application"/>
-          <xs:element ref="packages:shortcut-list"/>
-          <xs:element ref="packages:widget"/>
-          <xs:element ref="packages:widget-application"/>
-          <xs:element ref="packages:account"/>
-          <xs:element ref="packages:notifications"/>
-          <xs:element ref="packages:privileges"/>
-          <xs:element ref="packages:font"/>
-          <xs:element ref="packages:ime"/>
-          <xs:element ref="packages:feature"/>
-          <xs:element ref="packages:trust-anchor"/>
-        </xs:choice>
-      </xs:sequence>
+      <xs:choice maxOccurs="unbounded">
+        <xs:element ref="packages:label"/>
+        <xs:element ref="packages:icon"/>
+        <xs:element ref="packages:author"/>
+        <xs:element ref="packages:description"/>
+        <xs:element ref="packages:compatibility"/>
+        <xs:element ref="packages:profile"/>
+        <xs:element ref="packages:watch-application"/>
+        <xs:element ref="packages:watchface"/>
+        <xs:element ref="packages:service-application"/>
+        <xs:element ref="packages:ui-application"/>
+        <xs:element ref="packages:ime-application"/>
+        <xs:element ref="packages:shortcut-list"/>
+        <xs:element ref="packages:widget"/>
+        <xs:element ref="packages:widget-application"/>
+        <xs:element ref="packages:account"/>
+        <xs:element ref="packages:notifications"/>
+        <xs:element ref="packages:privileges"/>
+        <xs:element ref="packages:font"/>
+        <xs:element ref="packages:ime"/>
+        <xs:element ref="packages:feature"/>
+        <xs:element ref="packages:trust-anchor"/>
+      </xs:choice>

       <xs:attribute name="storeclient-id" type="xs:string"/>
       <xs:attribute name="install-location" type="packages:InstallLocationType"/>
       <xs:attribute name="package" use="required" type="xs:string"/>
       <xs:attribute name="storeclient-id" type="xs:string"/>
       <xs:attribute name="install-location" type="packages:InstallLocationType"/>
       <xs:attribute name="package" use="required" type="xs:string"/>


@@ -128,12 +126,10 @@
   </xs:element>
   <xs:element name="watch-application">
     <xs:complexType>
   </xs:element>
   <xs:element name="watch-application">
     <xs:complexType>

-      <xs:sequence>
-        <xs:choice maxOccurs="unbounded" minOccurs="0">
-          <xs:element ref="packages:label"/>
-          <xs:element ref="packages:icon"/>
-        </xs:choice>
-      </xs:sequence>
+      <xs:choice maxOccurs="unbounded" minOccurs="0">
+        <xs:element ref="packages:label"/>
+        <xs:element ref="packages:icon"/>
+      </xs:choice>

       <xs:attribute name="appid" use="required" type="xs:string"/>
       <xs:attribute name="exec" use="required"/>
       <xs:attribute name="ambient-support" type="xs:boolean"/>
       <xs:attribute name="appid" use="required" type="xs:string"/>
       <xs:attribute name="exec" use="required"/>
       <xs:attribute name="ambient-support" type="xs:boolean"/>


@@ -143,19 +139,17 @@
   </xs:element>
   <xs:element name="service-application">
     <xs:complexType>
   </xs:element>
   <xs:element name="service-application">
     <xs:complexType>

-      <xs:sequence>
-        <xs:choice maxOccurs="unbounded" minOccurs="0">
-          <xs:element ref="packages:label"/>
-          <xs:element ref="packages:icon"/>
-          <xs:element ref="packages:application-service"/>
-          <xs:element ref="packages:app-control"/>
-          <xs:element ref="packages:category"/>
-          <xs:element ref="packages:metadata"/>
-          <xs:element ref="packages:permission"/>
-          <xs:element ref="packages:datacontrol"/>
-          <xs:element ref="packages:background-category"/>
-        </xs:choice>
-      </xs:sequence>
+      <xs:choice maxOccurs="unbounded" minOccurs="0">
+        <xs:element ref="packages:label"/>
+        <xs:element ref="packages:icon"/>
+        <xs:element ref="packages:application-service"/>
+        <xs:element ref="packages:app-control"/>
+        <xs:element ref="packages:category"/>
+        <xs:element ref="packages:metadata"/>
+        <xs:element ref="packages:permission"/>
+        <xs:element ref="packages:datacontrol"/>
+        <xs:element ref="packages:background-category"/>
+      </xs:choice>

       <xs:attribute name="appid" use="required" type="xs:string"/>
       <xs:attribute name="auto-restart" type="xs:boolean"/>
       <xs:attribute name="exec" use="required"/>
       <xs:attribute name="appid" use="required" type="xs:string"/>
       <xs:attribute name="auto-restart" type="xs:boolean"/>
       <xs:attribute name="exec" use="required"/>


@@ -170,21 +164,19 @@
   </xs:element>
   <xs:element name="ui-application">
     <xs:complexType>
   </xs:element>
   <xs:element name="ui-application">
     <xs:complexType>

-      <xs:sequence>
-        <xs:choice maxOccurs="unbounded" minOccurs="0">
-          <xs:element ref="packages:label"/>
-          <xs:element ref="packages:icon"/>
-          <xs:element ref="packages:image"/>
-          <xs:element ref="packages:application-service"/>
-          <xs:element ref="packages:app-control"/>
-          <xs:element ref="packages:category"/>
-          <xs:element ref="packages:metadata"/>
-          <xs:element ref="packages:permission"/>
-          <xs:element ref="packages:datacontrol"/>
-          <xs:element ref="packages:background-category"/>
-          <xs:element ref="packages:splash-screens"/>
-        </xs:choice>
-      </xs:sequence>
+      <xs:choice maxOccurs="unbounded" minOccurs="0">
+        <xs:element ref="packages:label"/>
+        <xs:element ref="packages:icon"/>
+        <xs:element ref="packages:image"/>
+        <xs:element ref="packages:application-service"/>
+        <xs:element ref="packages:app-control"/>
+        <xs:element ref="packages:category"/>
+        <xs:element ref="packages:metadata"/>
+        <xs:element ref="packages:permission"/>
+        <xs:element ref="packages:datacontrol"/>
+        <xs:element ref="packages:background-category"/>
+        <xs:element ref="packages:splash-screens"/>
+      </xs:choice>

       <xs:attribute name="appid" use="required" type="xs:string"/>
       <xs:attribute name="exec" use="required"/>
       <xs:attribute name="multiple" type="xs:boolean"/>
       <xs:attribute name="appid" use="required" type="xs:string"/>
       <xs:attribute name="exec" use="required"/>
       <xs:attribute name="multiple" type="xs:boolean"/>


@@ -220,12 +212,10 @@
   </xs:element>
   <xs:element name="ime-application">
     <xs:complexType>
   </xs:element>
   <xs:element name="ime-application">
     <xs:complexType>

-      <xs:sequence>
-        <xs:choice maxOccurs="unbounded">
-          <xs:element ref="packages:label"/>
-          <xs:element ref="packages:icon"/>
-        </xs:choice>
-      </xs:sequence>
+      <xs:choice maxOccurs="unbounded">
+        <xs:element ref="packages:label"/>
+        <xs:element ref="packages:icon"/>
+      </xs:choice>

       <xs:attribute name="appid" use="required" type="xs:string"/>
       <xs:attribute name="exec" use="required" type="xs:NCName"/>
       <xs:attribute name="multiple" type="xs:boolean"/>
       <xs:attribute name="appid" use="required" type="xs:string"/>
       <xs:attribute name="exec" use="required" type="xs:NCName"/>
       <xs:attribute name="multiple" type="xs:boolean"/>


@@ -239,13 +229,11 @@
   </xs:element>
   <xs:element name="widget-application">
     <xs:complexType>
   </xs:element>
   <xs:element name="widget-application">
     <xs:complexType>

-      <xs:sequence>
-        <xs:choice maxOccurs="unbounded" minOccurs="0">
-          <xs:element ref="packages:label"/>
-          <xs:element ref="packages:icon"/>
-          <xs:element ref="packages:support-size"/>
-        </xs:choice>
-      </xs:sequence>
+      <xs:choice maxOccurs="unbounded" minOccurs="0">
+        <xs:element ref="packages:label"/>
+        <xs:element ref="packages:icon"/>
+        <xs:element ref="packages:support-size"/>
+      </xs:choice>

       <xs:attribute name="appid" use="required" type="xs:ID"/>
       <xs:attribute name="exec" use="required"/>
       <xs:attribute name="main" type="xs:boolean"/>
       <xs:attribute name="appid" use="required" type="xs:ID"/>
       <xs:attribute name="exec" use="required"/>
       <xs:attribute name="main" type="xs:boolean"/>


@@ -269,12 +257,10 @@
   </xs:element>
   <xs:element name="privileges">
     <xs:complexType>
   </xs:element>
   <xs:element name="privileges">
     <xs:complexType>

-      <xs:sequence>
-        <xs:choice maxOccurs="unbounded" minOccurs="0">
-          <xs:element ref="packages:privilege"/>
-          <xs:element ref="packages:appdefined-privilege"/>
-        </xs:choice>
-      </xs:sequence>
+      <xs:choice maxOccurs="unbounded" minOccurs="0">
+        <xs:element ref="packages:privilege"/>
+        <xs:element ref="packages:appdefined-privilege"/>
+      </xs:choice>

     </xs:complexType>
   </xs:element>
   <xs:element name="privilege">
     </xs:complexType>
   </xs:element>
   <xs:element name="privilege">


@@ -284,11 +270,9 @@
   </xs:element>
   <xs:element name="provides-appdefined-privileges">
     <xs:complexType>
   </xs:element>
   <xs:element name="provides-appdefined-privileges">
     <xs:complexType>

-      <xs:sequence>
-        <xs:choice maxOccurs="unbounded" minOccurs="0">
-          <xs:element ref="packages:appdefined-privilege"/>
-        </xs:choice>
-      </xs:sequence>
+      <xs:choice maxOccurs="unbounded" minOccurs="0">
+        <xs:element ref="packages:appdefined-privilege"/>
+      </xs:choice>

     </xs:complexType>
   </xs:element>
   <xs:element name="appdefined-privilege">
     </xs:complexType>
   </xs:element>
   <xs:element name="appdefined-privilege">


@@ -340,35 +324,29 @@
   </xs:simpleType>
   <xs:element name="application-service">
     <xs:complexType>
   </xs:simpleType>
   <xs:element name="application-service">
     <xs:complexType>

-      <xs:sequence>
-        <xs:choice maxOccurs="unbounded">
-          <xs:element ref="packages:operation"/>
-          <xs:element ref="packages:uri"/>
-          <xs:element ref="packages:mime"/>
-          <xs:element ref="packages:subapp"/>
-        </xs:choice>
-      </xs:sequence>
+      <xs:choice maxOccurs="unbounded">
+        <xs:element ref="packages:operation"/>
+        <xs:element ref="packages:uri"/>
+        <xs:element ref="packages:mime"/>
+        <xs:element ref="packages:subapp"/>
+      </xs:choice>

     </xs:complexType>
   </xs:element>
   <xs:element name="app-control">
     <xs:complexType>
     </xs:complexType>
   </xs:element>
   <xs:element name="app-control">
     <xs:complexType>

-      <xs:sequence>
-        <xs:choice maxOccurs="unbounded">
-          <xs:element ref="packages:operation"/>
-          <xs:element ref="packages:uri"/>
-          <xs:element ref="packages:mime"/>
-          <xs:element ref="packages:subapp"/>
-        </xs:choice>
-      </xs:sequence>
+      <xs:choice maxOccurs="unbounded">
+        <xs:element ref="packages:operation"/>
+        <xs:element ref="packages:uri"/>
+        <xs:element ref="packages:mime"/>
+        <xs:element ref="packages:subapp"/>
+      </xs:choice>

     </xs:complexType>
   </xs:element>
   <xs:element name="category">
     <xs:complexType>
     </xs:complexType>
   </xs:element>
   <xs:element name="category">
     <xs:complexType>

-      <xs:sequence>
-        <xs:choice maxOccurs="unbounded">
-          <xs:any minOccurs="0" processContents="lax"/>
-        </xs:choice>
-      </xs:sequence>
+      <xs:choice maxOccurs="unbounded">
+        <xs:any minOccurs="0" processContents="lax"/>
+      </xs:choice>

       <xs:attribute name="name" use="required"/>
       <xs:anyAttribute processContents="lax"/>
     </xs:complexType>
       <xs:attribute name="name" use="required"/>
       <xs:anyAttribute processContents="lax"/>
     </xs:complexType>


@@ -386,11 +364,9 @@
   </xs:element>
   <xs:element name="datacontrol">
   <xs:complexType>
   </xs:element>
   <xs:element name="datacontrol">
   <xs:complexType>

-    <xs:sequence>
-      <xs:choice maxOccurs="unbounded" minOccurs="0">
-        <xs:element ref="packages:privilege"/>
-      </xs:choice>
-    </xs:sequence>
+    <xs:choice maxOccurs="unbounded" minOccurs="0">
+      <xs:element ref="packages:privilege"/>
+    </xs:choice>

     <xs:attribute name="providerid" type="xs:string"/>
     <xs:attribute name="access" type="xs:string"/>
     <xs:attribute name="type" type="xs:string"/>
     <xs:attribute name="providerid" type="xs:string"/>
     <xs:attribute name="access" type="xs:string"/>
     <xs:attribute name="type" type="xs:string"/>


@@ -436,11 +412,9 @@
   </xs:element>
   <xs:element name="splash-screens">
     <xs:complexType>
   </xs:element>
   <xs:element name="splash-screens">
     <xs:complexType>

-      <xs:sequence>
-        <xs:choice maxOccurs="unbounded" minOccurs="0">
-          <xs:element ref="packages:splash-screen"/>
-        </xs:choice>
-      </xs:sequence>
+      <xs:choice maxOccurs="unbounded" minOccurs="0">
+        <xs:element ref="packages:splash-screen"/>
+      </xs:choice>

     </xs:complexType>
   </xs:element>
   <xs:element name="splash-screen">
     </xs:complexType>
   </xs:element>
   <xs:element name="splash-screen">