You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2013/10/07 15:26:40 UTC

svn commit: r1529836 - /myfaces/site/publish/tobago/tobago-config-2.0.xsd

Author: lofwyr
Date: Mon Oct  7 13:26:39 2013
New Revision: 1529836

URL: http://svn.apache.org/r1529836
Log:
change configuration of CSP

Modified:
    myfaces/site/publish/tobago/tobago-config-2.0.xsd

Modified: myfaces/site/publish/tobago/tobago-config-2.0.xsd
URL: http://svn.apache.org/viewvc/myfaces/site/publish/tobago/tobago-config-2.0.xsd?rev=1529836&r1=1529835&r2=1529836&view=diff
==============================================================================
--- myfaces/site/publish/tobago/tobago-config-2.0.xsd (original)
+++ myfaces/site/publish/tobago/tobago-config-2.0.xsd Mon Oct  7 13:26:39 2013
@@ -34,6 +34,7 @@
       <![CDATA[
       ************************************************************************************
       ************************************************************************************
+      WARNING
       THIS IS A PRE-RELEASE VERSION OF THIS FILE, PLEASE CHECK IF THERE IS AN UPDATE ON
       http://myfaces.apache.org/tobago/tobago-config-2.0.xsd
       ************************************************************************************
@@ -70,8 +71,8 @@
       <xs:element name="theme-definitions" type="tobago:theme-definitions-type" minOccurs="0"/>
     </xs:sequence>
     <xs:attribute name="version"
-                   type="tobago:tobago-config-version-type"
-                   use="required"/>
+                  type="tobago:tobago-config-version-type"
+                  use="required"/>
   </xs:complexType>
 
   <xs:simpleType name="tobago-config-version-type">
@@ -102,10 +103,19 @@
 
   <xs:complexType name="content-security-policy-type">
     <xs:sequence>
-      <xs:element name="directive" type="xs:string" maxOccurs="unbounded"/>
+      <xs:element name="directive" type="xs:string" maxOccurs="unbounded" minOccurs="0"/>
     </xs:sequence>
+    <xs:attribute name="mode" type="tobago:scp-mode-type" use="required"/>
   </xs:complexType>
 
+  <xs:simpleType name="scp-mode-type">
+    <xs:restriction base="xs:token">
+      <xs:enumeration value="on"/>
+      <xs:enumeration value="off"/>
+      <xs:enumeration value="report-only"/>
+    </xs:restriction>
+  </xs:simpleType>
+
   <xs:complexType name="renderers-type">
     <xs:sequence>
       <xs:element name="renderer" type="tobago:renderer-type" maxOccurs="unbounded"/>