From 12940e103a746f3e16bca273f135a26835e08296 Mon Sep 17 00:00:00 2001
From: Jihoon Chung <jihoon.chung@samsung.com>
Date: Sat, 4 May 2013 14:01:31 +0900
Subject: [PATCH] Update xsd to support CSP & allow-navigation

[Issue#] N/A
[Problem] N/A
[Cause] N/A
[Solution] Update xsd to support CSP & allow-navigation
"content-security-policy", "content-security-policy-report-only", "allow-navigation"
[SCMRequest] N/A

Change-Id: If1a5414a33721c17e778ef414f9811737dc468cc
---
 configuration/config.tizen.xsd | 18 +++++++++-------
 configuration/config.xml       | 48 +++++++++++++++++-------------------------
 configuration/config.xsd       |  7 ++++--
 3 files changed, 34 insertions(+), 39 deletions(-)

diff --git a/configuration/config.tizen.xsd b/configuration/config.tizen.xsd
index e92a4c1..03102e4 100644
--- a/configuration/config.tizen.xsd
+++ b/configuration/config.tizen.xsd
@@ -2,7 +2,6 @@
 <!-- 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">
     <xs:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="xml.xsd"/>
-
     <xs:simpleType name="data.boolean">
         <xs:restriction base="xs:string">
             <xs:enumeration value="true"/>
@@ -120,6 +119,16 @@
       </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="content-security-policy" type="xs:string"/>
+    <xs:element name="content-security-policy-report-only" type="xs:string"/>
+    <xs:element name="allow-navigation" type="xs:string"/>
+
     <xs:element name="app-widget">
         <xs:complexType mixed="true">
             <xs:all>
@@ -135,12 +144,6 @@
         </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>
@@ -216,5 +219,4 @@
         <xs:attribute ref="xml:lang"/>
       </xs:complexType>
     </xs:element>
-
 </xs:schema>
diff --git a/configuration/config.xml b/configuration/config.xml
index 3e5dc15..9968071 100755
--- a/configuration/config.xml
+++ b/configuration/config.xml
@@ -1,36 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<widget xmlns="http://www.w3.org/ns/widgets" xmlns:tizen="http://tizen.org/ns/widgets" version="2.0 Beta" viewmodes="fullscreen" id="http://tizen.org/cert">
-  <feature name="http://tizen.org/privilege/accelerometer" />
-  <feature name="http://tizen.org/privilege/account" />
-  <feature name="http://tizen.org/privilege/application" />
-  <feature name="http://tizen.org/privilege/callHistory.read" />
-  <feature name="http://tizen.org/privilege/callHistory.write" />
-  <feature name="http://tizen.org/privilege/deviceapis" />
-  <feature name="http://tizen.org/privilege/deviceinteraction" />
-  <feature name="http://tizen.org/privilege/gallery" />
-  <feature name="http://tizen.org/privilege/gyroscope" />
-  <feature name="http://tizen.org/privilege/intel-messaging" />
-  <feature name="http://tizen.org/privilege/messaging" />
-  <feature name="http://tizen.org/privilege/messaging.send" />
-  <feature name="http://tizen.org/privilege/messaging.read" />
-  <feature name="http://tizen.org/privilege/messaging.write" />
-  <feature name="http://tizen.org/privilege/pim" />
-  <feature name="http://tizen.org/privilege/orientation" />
-  <feature name="http://tizen.org/privilege/systeminfo" />
-  <feature name="http://tizen.org/privilege/waclog" />
-  <name> hello </name>
+<widget xmlns="http://www.w3.org/ns/widgets" xmlns:tizen="http://tizen.org/ns/widgets" version="0.0.1" viewmodes="fullscreen">
+  <name>hello</name>
   <icon src="icon.png" />
 
-  <!-- tizen appservice element -->
-  <tizen:appservice src="index.html" operation="http://tizen.org/appsvc/operation/edit" mime="image/jpeg"/>
-  <tizen:appservice src="index2.html" operation="http://tizen.org/appsvc/operation/view" mime="image/jpeg"/>
-  <tizen:appservice src="index2.html" operation="http://tizen.org/appsvc/operation/test" mime="image/jpeg"/>
-
   <!-- tizen application element -->
-  <tizen:application id="Ea31aD3a23" required_version="1.0"/>
+  <tizen:application id="GfeI4eyhBG.Test" package="GfeI4eyhBG" required_version="2.1"/>
 
   <!-- tizen setting element -->
-  <tizen:setting screen-orientation="portrait" />
-  <tizen:setting contextmenu="disable" />
-  <tizen:setting nodisplay="false" />
+  <tizen:setting screen-orientation="landscape" context-menu="disable" background-support="enable" encryption="enable" install-location="internal-only"/>
+
+  <!-- tizen app-control element -->
+  <tizen:app-control>
+    <tizen:src name="index.html"/>
+    <tizen:operation name="http://tizen.org/appcontrol/operation/default"/>
+    <tizen:uri name="http"/>
+    <tizen:mime name="html"/>
+  </tizen:app-control>
+
+  <!-- tizen content-security-policy element -->
+  <tizen:content-security-policy>"img-src http://test.com 'unsafe-inline'; script-src 'unsafe-inline';"</tizen:content-security-policy>
+  <tizen:content-security-policy-report-only>img-src http://test.com 'unsafe-inline'; script-src 'unsafe-inline';</tizen:content-security-policy-report-only>
+
+  <!-- tizen allow-navigation element -->
+  <tizen:allow-navigation>test.com</tizen:allow-navigation>
 </widget>
diff --git a/configuration/config.xsd b/configuration/config.xsd
index 6a9443e..4d7a823 100644
--- a/configuration/config.xsd
+++ b/configuration/config.xsd
@@ -74,10 +74,13 @@
                 <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:element ref="tizen:app-widget"  minOccurs="0" maxOccurs="unbounded" xmlns:tizen="http://tizen.org/ns/widgets"/>
                 <xs:element ref="tizen:privilege"  minOccurs="0" maxOccurs="unbounded" xmlns:tizen="http://tizen.org/ns/widgets"/>
+                <xs:element ref="tizen:content-security-policy" minOccurs="0" maxOccurs="1" xmlns:tizen="http://tizen.org/ns/widgets"/>
+                <xs:element ref="tizen:content-security-policy-report-only" minOccurs="0" maxOccurs="1" xmlns:tizen="http://tizen.org/ns/widgets"/>
+                <xs:element ref="tizen:allow-navigation" minOccurs="0" maxOccurs="1" xmlns:tizen="http://tizen.org/ns/widgets"/>
+                <xs:element ref="tizen:app-widget"  minOccurs="0" maxOccurs="unbounded" xmlns:tizen="http://tizen.org/ns/widgets"/>
                 <xs:element ref="tizen:account"  minOccurs="0" maxOccurs="unbounded" xmlns:tizen="http://tizen.org/ns/widgets"/>
-                </xs:choice>
+            </xs:choice>
             <xs:attribute ref="xml:lang"/>
             <xs:attribute name="id" type="xs:anyURI"/>
             <xs:attribute name="version" type="widgets:data.versionNumber"/>
-- 
2.7.4