From 4c92c11d06f766d6454e0c4cc808ddcd99c6a351 Mon Sep 17 00:00:00 2001
From: Hoseon LEE <hoseon46.lee@samsung.com>
Date: Thu, 6 Dec 2012 18:45:52 +0900
Subject: [PATCH] Update schema files

[Issue#] N/A
[Problem] N/A
[Cause] N/A
[Solution] Update the schema files
[SCMRequest] N/A

Change-Id: I54be762089c2166d28fc5d21d183750860e6f634
---
 configuration/config.tizen.xsd | 20 +++++++++++++-------
 configuration/config.xsd       |  8 +++++++-
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/configuration/config.tizen.xsd b/configuration/config.tizen.xsd
index 0f8700d..701e6c3 100755
--- a/configuration/config.tizen.xsd
+++ b/configuration/config.tizen.xsd
@@ -3,8 +3,8 @@
 <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:simpleType name="appserviceOperationType">
-    <!--
-    <xs:restriction base="xs:token">
+    <!--		
+    <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"/>
@@ -13,7 +13,7 @@
         <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>		
     -->
     <xs:restriction base="xs:anyURI"/>
 </xs:simpleType>
@@ -38,6 +38,12 @@
     </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="appservice">
     <xs:complexType>
         <xs:attribute name="src" type="xs:NCName" use="required"/>
@@ -57,10 +63,10 @@
 <xs:element name="setting">
     <xs:complexType>
         <xs:attribute name="screen-orientation" type="tizen:screenOrientationType" use="optional"/> <!-- default: portrait -->
-        <xs:attribute name="contextmenu" type="tizen:activationType" use="optional"/>
-        <xs:attribute name="context-menu" type="tizen:activationType" use="optional"/>
-        <xs:attribute name="background-support" type="tizen:activationType" use="optional"/>
-        <xs:attribute name="nodisplay" type="widgets:data.boolean" use="optional"/>
+        <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="nodisplay" type="widgets:data.boolean" use="optional"/> <!-- default: false -->
     </xs:complexType>
 </xs:element>
 
diff --git a/configuration/config.xsd b/configuration/config.xsd
index 84d734d..49164d2 100644
--- a/configuration/config.xsd
+++ b/configuration/config.xsd
@@ -49,6 +49,11 @@
             <xs:enumeration value="false"/>
         </xs:restriction>
     </xs:simpleType>
+    <xs:simpleType name="data.versionNumber">
+        <xs:restriction base="xs:string">
+            <xs:pattern value="[0-9]{2}.[0-9]{2}.[0-9]{4}"/>
+        </xs:restriction>
+    </xs:simpleType>
     <xs:element name="widget">
         <xs:complexType mixed="true">
             <xs:choice minOccurs="0" maxOccurs="unbounded">
@@ -68,10 +73,11 @@
                 <xs:element ref="tizen:appservice"  maxOccurs="unbounded" xmlns:tizen="http://tizen.org/ns/widgets"/>
                 <xs:element ref="tizen:setting"  maxOccurs="unbounded" xmlns:tizen="http://tizen.org/ns/widgets"/>
                 <xs:element ref="tizen:application" minOccurs="1" maxOccurs="1" xmlns:tizen="http://tizen.org/ns/widgets"/>
+                <xs:element ref="tizen:content"  minOccurs="1" maxOccurs="1" xmlns:tizen="http://tizen.org/ns/widgets"/>
                 </xs:choice>
             <xs:attribute ref="xml:lang"/>
             <xs:attribute name="id" type="xs:anyURI"/>
-            <xs:attribute name="version"/>
+            <xs:attribute name="version" type="widgets:data.versionNumber"/>
             <xs:attribute name="height" type="widgets:data.positiveNumber"/>
             <xs:attribute name="width" type="widgets:data.positiveNumber"/>
             <xs:attribute name="viewmodes">
-- 
2.7.4