[Release] wrt-installer_0.1.18 submit/tizen_2.1/20130328.113325
authorSoyoung Kim <sy037.kim@samsung.com>
Thu, 28 Mar 2013 11:32:38 +0000 (20:32 +0900)
committerSoyoung Kim <sy037.kim@samsung.com>
Thu, 28 Mar 2013 11:32:38 +0000 (20:32 +0900)
Merge branch 'master' into tizen_2.1

Change-Id: Ic8c04c65a927c6f5720f04d151f4817b21d39dac

1  2 
configuration/config.tizen.xsd
src/jobs/widget_install/task_database.cpp

index f82cab5,0a6f685..53ae5f1
mode 100755,100644..100644
  <?xml version="1.0" encoding="UTF-8"?>
  <!-- Widget Configuration Document Extensions XSD For TIZEN -->
- <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"   xmlns:tizen="http://tizen.org/ns/widgets" targetNamespace="http://tizen.org/ns/widgets" xmlns:widgets="http://www.w3.org/ns/widgets">
-     <xs:import namespace="http://www.w3.org/ns/widgets" schemaLocation="config.xsd"/>
+ <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:tizen="http://tizen.org/ns/widgets" targetNamespace="http://tizen.org/ns/widgets">
      <xs:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="xml.xsd"/>
- <xs:simpleType name="appserviceOperationType">
-     <!--              
-     <xs:restriction base="xs:token">          
-         <xs:enumeration value="http://tizen.org/appsvc/operation/edit"/>
-         <xs:enumeration value="http://tizen.org/appsvc/operation/view"/>
-         <xs:enumeration value="http://tizen.org/appsvc/operation/pick"/>
-         <xs:enumeration value="http://tizen.org/appsvc/operation/create_content"/>
-         <xs:enumeration value="http://tizen.org/appsvc/operation/call"/>
-         <xs:enumeration value="http://tizen.org/appsvc/operation/send"/>
-         <xs:enumeration value="http://tizen.org/appsvc/operation/dial"/>
-         <xs:enumeration value="http://tizen.org/appsvc/operation/search"/>
-     </xs:restriction>         
-     -->
-     <xs:restriction base="xs:anyURI"/>
- </xs:simpleType>
- <xs:simpleType name="PackageType">
-     <xs:restriction base="xs:string">
-         <xs:pattern value="[0-9a-zA-Z]{10}"/>
-     </xs:restriction>
- </xs:simpleType>
- <xs:simpleType name="applicationIdType">
-     <xs:restriction base="xs:string">
-         <xs:pattern value="[0-9a-zA-Z]{10}.[0-9a-zA-Z]{1,}"/>
-     </xs:restriction>
- </xs:simpleType>
- <xs:simpleType name="screenOrientationType">
-     <xs:restriction base="xs:token">
-         <xs:enumeration value="portrait"/>
-         <xs:enumeration value="landscape"/>
-     </xs:restriction>
- </xs:simpleType>
- <xs:simpleType name="activationType">
-     <xs:restriction base="xs:token">
-         <xs:enumeration value="enable"/>
-         <xs:enumeration value="disable"/>
-     </xs:restriction>
- </xs:simpleType>
- <xs:simpleType name="appWidgetIdType">
-     <xs:restriction base="xs:string">
-         <xs:pattern value="[0-9a-zA-Z]{10}.[0-9a-zA-Z]{1,}.[0-9a-zA-Z]{1,}"/>
-     </xs:restriction>
- </xs:simpleType>
- <xs:simpleType name="updatePeriodType">
-     <xs:restriction base="xs:float">
-         <xs:minInclusive value="60"/>
-     </xs:restriction>
- </xs:simpleType>
- <xs:element name="content">
-     <xs:complexType>
-         <xs:attribute name="src" use="required" type="xs:anyURI"/>
-     </xs:complexType>
- </xs:element>
- <!-- TODO : appservice will be removed. Please use app-control-->
- <xs:element name="appservice">
-     <xs:complexType>
-         <xs:attribute name="src" type="xs:NCName" use="required"/>
-         <xs:attribute name="operation" type="tizen:appserviceOperationType" use="required"/>
-         <xs:attribute name="scheme" type="xs:string" use="optional"/>
-         <xs:attribute name="mime" type="xs:string" use="optional"/>
-     </xs:complexType>
- </xs:element>
- <xs:element name="application">
-     <xs:complexType>
-         <xs:attribute name="id" type="tizen:applicationIdType" use="required"/>
-         <xs:attribute name="package" type="tizen:PackageType" use="required"/>
-         <xs:attribute name="required_version" type="xs:float" use="required"/>
-     </xs:complexType>
- </xs:element>
- <xs:element name="setting">
-     <xs:complexType>
-         <xs:attribute name="screen-orientation" type="tizen:screenOrientationType" use="optional"/> <!-- default: portrait -->
-         <xs:attribute name="context-menu" type="tizen:activationType" use="optional"/> <!-- default: enable -->
-         <xs:attribute name="background-support" type="tizen:activationType" use="optional"/> <!-- default: enable -->
-         <xs:attribute name="encryption" type="tizen:activationType" use="optional"/> <!-- default: disable -->
-         <xs:attribute name="install-location" type="tizen:InstallLocationType" use="optional"/>
-     </xs:complexType>
- </xs:element>
- <xs:element name="app-control">
-   <xs:complexType>
-     <xs:sequence>
-       <xs:choice maxOccurs="unbounded">
-         <xs:element ref="tizen:src"/>
-         <xs:element ref="tizen:operation"/>
-         <xs:element ref="tizen:uri"/>
-         <xs:element ref="tizen:mime"/>
-       </xs:choice>
-     </xs:sequence>
-   </xs:complexType>
- </xs:element>
- <xs:element name="category">
-   <xs:complexType>
-     <xs:anyAttribute processContents="lax"/>
-   </xs:complexType>
- </xs:element>
- <xs:element name="src">
-     <xs:complexType>
-         <xs:attribute name="name" use="required"/>
-     </xs:complexType>
- </xs:element>
- <xs:element name="operation">
-     <xs:complexType>
-         <xs:attribute name="name" type="tizen:appserviceOperationType" use="required"/>
-     </xs:complexType>
- </xs:element>
- <xs:element name="uri">
-     <xs:complexType>
-         <xs:attribute name="name" use="required"/>
-     </xs:complexType>
- </xs:element>
  
- <xs:element name="mime">
-   <xs:complexType>
-     <xs:attribute name="name" use="required"/>
-   </xs:complexType>
- </xs:element>
- <xs:element name="app-widget">
-     <xs:complexType mixed="true">
-         <xs:all>
-             <xs:element ref="tizen:box-label"/>
-             <xs:element ref="tizen:box-icon"/>
-             <!--xs:element ref="tizen:box-content"/-->
-         </xs:all>     
-         <xs:attribute name="id" type="tizen:appWidgetIdType" use="required"/>
-         <xs:attribute name="primary" type="widgets:data.boolean" use="required"/>
-         <xs:attribute name="auto-launch" type="widgets:data.boolean" use="optional"/>
-         <xs:attribute name="update-period" type="tizen:updatePeriodType" use="optional"/>
-     </xs:complexType>
- </xs:element>
- <xs:element name="privilege">
-     <xs:complexType mixed="true">
-         <xs:choice minOccurs="0" maxOccurs="unbounded">
-             <xs:element ref="widgets:param"/>
-         </xs:choice>
-         <xs:attribute name="name" use="required" type="xs:anyURI"/>
-         <xs:attributeGroup ref="widgets:extension"/>
-     </xs:complexType>
- </xs:element>
- <xs:element name="box-label"> 
-     <xs:complexType mixed="true"> 
-     </xs:complexType> 
- </xs:element>
- <xs:element name="box-icon">
-     <xs:complexType>
-     <xs:attribute name="src" use="required" type="xs:anyURI"/>
-     </xs:complexType>
- </xs:element>
- <xs:element name="box-content">
-     <xs:complexType mixed="true">
+     <xs:simpleType name="data.boolean">
+         <xs:restriction base="xs:string">
+             <xs:enumeration value="true"/>
+             <xs:enumeration value="false"/>
+         </xs:restriction>
+     </xs:simpleType>
+     <xs:simpleType name="appserviceOperationType">
+         <xs:restriction base="xs:anyURI"/>
+     </xs:simpleType>
+     <xs:simpleType name="PackageType">
+         <xs:restriction base="xs:string">
+             <xs:pattern value="[0-9a-zA-Z]{10}"/>
+         </xs:restriction>
+     </xs:simpleType>
+     <xs:simpleType name="applicationIdType">
+         <xs:restriction base="xs:string">
+             <xs:pattern value="[0-9a-zA-Z]{10}.[0-9a-zA-Z]{1,}"/>
+         </xs:restriction>
+     </xs:simpleType>
+     <xs:simpleType name="screenOrientationType">
+         <xs:restriction base="xs:token">
+             <xs:enumeration value="portrait"/>
+             <xs:enumeration value="landscape"/>
+         </xs:restriction>
+     </xs:simpleType>
+     <xs:simpleType name="activationType">
+         <xs:restriction base="xs:token">
+             <xs:enumeration value="enable"/>
+             <xs:enumeration value="disable"/>
+         </xs:restriction>
+     </xs:simpleType>
+     <xs:simpleType name="appWidgetIdType">
+         <xs:restriction base="xs:string">
+             <xs:pattern value="[0-9a-zA-Z]{10}.[0-9a-zA-Z]{1,}.[0-9a-zA-Z]{1,}"/>
+         </xs:restriction>
+     </xs:simpleType>
+     <xs:simpleType name="updatePeriodType">
+         <xs:restriction base="xs:float">
+             <xs:minInclusive value="60"/>
+         </xs:restriction>
+     </xs:simpleType>
+     <xs:element name="content">
+         <xs:complexType>
+             <xs:attribute name="src" use="required" type="xs:anyURI"/>
+         </xs:complexType>
+     </xs:element>
+     <xs:element name="application">
+         <xs:complexType>
+             <xs:attribute name="id" type="tizen:applicationIdType" use="required"/>
+             <xs:attribute name="package" type="tizen:PackageType" use="required"/>
+             <xs:attribute name="required_version" type="xs:float" use="required"/>
+         </xs:complexType>
+     </xs:element>
+     <xs:element name="setting">
+         <xs:complexType>
+             <xs:attribute name="screen-orientation" type="tizen:screenOrientationType" use="optional"/> <!-- default: portrait -->
+             <xs:attribute name="context-menu" type="tizen:activationType" use="optional"/> <!-- default: enable -->
+             <xs:attribute name="background-support" type="tizen:activationType" use="optional"/> <!-- default: enable -->
+             <xs:attribute name="encryption" type="tizen:activationType" use="optional"/> <!-- default: disable -->
+             <xs:attribute name="install-location" type="tizen:InstallLocationType" use="optional"/>
+         </xs:complexType>
+     </xs:element>
+     <xs:element name="app-control">
+       <xs:complexType>
          <xs:sequence>
-             <xs:element ref="tizen:box-size" minOccurs="1" maxOccurs="5"/>
-             <xs:element ref="tizen:pd"/>
+           <xs:choice maxOccurs="unbounded">
+             <xs:element ref="tizen:src"/>
+             <xs:element ref="tizen:operation"/>
+             <xs:element ref="tizen:uri"/>
+             <xs:element ref="tizen:mime"/>
+           </xs:choice>
          </xs:sequence>
+       </xs:complexType>
+     </xs:element>
+     <xs:element name="category">
+       <xs:complexType>
+         <xs:anyAttribute processContents="lax"/>
+       </xs:complexType>
+     </xs:element>
+     <xs:element name="src">
+         <xs:complexType>
+             <xs:attribute name="name" use="required"/>
+         </xs:complexType>
+     </xs:element>
+     <xs:element name="operation">
+         <xs:complexType>
+             <xs:attribute name="name" type="tizen:appserviceOperationType" use="required"/>
+         </xs:complexType>
+     </xs:element>
+     <xs:element name="uri">
+         <xs:complexType>
+             <xs:attribute name="name" use="required"/>
+         </xs:complexType>
+     </xs:element>
+     <xs:element name="mime">
+       <xs:complexType>
+         <xs:attribute name="name" use="required"/>
+       </xs:complexType>
+     </xs:element>
+     <xs:element name="app-widget">
+         <xs:complexType mixed="true">
+             <xs:all>
+                 <xs:element ref="tizen:box-label"/>
+                 <xs:element ref="tizen:box-icon"/>
+                 <xs:element ref="tizen:box-content"/>
+             </xs:all>
+             <xs:attribute name="id" type="tizen:appWidgetIdType" use="required"/>
+             <xs:attribute name="primary" type="tizen:data.boolean" use="required"/>
+             <xs:attribute name="auto-launch" type="tizen:data.boolean" use="optional"/>
+             <xs:attribute name="update-period" type="tizen:updatePeriodType" use="optional"/>
+         </xs:complexType>
+     </xs:element>
+     <xs:element name="privilege">
+         <xs:complexType>
+             <xs:attribute name="name" use="required" type="xs:anyURI"/>
+         </xs:complexType>
+     </xs:element>
+     <xs:element name="box-label">
+         <xs:complexType mixed="true">
+         </xs:complexType>
+     </xs:element>
+     <xs:element name="box-icon">
+         <xs:complexType>
          <xs:attribute name="src" use="required" type="xs:anyURI"/>
-         <xs:attribute name="mouse-event" use="optional" type="xs:anyURI"/>
-         <xs:attribute name="touch-effect" use="optional" type="xs:anyURI"/>
-     </xs:complexType>
- </xs:element>
- <xs:element name="pd">
-     <xs:complexType>
-         <xs:attribute name="src" use="required" type="xs:anyURI"/>
-         <xs:attribute name="width" use="required" type="xs:int"/>
-         <xs:attribute name="height" use="required" type="xs:int"/>
-     </xs:complexType>
- </xs:element>
- <xs:element name="box-size">
-     <xs:complexType mixed="true">
-     <xs:attribute name="preview" use="optional" type="xs:anyURI"/>
-     </xs:complexType>
- </xs:element>
- <xs:simpleType name="InstallLocationType">
-     <xs:restriction base="xs:string">
-         <xs:enumeration value="auto"/>
-         <xs:enumeration value="internal-only"/>
-         <xs:enumeration value="prefer-external"/>
-     </xs:restriction>
- </xs:simpleType>
+         </xs:complexType>
+     </xs:element>
+     <xs:element name="box-content">
+         <xs:complexType mixed="true">
+             <xs:sequence>
+                 <xs:element ref="tizen:box-size" minOccurs="1" maxOccurs="5"/>
+                 <xs:element ref="tizen:pd" minOccurs="0" maxOccurs="1"/>
+             </xs:sequence>
+             <xs:attribute name="src" use="required" type="xs:anyURI"/>
+             <xs:attribute name="mouse-event" use="optional" type="xs:anyURI"/>
+             <xs:attribute name="touch-effect" use="optional" type="xs:anyURI"/>
+         </xs:complexType>
+     </xs:element>
+     <xs:element name="pd">
+         <xs:complexType>
+             <xs:attribute name="src" use="required" type="xs:anyURI"/>
+             <xs:attribute name="width" use="required" type="xs:int"/>
+             <xs:attribute name="height" use="required" type="xs:int"/>
+         </xs:complexType>
+     </xs:element>
+     <xs:element name="box-size">
+         <xs:complexType mixed="true">
+         <xs:attribute name="preview" use="optional" type="xs:anyURI"/>
+         </xs:complexType>
+     </xs:element>
+     <xs:simpleType name="InstallLocationType">
+         <xs:restriction base="xs:string">
+             <xs:enumeration value="auto"/>
+             <xs:enumeration value="internal-only"/>
+             <xs:enumeration value="prefer-external"/>
+         </xs:restriction>
+     </xs:simpleType>
+     <xs:element name="account">
+         <xs:complexType mixed="true">
+             <xs:sequence>
+                 <xs:choice maxOccurs="unbounded">
+                     <xs:element ref="tizen:icon" />
+                     <xs:element ref="tizen:display-name" />
+                     <xs:element name="capability" type="xs:string"/>
+                 </xs:choice>
+             </xs:sequence>
+         <xs:attribute name="multiple-account-support" use="required" type="tizen:data.boolean"/>
+         </xs:complexType>
+     </xs:element>
+     <xs:element name="icon">
+       <xs:complexType>
+         <xs:attribute name="section" use="required" type="xs:string"/>
+       </xs:complexType>
+     </xs:element>
+     <xs:element name="display-name">
+       <xs:complexType mixed="true">
+         <xs:attribute ref="xml:lang"/>
+       </xs:complexType>
+     </xs:element>
  
 +<xs:element name="account">
 +    <xs:complexType mixed="true">
 +        <xs:sequence>
 +            <xs:choice maxOccurs="unbounded">
 +                <xs:element ref="tizen:icon" />
 +                <xs:element ref="tizen:display-name" />
 +                <xs:element name="capability" type="xs:string"/>
 +            </xs:choice>
 +        </xs:sequence>
 +    <xs:attribute name="multiple-account-support" use="required" type="widgets:data.boolean"/>
 +    </xs:complexType>
 +</xs:element>
 +
 +<xs:element name="icon">
 +  <xs:complexType>
 +    <xs:attribute name="section" use="required" type="xs:string"/>
 +  </xs:complexType>
 +</xs:element>
 +
 +<xs:element name="display-name">
 +  <xs:complexType mixed="true">
 +    <xs:attribute ref="xml:lang"/>
 +  </xs:complexType>
 +</xs:element>
 +
  </xs:schema>