From 5ccc1ae318518eab48d4e09fd7c44a30a2353451 Mon Sep 17 00:00:00 2001
From: Sangyoon Jang <jeremy.jang@samsung.com>
Date: Wed, 27 Mar 2024 14:05:37 +0900
Subject: [PATCH] Fix manifest.xsd

Fix Unique Particle Attribtution Violation.

Change-Id: I34f68a8d50b289ebbdd20c157ee81cbf559a7cf5
Signed-off-by: Sangyoon Jang <jeremy.jang@samsung.com>
---
 parser/manifest.xsd.in | 117 +++++++++----------------------------------------
 1 file changed, 20 insertions(+), 97 deletions(-)

diff --git a/parser/manifest.xsd.in b/parser/manifest.xsd.in
index 2d474eb..6999870 100644
--- a/parser/manifest.xsd.in
+++ b/parser/manifest.xsd.in
@@ -4,33 +4,9 @@
 
   <xs:element name="manifest">
     <xs:complexType>
-      <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:element ref="packages:component-based-application"/>
-        <xs:element ref="packages:dependencies"/>
-        <xs:element ref="packages:light-user"/>
+      <xs:sequence>
         <xs:any minOccurs="0" maxOccurs="unbounded" namespace="##any" processContents="lax"/>
-      </xs:choice>
+      </xs:sequence>
       <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"/>
@@ -77,12 +53,9 @@
   </xs:element>
   <xs:element name="watch-application">
     <xs:complexType>
-      <xs:choice maxOccurs="unbounded" minOccurs="0">
-        <xs:element ref="packages:label"/>
-        <xs:element ref="packages:icon"/>
-        <xs:element ref="packages:res-control"/>
+      <xs:sequence>
         <xs:any minOccurs="0" maxOccurs="unbounded" namespace="##any" processContents="lax"/>
-      </xs:choice>
+      </xs:sequence>
       <xs:attribute name="appid" use="required" type="xs:string"/>
       <xs:attribute name="exec" use="required"/>
       <xs:attribute name="ambient-support" type="xs:boolean"/>
@@ -94,20 +67,9 @@
   </xs:element>
   <xs:element name="service-application">
     <xs:complexType>
-      <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:element ref="packages:res-control"/>
-        <xs:element ref="packages:boot-sequence"/>
+      <xs:sequence>
         <xs:any minOccurs="0" maxOccurs="unbounded" namespace="##any" processContents="lax"/>
-      </xs:choice>
+      </xs:sequence>
       <xs:attribute name="appid" use="required" type="xs:string"/>
       <xs:attribute name="auto-restart" type="xs:boolean"/>
       <xs:attribute name="exec" use="required"/>
@@ -124,22 +86,9 @@
   </xs:element>
   <xs:element name="ui-application">
     <xs:complexType>
-      <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:element ref="packages:res-control"/>
-        <xs:element ref="packages:boot-sequence"/>
+      <xs:sequence>
         <xs:any minOccurs="0" maxOccurs="unbounded" namespace="##any" processContents="lax"/>
-      </xs:choice>
+      </xs:sequence>
       <xs:attribute name="appid" use="required" type="xs:string"/>
       <xs:attribute name="exec" use="required"/>
       <xs:attribute name="multiple" type="xs:boolean"/>
@@ -177,12 +126,9 @@
   </xs:element>
   <xs:element name="ime-application">
     <xs:complexType>
-      <xs:choice maxOccurs="unbounded">
-        <xs:element ref="packages:label"/>
-        <xs:element ref="packages:icon"/>
-        <xs:element ref="packages:res-control"/>
+      <xs:sequence>
         <xs:any minOccurs="0" maxOccurs="unbounded" namespace="##any" processContents="lax"/>
-      </xs:choice>
+      </xs:sequence>
       <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"/>
@@ -198,14 +144,9 @@
   </xs:element>
   <xs:element name="widget-application">
     <xs:complexType>
-      <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:element ref="packages:res-control"/>
+      <xs:sequence>
         <xs:any minOccurs="0" maxOccurs="unbounded" namespace="##any" processContents="lax"/>
-      </xs:choice>
+      </xs:sequence>
       <xs:attribute name="appid" use="required" type="xs:string"/>
       <xs:attribute name="exec" use="required"/>
       <xs:attribute name="main" type="xs:boolean"/>
@@ -281,24 +222,16 @@
   </xs:element>
   <xs:element name="application-service">
     <xs:complexType>
-      <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:sequence>
         <xs:any minOccurs="0" maxOccurs="unbounded" namespace="##any" processContents="lax"/>
-      </xs:choice>
+      </xs:sequence>
     </xs:complexType>
   </xs:element>
   <xs:element name="app-control">
     <xs:complexType>
-      <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:sequence>
         <xs:any minOccurs="0" maxOccurs="unbounded" namespace="##any" processContents="lax"/>
-      </xs:choice>
+      </xs:sequence>
       <xs:attribute name="id" type="xs:string"/>
       <xs:attribute name="visibility" type="xs:string"/>
       <xs:anyAttribute namespace="##any" processContents="lax"/>
@@ -372,10 +305,9 @@
   </xs:element>
   <xs:element name="splash-screens">
     <xs:complexType>
-      <xs:choice maxOccurs="unbounded" minOccurs="0">
-        <xs:element ref="packages:splash-screen"/>
+      <xs:sequence>
         <xs:any minOccurs="0" maxOccurs="unbounded" namespace="##any" processContents="lax"/>
-      </xs:choice>
+      </xs:sequence>
     </xs:complexType>
   </xs:element>
   <xs:element name="splash-screen">
@@ -392,18 +324,9 @@
   </xs:element>
   <xs:element name="component-based-application">
     <xs:complexType>
-      <xs:choice maxOccurs="unbounded" minOccurs="0">
-        <xs:element ref="packages:icon"/>
-        <xs:element ref="packages:label"/>
-        <xs:element ref="packages:metadata"/>
-        <xs:element ref="packages:background-category"/>
-        <xs:element ref="packages:res-control"/>
-        <xs:element ref="packages:app-control"/>
-        <xs:element ref="packages:category"/>
-        <xs:element ref="packages:datacontrol"/>
-        <xs:element ref="packages:splash-screens"/>
+      <xs:sequence>
         <xs:any minOccurs="0" maxOccurs="unbounded" namespace="##any" processContents="lax"/>
-      </xs:choice>
+      </xs:sequence>
       <xs:attribute name="appid" use="required" type="xs:string"/>
       <xs:attribute name="exec" use="required"/>
       <xs:attribute name="type" use="required" type="xs:string"/>
-- 
2.7.4